diff options
author | Michael Vogt <mvo@debian.org> | 2005-01-11 11:56:48 +0000 |
---|---|---|
committer | Michael Vogt <mvo@debian.org> | 2005-01-11 11:56:48 +0000 |
commit | e5dfb858ba7dc53c2a29324f2b4678f4f6912871 (patch) | |
tree | ddf267b19b7d135608391ae8cd2a698183f46625 /debian | |
parent | 32133629d8c49029f3d04886aa605de4864b486e (diff) | |
parent | 47f17da4f65ee4887f46e4442ce2843e3e744d89 (diff) |
* star-merged with matt, removed the unset("no_proxy") in methods/ftp.cc
Patches applied:
* apt@packages.debian.org/apt--main--0--patch-42
Merge from apt--mvo--0
* apt@packages.debian.org/apt--main--0--patch-43
Fix permissions AGAIN
* apt@packages.debian.org/apt--main--0--patch-44
Update to 0.6.28
* apt@packages.debian.org/apt--main--0--patch-45
Fix malformatted changelog
* apt@packages.debian.org/apt--main--0--patch-46
Merge apt--mvo--0
* apt@packages.debian.org/apt--main--0--patch-47
s/unstable/hoary/
* apt@packages.debian.org/apt--main--0--patch-48
Add ppc64 to buildlib/archtable
Diffstat (limited to 'debian')
-rw-r--r-- | debian/changelog | 21 | ||||
-rwxr-xr-x | debian/rules | 2 |
2 files changed, 22 insertions, 1 deletions
diff --git a/debian/changelog b/debian/changelog index 421914b36..ae7bee192 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,24 @@ +apt (0.6.30) unstable; urgency=low + + * Add ppc64 to buildlib/archtable + + -- Michael Vogt <mvo@debian.org> Tue, 11 Jan 2005 12:30:27 +0100 + +apt (0.6.29) hoary; 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 + * Rebuild source to get rid of arch metadata and temporary files in + 0.6.27ubuntu3 + + -- 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 diff --git a/debian/rules b/debian/rules index b756b3b32..71d6d549e 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_OPTS) +DEB_BUILD_PROG:=debuild --preserve-envvar PATH --preserve-envvar CCACHE_DIR -us -uc $(DEBUILD_DPKG_BUILDPACKAGE_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') |