[Pkg-voip-commits] r7738 - /tools/builder/builder

[tzafrir-guest at alioth.debian.org]

Author: tzafrir-guest
Date: Sat Oct 31 09:08:17 2009
New Revision: 7738

URL: http://svn.debian.org/wsvn/pkg-voip/?sc=1&rev=7738
Log:
get-orig-source downloads to current directory, per policy.

Move it to the shared tarballs directory svn-buildpackage uses.

Also fix usage of dch.

Modified:
    tools/builder/builder

Modified: tools/builder/builder
URL: http://svn.debian.org/wsvn/pkg-voip/tools/builder/builder?rev=7738&op=diff
==============================================================================
--- tools/builder/builder (original)
+++ tools/builder/builder Sat Oct 31 09:08:17 2009
@@ -97,7 +97,7 @@
 
   dummy_mod_package=no
   case "$package" in 
-    zaptel-modules|dahdi-modules) dummy_mod_package=yes
+    *zaptel-modules|*dahdi-modules) dummy_mod_package=yes
     ;;
   esac 
   
@@ -167,7 +167,7 @@
     fi
     ;; 
     *)
-    dch "Revision: $rev, Branch: $branch"
+    dch --append "Revision: $rev, Branch: $branch"
     new_version=`get_new_version $rev`
     sed -i -e "1s/(\([^)]*\))/($new_version)/" debian/changelog
     ;;
@@ -183,12 +183,16 @@
     fi
   done
 
+  tarball_base=${package}_$version.orig.tar.gz
+  tarball=../tarballs/${tarball_base}
+  if [ ! -r "$tarball" ] && echo $full_version | sed -e 's/.*_//' | grep -q -- - ; then
+    debian/rules get-orig-source
+    if [ -r ${tarball_base} ] && [ ! -r ${tarball} ]; then
+      mv ${tarball_base} ${tarball}
+    fi
+  fi
   # svn-buildpackage prompts the user in case of a failure. let's provide 
   # it with the answer:
-  tarball=../tarballs/${package}_$version.orig.tar.gz
-  if [ ! -r "$tarball" ] && echo $full_version | sed -e 's/.*_//' | grep -q -- - ; then
-    debian/rules get-orig-source
-  fi
   if [ "$USE_PBUILDER" != '' ]
   then
     echo "$PBUILDER_PARAMS" >../pbuilder_params