Merge branch 'master' of ssh://git.indexdata.com/home/git/pub/git-tools

diff --git a/id-deb-build/id-pbuild-all.sh b/id-deb-build/id-pbuild-all.sh
index 796eddd..b4c15a0 100755 (executable)
--- a/id-deb-build/id-pbuild-all.sh
+++ b/id-deb-build/id-pbuild-all.sh
@@ -2,6 +2,14 @@
 update=true
 PKG="$1"
 if test -z "$PKG"; then
+       if test -d deb-src; then
+               cd deb-src      
+               for d in *.dsc; do
+                       PKG=$d
+               done
+       fi
+fi
+if test -z "$PKG"; then
        echo "Specify .dsc file"
        exit 1
 fi
@@ -11,7 +19,7 @@ if test ! -e "$PKG"; then
 fi
 PRODUCT=`echo *.dsc|sed 's/_.*//g'`
 DEBIAN_DIST="squeeze etch lenny"
-UBUNTU_DIST="jaunty intrepid hardy"
+UBUNTU_DIST="karmic jaunty intrepid hardy"
 
 if test "$2" = "upload"; then
        for dist in ${UBUNTU_DIST}; do

diff --git a/id-deb-build/pbuilderrc b/id-deb-build/pbuilderrc
index ae5b4ec..beb69c4 100644 (file)
--- a/id-deb-build/pbuilderrc
+++ b/id-deb-build/pbuilderrc
@@ -15,9 +15,9 @@ APTCACHE="/var/cache/pbuilder/$NAME/aptcache/"
 
 # http://releases.ubuntu.com/releases/
 case "$DIST" in
-    intrepid|hardy|gutsy|jaunty) # ubuntu specific
-       MIRRORSITE="http://ftp.df.lth.se/ubuntu/"
-       # MIRRORSITE="http://ftp.klid.dk/ftp/ubuntu/"
+    karmic|intrepid|hardy|gutsy|jaunty) # ubuntu specific
+       # MIRRORSITE="http://ftp.df.lth.se/ubuntu/"
+       MIRRORSITE="http://ftp.klid.dk/ftp/ubuntu/"
         # MIRRORSITE="http://mirrors.kernel.org/ubuntu/"
         COMPONENTS="main restricted universe multiverse"
        OTHERMIRROR="deb http://ftp.indexdata.dk/ubuntu $DIST main"