* debian/rules:

  - Daniel Schepler to make apt bin-NMU able

diff --git a/debian/changelog b/debian/changelog
index a828d02c129f93341242ebda60440d389f8e66cd..448f4f1ee0d3c0fa9c4da3e7b7b25335c58ec4af 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,7 +2,9 @@ apt (0.6.46.1) unstable; urgency=low
 
   * methods/gzip.cc:
     - deal with empty files 
 
   * methods/gzip.cc:
     - deal with empty files 

-
+  * Applied patch from Daniel Schepler to make apt bin-NMU able.  
+    (Closes: bug#359634)
+  

  --
 
 apt (0.6.46) unstable; urgency=low
  --
 
 apt (0.6.46) unstable; urgency=low

diff --git a/debian/rules b/debian/rules
index a8bf88762e4fed8821d9f3f8bf480caf4cd94759..02ee734bb24c71580e82583cabb8bb7de755ed96 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -38,7 +38,7 @@ build:
 
 PKG=apt
 DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)
 
 PKG=apt
 DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEB_BUILD_PROG_OPTS)

-APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p')
+APT_DEBVER=$(shell dpkg-parsechangelog |sed -n -e '/^Version:/s/^Version: //p' -e 's/\+.*$$//')

 APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
 APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g')
 
 APT_CONFVER=$(shell sed -n -e 's/^AC_DEFINE_UNQUOTED(VERSION,"\(.*\)")/\1/p' configure.in)
 APT_CVSTAG=$(shell echo "$(APT_DEBVER)" | sed -e 's/^/v/' -e 's/\./_/g')