- Fixed source package version to match debian bug #628118

- changed autodeb.sh script to produce signed packages, and ensure
the resulting changelog includes both the source and binary package
information

diff --git a/autodeb.sh b/autodeb.sh
index c5e83a73b3db5e7acdd90a24219c5f50c1f21abc..1dc67d662b0c90a08b3c43464b9988d481077957 100755 (executable)
--- a/autodeb.sh
+++ b/autodeb.sh
@@ -27,29 +27,16 @@ VERSION=`cat VERSION`
 cd ${BUILD}
 $SRC/configure
 make dist
-cp libzipper-${VERSION}.tar.gz libzipper1_${VERSION}.orig.tar.gz
-tar xzvf libzipper1_${VERSION}.orig.tar.gz
+cp libzipper-${VERSION}.tar.gz libzipper_${VERSION}.orig.tar.gz
+tar xzvf libzipper_${VERSION}.orig.tar.gz
 cp -a ${SRC}/debian libzipper-${VERSION}
-dpkg-source -b libzipper-${VERSION}/
-if [ ! -f ${BUILD}/libzipper1_${VERSION}*.dsc ]; then
-       echo "ERROR: Source package not created."
-       exit 1
-fi
-
-# Remove intermediate results.
-make distclean
-rm -rf libzipper-${VERSION}/
-
-# Now we have the source package, copy then build it
-tar xzvf libzipper1_*.orig.tar.gz
 cd libzipper-${VERSION}
-tar xzvf ../libzipper1_*.debian.tar.gz
-dpkg-buildpackage -rfakeroot -uc -b
+dpkg-buildpackage -rfakeroot
 
-if ! lintian --color auto --fail-on-warnings -i ${BUILD}/libzipper1_1.0.1-1.dsc; then
+if ! lintian --color auto --fail-on-warnings -i ${BUILD}/libzipper_1.0.1-1.dsc; then
        echo "Build failed"
        exit 1;
-elif ! lintian --color auto --fail-on-warnings -i ${BUILD}/libzipper1_1.0.1-1_amd64.changes; then
+elif ! lintian --color auto --fail-on-warnings -i ${BUILD}/libzipper_1.0.1-1_amd64.changes; then
        echo "Build failed"
        exit 1;
 else
@@ -61,9 +48,9 @@ echo BUILD SUCCESS
 echo ------------------------------------------
 echo
 echo "Debian source package:"
-echo ${BUILD}/libzipper1_*.orig.tar.gz
-echo ${BUILD}/libzipper1_*.debian.tar.gz
-echo ${BUILD}/libzipper1_*.dsc
+echo ${BUILD}/libzipper_*.orig.tar.gz
+echo ${BUILD}/libzipper_*.debian.tar.gz
+echo ${BUILD}/libzipper_*.dsc
 echo "Debian binary packages:"
 echo ${BUILD}/libzipper1_*.deb
 echo ${BUILD}/libzipper-dev_*.deb

diff --git a/debian/changelog b/debian/changelog
index 6fe212679f95d41dcc561a1056267efcc72deccc..92fa1ba843a3c5eda6fcd813c28134b61681726b 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,4 +2,4 @@ libzipper (1.0.1-1) unstable; urgency=low
 
   * Initial release. (Closes: #628118)
 
- -- Michael McMaster <michael@codesrc.com>  Fri, 27 May 2011 22:41:22 +1000
+ -- Michael McMaster <michael@codesrc.com>  Sun, 29 May 2011 19:59:32 +1000

diff --git a/debian/control b/debian/control
index 458a2c1f903d0d0c45b1042052cc48c70ed34ad8..4ff13d1bfc0050658c846c17d2b3e4d7bfd95f1b 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -1,4 +1,4 @@
-Source: libzipper1
+Source: libzipper
 Priority: optional
 Maintainer: Michael McMaster <michael@codesrc.com>
 Build-Depends: debhelper (>= 7.0.50~), autotools-dev, cdbs, pkg-config, zlib1g-dev, doxygen, texlive-font-utils, graphviz