[SCM] Debian packaging for sketch 3D line drawing software branch, master, updated. debian/0.2.183-1-7-g909ff9a

David Bremner bremner at unb.ca
Sat Dec 18 03:18:52 UTC 2010


The following commit has been merged in the master branch:
commit cecfa27c5d2929336b497cf1ba128ff079fad999
Author: David Bremner <bremner at unb.ca>
Date:   Fri Dec 17 22:08:52 2010 -0400

    update export-patches to support a DEB_UPSTREAM interpolation, and
    use it in git-patches

diff --git a/debian/export-patches.sh b/debian/export-patches.sh
index 6046268..f0b82b4 100644
--- a/debian/export-patches.sh
+++ b/debian/export-patches.sh
@@ -14,10 +14,19 @@ else
     DEB_VERSION=$(dpkg-parsechangelog | sed -n 's/^Version: \(.*:\|\)\(.*\)/\2/p')
 fi;
 
+case $DEB_VERSION in
+    *-*)
+	DEB_UPSTREAM=${DEB_VERSION%-*}
+	;;
+    *)
+	DEB_UPSTREAM=$DEB_VERSION
+	;;
+esac
+
 tmpdir=$(mktemp -d patches.XXXXXXX)
 echo "# Patches exported from git by gitpkg-export-patches" > $tmpdir/series
 
-sed s/%DEB_VERSION%/${DEB_VERSION}/g  < $recipe |
+sed -e s/%DEB_VERSION%/${DEB_VERSION}/g  -e s/%DEB_UPSTREAM%/${DEB_UPSTREAM}/ < $recipe |
 while read -r base tip
 do
     case $base in
diff --git a/debian/git-patches b/debian/git-patches
index 2ebb811..99b4f0c 100644
--- a/debian/git-patches
+++ b/debian/git-patches
@@ -1 +1 @@
-master	patches/%DEB_VERSION%
+upstream/%DEB_UPSTREAM%	patches/%DEB_VERSION%

-- 
Debian packaging for sketch 3D line drawing software



More information about the debian-science-commits mailing list