summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog18
-rwxr-xr-xdebian/rules2
2 files changed, 19 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog
index 26368db0e..1551df078 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+apt (0.6.29) unstable; urgency=low
+
+ * Merge apt--mvo--0 (0.6.27ubuntu4)
+
+
+ -- Matt Zimmerman <mdz@canonical.com> Tue, 28 Dec 2004 17:18:02 -0800
+
apt (0.6.28) hoary; urgency=low
* Merge apt--mvo--0
@@ -6,6 +13,17 @@ apt (0.6.28) hoary; urgency=low
-- Matt Zimmerman <mdz@canonical.com> Thu, 23 Dec 2004 18:53:16 -0800
+apt (0.6.27ubuntu4) hoary; urgency=low
+
+ * remove old sig-file in partial/ before starting to fetch a new sig-file
+ (see ubuntu #4769 for the rational)
+ * added apt-key update method (uses ubuntu-keyring)
+ * documented the "--allow-unauthenticated" switch
+ * added DEB_BUILD_PROG_OPTS to debian/rules (additonal options can be
+ passed to DEB_BUILD_PROG like "-S")
+
+ -- Michael Vogt <mvo@debian.org> Thu, 23 Dec 2004 11:12:51 +0100
+
apt (0.6.27ubuntu3) hoary; urgency=low
* added a exact dependency from libapt-pkg-dev to the apt version it was
diff --git a/debian/rules b/debian/rules
index 1fbbb61d1..b756b3b32 100755
--- a/debian/rules
+++ b/debian/rules
@@ -36,7 +36,7 @@ endif
# Default rule
build:
-DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc
+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_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')