Reimplement nd_backport in terms of backport-dsc

diff --git a/debian/neurodebian-dev.install b/debian/neurodebian-dev.install
index 37fd89376672f505e054bc025aa3016d789203ec..bf8987cad0b61cf90849af3f8d61104848c51356 100644 (file)
--- a/debian/neurodebian-dev.install
+++ b/debian/neurodebian-dev.install
@@ -1,4 +1,6 @@
 tools/backport-dsc usr/bin/
 tools/backport-dsc usr/bin/

+tools/nd_querycfg usr/bin/
+tools/nd_backport usr/bin/

 neurodebian.cfg /etc/neurodebian/
 pkgs usr/share/neurodebian/
 sphinx usr/share/neurodebian/
 neurodebian.cfg /etc/neurodebian/
 pkgs usr/share/neurodebian/
 sphinx usr/share/neurodebian/

diff --git a/tools/nd_backport b/tools/nd_backport
index 3392d6504300d83bdce31384b149b8ef1dcc6fc9..430470710ad739a006d2a825042c52d853142738 100755 (executable)
--- a/tools/nd_backport
+++ b/tools/nd_backport
@@ -1,19 +1,19 @@
 #!/bin/bash
 #!/bin/bash

+#
+# Simple frontend for backport-dsc to do it the NeuroDebian way
+#
+
+set -e
+set -u

 
 release=$1
 dscfile=$2
 
 
 release=$1
 dscfile=$2
 

-set -e
-

 if [ -z "$release" ]; then
   echo "You need to provide a distribution codename (e.g. 'lenny', 'squeeze')."
   exit 1
 fi
 
 if [ -z "$release" ]; then
   echo "You need to provide a distribution codename (e.g. 'lenny', 'squeeze')."
   exit 1
 fi
 

-
-set -e
-set -u
-

 if [ -z "$2" ]; then
 cat << EOT
 Script to backport a source package to some target release.
 if [ -z "$2" ]; then
 cat << EOT
 Script to backport a source package to some target release.


@@ -27,41 +27,11 @@ EOT
 exit 1
 fi
 
 exit 1
 fi
 

-. /home/neurodebian/neurodebian.git/tools/nd_cmdsettings.sh
-
-DEBEMAIL="team@neuro.debian.net"
-DEBFULLNAME="NeuroDebian Maintainers"
-export DEBEMAIL DEBFULLNAME
-
-srcname=${dscfile%%_*}
-srcversion=${dscfile#*_}
-srcversion=${srcversion%%.dsc}
-wdir=$(mktemp -d -t nd_backport.XXXXXX)
-sdir=$wdir/${srcname}-${srcversion}
-
-echo "Source package name: $srcname"
-echo "Source package version: $srcversion"
-echo "Extracting source package to: $sdir"
-
-dpkg-source -x $dscfile $sdir
-
-echo "Backporting to: $release"
-
-changelog_entry="Backport of Debian package version $srcversion for \
-NeuroDebian. Problems with the backport should be reported to the
-NeuroDebian maintainers and not to the original Debian maintainer."
-
-echo | debchange \
-         --noconf --force-bad-version \
-         -c $sdir/debian/changelog \
-         -D ${release} \
-         -b -l "~${release}.nd" \
-         $changelog_entry
-
-bpversion=$(dpkg-parsechangelog -l$sdir/debian/changelog | egrep '^Version: ' | cut -d ' ' -f 2,2)
-dpkg-source -b $sdir
-
-# cleanup
-rm -rf $wdir
-
-echo ${srcname}_$bpversion.dsc
+# assemble an appropriate backport-dsc call
+backport-dsc \
+       --maint-name "NeuroDebian Maintainers" \
+       --maint-email "team@neuro.debian.net" \
+       --target-distribution "$release" \
+       --version-suffix "$(nd_querycfg "release backport ids" "$release")" \
+       --mod-control 's/^Depends:.*$/&, neurodebian-trailer/' \
+       "$dscfile"