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

diff --git a/id-deb-build/id-upload.sh b/id-deb-build/id-upload.sh
index 671ae84..b5959bc 100755 (executable)
--- a/id-deb-build/id-upload.sh
+++ b/id-deb-build/id-upload.sh
@@ -1,19 +1,23 @@
 #!/bin/sh
-DEBCHANGELOG=debian/changelog
-if test ! -f $DEBCHANGELOG; then
-       echo "$DEBCHANGELOG missing"
-       echo "The current directory should be base source of package"
+if test ! -f IDMETA; then
+       echo "IDMETA is not in current directory"
        exit 1
 fi
-l=`head -1 $DEBCHANGELOG`
-PROD=`echo $l|sed 's/ .*//g'`
-VERSION=`echo $l|sed 's/.*(//g'|sed 's/).*//g'`
-echo "VERSION=$VERSION"
-MAJOR=`echo $VERSION|sed 's/-.*//g'`
-echo "MAJOR=$MAJOR"
-MINOR=`echo $VERSION|sed 's/.*-//g'`
-echo "MINOR=$MINOR"
-TAR=${PROD}-${MAJOR}.tar.gz
+. ./IDMETA
+if test -n "$NAME"; then
+       PRODUCT=$NAME
+else
+       DEBCHANGELOG=debian/changelog
+       if test ! -f $DEBCHANGELOG; then
+               echo "$DEBCHANGELOG missing"
+               echo "The current directory should be base source of package"
+               exit 1
+       fi
+       l=`head -1 $DEBCHANGELOG`
+       PRODUCT=`echo $l|sed 's/ .*//g'`
+fi
+TAR=${PRODUCT}-${VERSION}.tar.gz
+echo "TAR=$TAR"
 if test ! -f ${TAR}; then
        echo "$0: ${TAR} missing"
        exit 1
@@ -22,10 +26,10 @@ set -e
 if test -f Doxyfile; then
        doxygen >out 2>stderr
 fi
-(cd doc && make ${PROD}.pdf index.html)
+(cd doc && make ${PRODUCT}.pdf index.html)
 cp NEWS doc/
-scp ${TAR} ftp.indexdata.dk:/home/ftp/pub/${PROD}/
-tar cz --exclude=.git -f - dox doc|ssh website "cd /var/www/software/${PROD}; tar x --overwrite -z -f -"
+scp ${TAR} ftp.indexdata.dk:/home/ftp/pub/${PRODUCT}/
+tar cz --exclude=.git -f - dox doc|ssh website "cd /var/www/software/${PRODUCT}; tar x --overwrite -z -f -"
 # Local Variables:
 # mode:shell-script
 # sh-indentation: 2

diff --git a/id-deb-build/pbuilderrc b/id-deb-build/pbuilderrc
index f2c6bba..15b1eca 100644 (file)
--- a/id-deb-build/pbuilderrc
+++ b/id-deb-build/pbuilderrc
@@ -18,14 +18,14 @@ CCACHEDIR=
 
 # http://releases.ubuntu.com/releases/
 case "$DIST" in
-    quantal|precise|oneiric|natty|maverick|lucid|karmic) # ubuntu specific
+    saucy|raring|quantal|precise|oneiric|natty|maverick|lucid|karmic) # ubuntu specific
        # MIRRORSITE="http://ftp.df.lth.se/ubuntu/"
        MIRRORSITE="http://mirrors.dotsrc.org/ubuntu/"
         # MIRRORSITE="http://mirrors.kernel.org/ubuntu/"
         COMPONENTS="main restricted universe multiverse"
        OTHERMIRROR="deb http://ftp.indexdata.dk/ubuntu $DIST main"
         ;;
-    wheezy|squeeze|lenny|etch) # debian specific
+    jessie|wheezy|squeeze|lenny|etch) # debian specific
         MIRRORSITE="http://ftp.se.debian.org/debian/"
         COMPONENTS="main contrib non-free"
        OTHERMIRROR="deb http://ftp.indexdata.dk/debian $DIST main"

diff --git a/update-archive/update-archive.sh b/update-archive/update-archive.sh
index 85a0423..23fd650 100755 (executable)
--- a/update-archive/update-archive.sh
+++ b/update-archive/update-archive.sh
@@ -72,7 +72,7 @@ if test "$UBUNTU_DIST"; then
 fi
 
 # All distributions we know of
-ALLD="ubuntu/lucid ubuntu/natty ubuntu/oneiric ubuntu/precise ubuntu/quantal debian/wheezy debian/squeeze debian/lenny"
+ALLD="ubuntu/lucid ubuntu/natty ubuntu/oneiric ubuntu/precise ubuntu/quantal ubuntu/raring ubuntu/saucy debian/jessie debian/wheezy debian/squeeze debian/lenny"
 
 if test -z "$DISTRIBUTIONS"; then
        DISTRIBUTIONS=$ALLD