[SCM] Debian packaging for bibutils branch, master, updated. debian/4.12-2-4-g81603e7

[David Bremner]

The following commit has been merged in the master branch:
commit 7ee09de5419aea940f8d8d52a305eff5e700f2e5
Author: David Bremner <bremner at debian.org>
Date:   Mon Jun 20 19:49:16 2011 -0300

    fix date and version calculation.
    
    Use upstream makefile instead of Debian changelog.

diff --git a/debian/changelog b/debian/changelog
index 8b670da..a18a280 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+bibutils (4.12-3) unstable; urgency=low
+
+  * Bug fix: "CLI option --version does not display version at all",
+    thanks to Patrice Pillot (Closes: #630707).
+
+ -- David Bremner <bremner at debian.org>  Mon, 20 Jun 2011 19:48:26 -0300
+
 bibutils (4.12-2) unstable; urgency=low
 
   * Upload to unstable
diff --git a/debian/rules b/debian/rules
index fe7f4f4..b7fe7f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,8 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-VERSION=$(shell dpkg-parsechangelog |  sed -n 's/^Version: \(.*\)-[^-]*/\1/p')
+DATE=$(shell sed -n 's/^DATE=\(.*\)/\1/p' Makefile_start)
+VERSION=$(shell sed -n 's/^VERSION=\(.*\)/\1/p' Makefile_start)
 
 DB2MAN=/usr/share/sgml/docbook/stylesheet/xsl/nwalsh/manpages/docbook.xsl
 XP=xsltproc -''-nonet
@@ -22,10 +23,11 @@ LIBINSTALLDIR=${DESTDIR}/usr/lib
 
 override_dh_auto_configure:
 	@echo Skipping auto_configure
+	@echo building bibutils $(VERSION), upstream date $(DATE)
 
 override_dh_auto_build:
 	$(MAKE) -C lib -f Makefile.dynamic SONAME=$(SONAME) SOMINOR=$(SOMINOR) all
-	$(MAKE) -C bin -f Makefile.dynamic all
+	$(MAKE) -C bin -f Makefile.dynamic VERSION=$(VERSION) DATE=$(DATE) all
 	# this relies on target clean not removing the shared libs
 	$(MAKE) -C lib -f Makefile.static clean
 	$(MAKE) -C lib -f Makefile.static libbibutils.a libbibcore.a

-- 
Debian packaging for bibutils