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

diff --git a/id-deb-build/id-pbuild.sh b/id-deb-build/id-pbuild.sh
index c2a0900..abb65fd 100755 (executable)
--- a/id-deb-build/id-pbuild.sh
+++ b/id-deb-build/id-pbuild.sh
@@ -98,9 +98,7 @@ for dist in ${DEBIAN_DIST} ${UBUNTU_DIST}; do
            if test ! -f /var/cache/pbuilder/${dist}-${arch}-base.tgz; then
                DIST=$dist ARCH=$arch $PBUILDER create
            fi
-           for f in `find /var/cache/pbuilder/${dist}-${arch}-base.tgz -ctime +7`; do
-               DIST=$dist ARCH=$arch $PBUILDER update --override-config
-           done
+           DIST=$dist ARCH=$arch $PBUILDER update --override-config
            DIST=$dist ARCH=$arch $PBUILDER --build $PKG
            ) >${dist}-${arch}.log 2>&1 &
        i=`expr $i + 1`

diff --git a/id-deb-build/id-upload.sh b/id-deb-build/id-upload.sh
index 3a72de7..57649b9 100755 (executable)
--- a/id-deb-build/id-upload.sh
+++ b/id-deb-build/id-upload.sh
@@ -22,9 +22,9 @@ set -e
 if test -f Doxyfile; then
        doxygen >out 2>stderr
 fi
-(cd doc && make ${PRODUCT}.pdf index.html)
+(cd doc && make ${PROD}.pdf index.html)
 cp NEWS doc/
-cp ${TAR} ftp.indexdata.dk:/home/ftp/pub/${PROD}/
+scp ${TAR} ftp.indexdata.dk:/home/ftp/pub/${PROD}/
 tar cz --exclude=.git -f - dox doc|ssh website "cd software/${PROD}; tar xzf -"
 # Local Variables:
 # mode:shell-script

diff --git a/id-deb-build/pbuilderrc b/id-deb-build/pbuilderrc
index beb69c4..9c76232 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
-    karmic|intrepid|hardy|gutsy|jaunty) # ubuntu specific
+    lucid|karmic|intrepid|hardy|gutsy|jaunty) # ubuntu specific
        # MIRRORSITE="http://ftp.df.lth.se/ubuntu/"
-       MIRRORSITE="http://ftp.klid.dk/ftp/ubuntu/"
+       MIRRORSITE="http://mirrors.telianet.dk/ubuntu/"
         # MIRRORSITE="http://mirrors.kernel.org/ubuntu/"
         COMPONENTS="main restricted universe multiverse"
        OTHERMIRROR="deb http://ftp.indexdata.dk/ubuntu $DIST main"