From 402a9d49447c221d0240ada18b644edc538fd9a6 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Mon, 13 Jun 2005 20:50:09 +0000 Subject: Change debian/bugscript to use #!/bin/bash (Closes: #313402) --- debian/bugscript | 2 +- debian/changelog | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/bugscript b/debian/bugscript index 8423e07c2..f5ec9e05d 100755 --- a/debian/bugscript +++ b/debian/bugscript @@ -1,4 +1,4 @@ -#!/bin/sh -e +#!/bin/bash -e # reportbug #169495 if [ -z "$YESNO" ]; then diff --git a/debian/changelog b/debian/changelog index 1ce780163..57b746a56 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ apt (0.6.37) breezy; urgency=low * Fix build of French man pages (now using XML, not SGML) * Add Welsh translation from Dafydd Harries (daf@muse.19inch.net--2005/apt--main--0--patch-1) + * Change debian/bugscript to use #!/bin/bash (Closes: #313402) -- Matt Zimmerman Tue, 24 May 2005 14:38:25 -0700 -- cgit v1.2.3 From d9e050800067f16ba49cb6932d7a52a6de22ab9d Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sat, 25 Jun 2005 23:52:00 +0000 Subject: Merge from Debian branch Patches applied: * apt@packages.debian.org/apt--main--0--patch-89 Branch for Debian * apt@packages.debian.org/apt--main--0--patch-90 Update version in configure * apt@packages.debian.org/apt--main--0--patch-91 Fix French man page build * apt@packages.debian.org/apt--main--0--patch-92 Add the current Debian archive signing key * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6 * build fix for apt--main--0 --- debian/apt.postinst | 2 +- debian/changelog | 12 ++++++++++++ debian/rules | 2 +- 3 files changed, 14 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index df0433057..ae1801198 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/changelog b/debian/changelog index 57b746a56..be201057c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,15 @@ +apt (0.6.38) unstable; urgency=low + + * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround + for the French man pages' failure to build + * Branch Debian and Ubuntu + - apt.postinst, apt-key: use the appropriate keyring + - debian/rules: install all keyrings + * Add the current Debian archive signing key (4F368D5D) to + debian-archive.gpg + + -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 + apt (0.6.37) breezy; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 diff --git a/debian/rules b/debian/rules index e3254c2d2..d6ae540ee 100755 --- a/debian/rules +++ b/debian/rules @@ -209,7 +209,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ + cp share/*.gpg debian/$@/usr/share/$@ # head -n 500 ChangeLog > debian/ChangeLog -- cgit v1.2.3 From c9fa6271e4813d88284771ff15050165eac38353 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sat, 25 Jun 2005 23:53:43 +0000 Subject: 0.6.38ubuntu1 --- debian/apt.postinst | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index ae1801198..df0433057 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/changelog b/debian/changelog index be201057c..a249d92f4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.38ubuntu1) breezy; urgency=low + + * First release from Ubuntu branch + * Merge with --main--0, switch back to Ubuntu keyring + + -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 + apt (0.6.38) unstable; urgency=low * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround -- cgit v1.2.3 From 20edfd5399dada2d10ad791336797c4118eb60a8 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sun, 26 Jun 2005 20:13:10 +0000 Subject: Merge with mainline Patches applied: * apt@packages.debian.org/apt--main--0--patch-93 Merge with mvo * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-22 * added myself to uploaders, changelog is signed with mvo@debian.org and in sync with the debian/experimental upload * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-23 * apt-cache show shows all virtual packages instead of nothing (thanks to otavio) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-24 * changelog updated * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-25 * make pinning on component work again (we just use the section, as apt-0.6 don't use per-section Release files anymore) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-27 * updated the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-28 * merged with my apt--fixes--0 branch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-29 * added a missing OpProgress::Done() in depCache::Init(), removed the show-virtual-packages patch in apt-cache because matt does not like him :/ * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-30 * fix a stupid bug in the depcache::Init() code * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-31 * merged/removed conflicts with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32 * merged apt--main and make sure that the po files come from apt--main (because they are more recent) --- debian/changelog | 5 ++++- debian/control | 2 +- 2 files changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a249d92f4..d71a78e71 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,7 +14,10 @@ apt (0.6.38) unstable; urgency=low - debian/rules: install all keyrings * Add the current Debian archive signing key (4F368D5D) to debian-archive.gpg - + * make pinning on the "component" work again (using the section of the + archive, we don't use per-section Release files anymore with apt-0.6) + (closes ubuntu #9935) + -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 apt (0.6.37) breezy; urgency=low diff --git a/debian/control b/debian/control index b7c430997..9dd271619 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: apt Section: admin Priority: important Maintainer: APT Development Team -Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman +Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.1 Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) -- cgit v1.2.3 From 602afa46935a1015ae9d07a016b4b4cc199205a2 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sun, 26 Jun 2005 20:13:53 +0000 Subject: Improved arch-build rule --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index d6ae540ee..ee02baeb6 100755 --- a/debian/rules +++ b/debian/rules @@ -336,4 +336,4 @@ arch-build: mkdir -p debian/arch-build/apt-$(APT_DEBVER) baz inventory -s | xargs cp -a --parents --target=debian/arch-build/apt-$(APT_DEBVER) $(MAKE) -C debian/arch-build/apt-$(APT_DEBVER) startup doc - (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG)) + (cd debian/arch-build/apt-$(APT_DEBVER); $(DEB_BUILD_PROG); dpkg-genchanges -S > ../apt_$(APT_DEBVER)_source.changes) -- cgit v1.2.3 From 99f9dc4c97a7eef6b2819c933be0fc947f747912 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sun, 26 Jun 2005 21:28:56 +0000 Subject: Merge with mainline Patches applied: * andrelop@debian.org/apt--translation--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * andrelop@debian.org/apt--translation--0--patch-1 Sync with Matt version. * andrelop@debian.org/apt--translation--0--patch-2 Update pt_BR translation * andrelop@debian.org/apt--translation--0--patch-3 Sync with bubulle's branch. * apt@packages.debian.org/apt--main--0--patch-94 Update changelog * apt@packages.debian.org/apt--main--0--patch-95 Merge Christian's branch * apt@packages.debian.org/apt--main--0--patch-96 Update changelog * apt@packages.debian.org/apt--main--0--patch-97 Update priority of apt-utils to important, to match the override file * bubulle@debian.org--2005/apt--main--0--patch-82 Fix permissions * bubulle@debian.org--2005/apt--main--0--patch-83 French translation spellchecked * bubulle@debian.org--2005/apt--main--0--patch-84 Spell corrections in German translations * bubulle@debian.org--2005/apt--main--0--patch-85 Correct some file permissions * bubulle@debian.org--2005/apt--main--0--patch-86 Correct Hebrew translation * bubulle@debian.org--2005/apt--main--0--patch-87 Sync Portuguese translation with the POT file * bubulle@debian.org--2005/apt--main--0--patch-88 Updated Danish translation (not yet complete) * bubulle@debian.org--2005/apt--main--0--patch-89 Sync with Andre Luis Lopes and Otavio branches --- debian/apt.postinst | 2 +- debian/changelog | 27 +++++++++++++++++++++++++++ debian/control | 2 +- 3 files changed, 29 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index df0433057..ae1801198 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/changelog b/debian/changelog index d71a78e71..2ff5dd8c3 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,14 @@ +apt (0.6.39) unstable; urgency=low + + * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 + * Merge mvo's changes from 0.6.36ubuntu1: + michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32 + * Merge aggregated translation updates: + bubulle@debian.org--2005/apt--main--0 + * Update priority of apt-utils to important, to match the override file + + -- + apt (0.6.38ubuntu1) breezy; urgency=low * First release from Ubuntu branch @@ -20,6 +31,22 @@ apt (0.6.38) unstable; urgency=low -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 +apt (0.6.38) unstable; urgency=low + + * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround + for the French man pages' failure to build + * Branch Debian and Ubuntu + - apt.postinst, apt-key: use the appropriate keyring + - debian/rules: install all keyrings + * Add the current Debian archive signing key (4F368D5D) to + debian-archive.gpg + * make pinning on the "component" work again (using the section of the + archive, we don't use per-section Release files anymore with apt-0.6) + (closes ubuntu #9935) + + -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 + +>>>>>>> MERGE-SOURCE apt (0.6.37) breezy; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 diff --git a/debian/control b/debian/control index 9dd271619..6d9418a46 100644 --- a/debian/control +++ b/debian/control @@ -53,7 +53,7 @@ Description: Documentation for APT development Package: apt-utils Architecture: any Depends: ${shlibs:Depends} -Priority: optional +Priority: important Provides: ${libapt-inst:provides} Replaces: apt (<< 0.5.9) Section: admin -- cgit v1.2.3 From 29ba053e05b1a496500036dbd667002d1b8b5ec2 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Sun, 26 Jun 2005 21:30:27 +0000 Subject: Merge with mvo Patches applied: * michael.vogt@ubuntu.com--2005/apt--bts225947--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-1 * merged with mainline and apt--fixes--0 * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-2 * patch from aj (slighly modified to use auto_ptr<>) applied * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-3 * changelog updated * michael.vogt@ubuntu.com--2005/apt--bts225947--0--patch-4 * work for arch=all packages too now * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-5 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-7 * fixed incorrect man-page example * michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-8 * changelog udpate * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-87 * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-1 * report timeouts (from Connect) and fail if they happen in pkgAcqMetaSig * michael.vogt@ubuntu.com--2005/apt--sane-handle-timeout--0--patch-2 * merged with the fixes branch to make it build again * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-1 tag of apt@packages.debian.org/apt--main--0--patch-88 * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-2 * merged apt--mvo (to make pining on components work again) * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-3 * merged with apt--fixes--0 (to make the building of the french manpages work and to fix a incorrect man-page example * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-4 * merged with the bts225947 code * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-5 * merged the imporoved timoeut handling patch * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-6 * merged with matt * michael.vogt@ubuntu.com--2005/apt--ubuntu--0--patch-7 * removed another conflict with apt--main --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2ff5dd8c3..fd5959423 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,6 +6,14 @@ apt (0.6.39) unstable; urgency=low * Merge aggregated translation updates: bubulle@debian.org--2005/apt--main--0 * Update priority of apt-utils to important, to match the override file + * Michael Vogt + - Change debian/bugscript to use #!/bin/bash (Closes: #313402) + - Fix a incorrect example in the man-page (closes: #282918) + - Support architecture-specific extra overrides + (closes: #225947). Thanks to Anthony Towns for idea and + the patch, thanks to Colin Watson for testing it. + - better report network timeouts from the methods to the acuire code, + only timeout once per sources.list line -- -- cgit v1.2.3 From e004867d0979224adb9cbeb9705f156e16e3fe26 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 27 Jun 2005 16:29:16 +0000 Subject: * merged with mainline Patches applied: * andrelop@debian.org/apt--translation--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * andrelop@debian.org/apt--translation--0--patch-1 Sync with Matt version. * andrelop@debian.org/apt--translation--0--patch-2 Update pt_BR translation * andrelop@debian.org/apt--translation--0--patch-3 Sync with bubulle's branch. * apt@packages.debian.org/apt--main--0--patch-89 Branch for Debian * apt@packages.debian.org/apt--main--0--patch-90 Update version in configure * apt@packages.debian.org/apt--main--0--patch-91 Fix French man page build * apt@packages.debian.org/apt--main--0--patch-92 Add the current Debian archive signing key * apt@packages.debian.org/apt--main--0--patch-93 Merge with mvo * apt@packages.debian.org/apt--main--0--patch-94 Update changelog * apt@packages.debian.org/apt--main--0--patch-95 Merge Christian's branch * apt@packages.debian.org/apt--main--0--patch-96 Update changelog * apt@packages.debian.org/apt--main--0--patch-97 Update priority of apt-utils to important, to match the override file * bubulle@debian.org--2005/apt--main--0--patch-82 Fix permissions * bubulle@debian.org--2005/apt--main--0--patch-83 French translation spellchecked * bubulle@debian.org--2005/apt--main--0--patch-84 Spell corrections in German translations * bubulle@debian.org--2005/apt--main--0--patch-85 Correct some file permissions * bubulle@debian.org--2005/apt--main--0--patch-86 Correct Hebrew translation * bubulle@debian.org--2005/apt--main--0--patch-87 Sync Portuguese translation with the POT file * bubulle@debian.org--2005/apt--main--0--patch-88 Updated Danish translation (not yet complete) * bubulle@debian.org--2005/apt--main--0--patch-89 Sync with Andre Luis Lopes and Otavio branches * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-22 * added myself to uploaders, changelog is signed with mvo@debian.org and in sync with the debian/experimental upload * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-23 * apt-cache show shows all virtual packages instead of nothing (thanks to otavio) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-24 * changelog updated * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-25 * make pinning on component work again (we just use the section, as apt-0.6 don't use per-section Release files anymore) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-27 * updated the changelog * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-28 * merged with my apt--fixes--0 branch * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-29 * added a missing OpProgress::Done() in depCache::Init(), removed the show-virtual-packages patch in apt-cache because matt does not like him :/ * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-30 * fix a stupid bug in the depcache::Init() code * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-31 * merged/removed conflicts with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32 * merged apt--main and make sure that the po files come from apt--main (because they are more recent) --- debian/apt.postinst | 2 +- debian/changelog | 26 ++++++++++++++++++++++++++ debian/control | 4 ++-- debian/rules | 2 +- 4 files changed, 30 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index df0433057..ae1801198 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/changelog b/debian/changelog index 7717705d3..ad775c230 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,29 @@ +apt (0.6.39) unstable; urgency=low + + * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 + * Merge mvo's changes from 0.6.36ubuntu1: + michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-32 + * Merge aggregated translation updates: + bubulle@debian.org--2005/apt--main--0 + * Update priority of apt-utils to important, to match the override file + + -- + +apt (0.6.38) unstable; urgency=low + + * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround + for the French man pages' failure to build + * Branch Debian and Ubuntu + - apt.postinst, apt-key: use the appropriate keyring + - debian/rules: install all keyrings + * Add the current Debian archive signing key (4F368D5D) to + debian-archive.gpg + * make pinning on the "component" work again (using the section of the + archive, we don't use per-section Release files anymore with apt-0.6) + (closes ubuntu #9935) + + -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 + apt (0.6.37) breezy; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 diff --git a/debian/control b/debian/control index b7c430997..6d9418a46 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: apt Section: admin Priority: important Maintainer: APT Development Team -Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman +Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.1 Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) @@ -53,7 +53,7 @@ Description: Documentation for APT development Package: apt-utils Architecture: any Depends: ${shlibs:Depends} -Priority: optional +Priority: important Provides: ${libapt-inst:provides} Replaces: apt (<< 0.5.9) Section: admin diff --git a/debian/rules b/debian/rules index e3254c2d2..d6ae540ee 100755 --- a/debian/rules +++ b/debian/rules @@ -209,7 +209,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ + cp share/*.gpg debian/$@/usr/share/$@ # head -n 500 ChangeLog > debian/ChangeLog -- cgit v1.2.3 From 4e2ded43a51b4f5522d3dd3cdfb4625a3a715966 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Tue, 28 Jun 2005 18:06:22 +0000 Subject: Merge with mainline Patches applied: * apt@packages.debian.org/apt--main--0--patch-98 Install only one keyring on each branch (Closes: #316119) --- debian/changelog | 1 + debian/rules | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index fd5959423..3279c859e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ apt (0.6.39) unstable; urgency=low the patch, thanks to Colin Watson for testing it. - better report network timeouts from the methods to the acuire code, only timeout once per sources.list line + * Install only one keyring on each branch (Closes: #316119) -- diff --git a/debian/rules b/debian/rules index ee02baeb6..6b532cc53 100755 --- a/debian/rules +++ b/debian/rules @@ -209,7 +209,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/*.gpg debian/$@/usr/share/$@ + cp share/debian-archive.gpg debian/$@/usr/share/$@ # head -n 500 ChangeLog > debian/ChangeLog -- cgit v1.2.3 From 1b2f60fc8fb3e88202dbae5345404f537abd32b1 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Tue, 28 Jun 2005 18:06:41 +0000 Subject: install only the ubuntu keyring --- debian/rules | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/rules b/debian/rules index 6b532cc53..3bc9f53d9 100755 --- a/debian/rules +++ b/debian/rules @@ -209,7 +209,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/debian-archive.gpg debian/$@/usr/share/$@ + cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ # head -n 500 ChangeLog > debian/ChangeLog -- cgit v1.2.3 From 8908efc65fdd7f6b5c59e504d3840b9d33cb7fb8 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Tue, 28 Jun 2005 18:36:31 +0000 Subject: Finalize 0.6.39 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3279c859e..ab138e33e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -16,7 +16,7 @@ apt (0.6.39) unstable; urgency=low only timeout once per sources.list line * Install only one keyring on each branch (Closes: #316119) - -- + -- Matt Zimmerman Tue, 28 Jun 2005 11:35:21 -0700 apt (0.6.38ubuntu1) breezy; urgency=low -- cgit v1.2.3 From 3014df6fc4aa647e82fa1d95a0fe4ee856a1a6d5 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Tue, 28 Jun 2005 18:52:48 +0000 Subject: Merge with mainline Patches applied: * apt@packages.debian.org/apt--main--0--patch-99 Finalize 0.6.39 --- debian/changelog | 24 ++++++++++++++++-------- 1 file changed, 16 insertions(+), 8 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index ab138e33e..cb092b803 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,16 @@ +apt (0.6.39ubuntu1) breezy; urgency=low + + * Michael Vogt + - Change debian/bugscript to use #!/bin/bash (Closes: #313402) + - Fix a incorrect example in the man-page (closes: #282918) + - Support architecture-specific extra overrides + (closes: #225947). Thanks to Anthony Towns for idea and + the patch, thanks to Colin Watson for testing it. + - better report network timeouts from the methods to the acuire code, + only timeout once per sources.list line + + -- Matt Zimmerman Tue, 28 Jun 2005 11:52:24 -0700 + apt (0.6.39) unstable; urgency=low * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 @@ -6,14 +19,6 @@ apt (0.6.39) unstable; urgency=low * Merge aggregated translation updates: bubulle@debian.org--2005/apt--main--0 * Update priority of apt-utils to important, to match the override file - * Michael Vogt - - Change debian/bugscript to use #!/bin/bash (Closes: #313402) - - Fix a incorrect example in the man-page (closes: #282918) - - Support architecture-specific extra overrides - (closes: #225947). Thanks to Anthony Towns for idea and - the patch, thanks to Colin Watson for testing it. - - better report network timeouts from the methods to the acuire code, - only timeout once per sources.list line * Install only one keyring on each branch (Closes: #316119) -- Matt Zimmerman Tue, 28 Jun 2005 11:35:21 -0700 @@ -39,6 +44,9 @@ apt (0.6.38) unstable; urgency=low (closes ubuntu #9935) -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 +======= + -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 +>>>>>>> MERGE-SOURCE apt (0.6.38) unstable; urgency=low -- cgit v1.2.3 From 0a57c0f0e4d0bc3474ce4d2101f36a997891d30d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Jun 2005 06:11:36 +0000 Subject: * use mark-and-sweep from aptitude now as GC algorithm --- debian/changelog | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 78559fd56..11e1a6282 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,8 +14,11 @@ apt (0.6.38ubuntu1mvo1) unstable; urgency=low the patch, thanks to Colin Watson for testing it. - better report network timeouts from the methods to the acuire code, only timeout once per sources.list line - - -- Michael Vogt Tue, 28 Jun 2005 11:18:24 +0200 + - started to port the great automatic dependency mangement code from + aptitude over to apt (thanks dburrows for answering my silly + questions and your great help!) + + -- apt (0.6.38ubuntu1) breezy; urgency=low -- cgit v1.2.3 From bc80031f74e4acfca5b8ca7188b12ee885a713bd Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 29 Jun 2005 11:43:32 +0000 Subject: * fix a bug when readStateFile is called with no OpProgress object --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 86dca75bc..a18f18f1a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -10,7 +10,7 @@ apt (0.6.39ubuntu1mvo1) unstable; urgency=low only timeout once per sources.list line - support for automatic removal of unused dependencies added - -- + -- Michael Vogt Wed, 29 Jun 2005 13:01:36 +0200 apt (0.6.39) unstable; urgency=low -- cgit v1.2.3 From 7439e2e988e5c097f922acd04b648deb54d16122 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Wed, 29 Jun 2005 15:39:49 +0000 Subject: Fix keyring path in apt-key --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index cb092b803..a5f2b8960 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.6.39ubuntu2) breezy; urgency=low + + * Fix keyring path in apt-key (I swear I remember doing this before...) + + -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 + apt (0.6.39ubuntu1) breezy; urgency=low * Michael Vogt -- cgit v1.2.3 From 1e4a64bc10b69891d73b2d1bbe41904d069bdd33 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Wed, 29 Jun 2005 15:41:41 +0000 Subject: Fix keyring path in debian/rules --- debian/apt.postinst | 2 +- debian/changelog | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index ae1801198..df0433057 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/changelog b/debian/changelog index a5f2b8960..e8ed03b82 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ apt (0.6.39ubuntu2) breezy; urgency=low - * Fix keyring path in apt-key (I swear I remember doing this before...) + * Fix keyring paths in apt-key, debian/rules (I swear I remember doing this + before...) -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 -- cgit v1.2.3 From b0cd9c846d625517aa1eed2b1065da1cb4830fcc Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Wed, 29 Jun 2005 15:42:01 +0000 Subject: Fix changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e8ed03b82..2391507a9 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,6 @@ apt (0.6.39ubuntu2) breezy; urgency=low - * Fix keyring paths in apt-key, debian/rules (I swear I remember doing this + * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this before...) -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 -- cgit v1.2.3 From 26184a8d0095cc73f730279d1796f308339d76da Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Wed, 29 Jun 2005 15:44:10 +0000 Subject: Increment version to supersede Colin's uploads --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2391507a9..a57872dd6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.39ubuntu2) breezy; urgency=low +apt (0.6.39ubuntu4) breezy; urgency=low * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this before...) -- cgit v1.2.3 From 5573ba1ce06a0fbb684c06e37f110982042986b6 Mon Sep 17 00:00:00 2001 From: Matt Zimmerman Date: Wed, 29 Jun 2005 16:51:13 +0000 Subject: Merge changelog entries from Colin's --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a57872dd6..9784b0c92 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,19 @@ apt (0.6.39ubuntu4) breezy; urgency=low -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 +apt (0.6.39ubuntu3) breezy; urgency=low + + * Fix keyring locations for Ubuntu in apt-key too. + + -- Colin Watson Wed, 29 Jun 2005 14:45:36 +0100 + +apt (0.6.39ubuntu2) breezy; urgency=low + + * Install ubuntu-archive.gpg rather than debian-archive.gpg as + /etc/apt/trusted.gpg. + + -- Colin Watson Wed, 29 Jun 2005 11:53:34 +0100 + apt (0.6.39ubuntu1) breezy; urgency=low * Michael Vogt -- cgit v1.2.3 From 45f7495cf1b62d402616caffacd9f343ca71c44d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 4 Jul 2005 16:38:42 +0000 Subject: * invert the auto-mark flag only for new installs (in MarkInstall()), keep it as it is for upgrades --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a18f18f1a..a11b4ab31 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.39ubuntu1mvo1) unstable; urgency=low +apt (0.6.39ubuntu4mvo1) unstable; urgency=low * Michael Vogt - Change debian/bugscript to use #!/bin/bash (Closes: #313402) -- cgit v1.2.3 From f77bf408f3f7ae650bac2a967f28610737acf1ab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 5 Aug 2005 11:59:11 +0000 Subject: * merged with apt@packages.debian.org/apt--main--0 Patches applied: * apt@packages.debian.org/apt--main--0--patch-100 Use debian.org address in mainline * apt@packages.debian.org/apt--main--0--patch-101 Update pot file * apt@packages.debian.org/apt--main--0--patch-102 Open 0.6.40 * apt@packages.debian.org/apt--main--0--patch-103 Patch from Jordi Mallach to mark some additional strings for translation * apt@packages.debian.org/apt--main--0--patch-104 Updated Catalan translation from Jordi Mallach * apt@packages.debian.org/apt--main--0--patch-105 Merge from bubulle@debian.org--2005/apt--main--0 * apt@packages.debian.org/apt--main--0--patch-106 Restore lost changelog entries * apt@packages.debian.org/apt--main--0--patch-107 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-108 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * bubulle@debian.org--2005/apt--main--0--patch-90 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-91 Updated Slovak translation * bubulle@debian.org--2005/apt--main--0--patch-92 Add apt-key French man page * bubulle@debian.org--2005/apt--main--0--patch-93 Update Greek translations * bubulle@debian.org--2005/apt--main--0--patch-94 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-95 Sync PO files with the POT file/French translation update * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-85 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-1 * inital proof of concept code, understands what dpkg tells it already * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-2 * progress reporting works now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-3 * added "APT::Status-Fd" variable * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-4 * do i18n now too * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-5 * define N_(x) if it is not defined already * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-6 * PackageManager::DoInstall(int status_fd) added (does not break the ABI) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-7 * merged with apt--fixes--0 to make it build again * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-8 * added support for "error" and "conffile-prompt" messages from dpkg * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-9 merge with main * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-10 * use sizeof() for all snprintf() uses; fix a potential line break problem in the status reading code; changed the N_() to _() calls * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-11 * added APT::KeepFDs configuration list for file descriptors that apt should leave open (needed for various frontends like debconf, synaptic) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-12 * fixed a API breakage * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-13 * doc added, should be releasable now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-14 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-15 * more source comments, added Debug::DpkgPM debug code to inspect the dpkg<->apt communication, broke the abi (ok with matt) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-16 * the progress reporting has it's own "Debug::pkgDPkgProgressReporting" debug variable now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-17 * merged PackageOps and TranslatedPackageOps into a single Map with the new DpkgState struct * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-18 * clear the APT::Keep-Fds configuration when it's no longer needed * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-19 * rewrote the reading from dpkg so that it never blocks * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-20 * merged the two status arrays into one * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-21 * added support for download progress reporting too (for Kamion and base-config) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-22 * ABI break; added Configuration::Clear(string List, {int,string} value) added (to remove a single Value from a list); test/conf_clear.cc added --- debian/apt.manpages | 1 + debian/changelog | 300 ++++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 244 insertions(+), 57 deletions(-) (limited to 'debian') diff --git a/debian/apt.manpages b/debian/apt.manpages index 7a15245d4..e621e1c49 100644 --- a/debian/apt.manpages +++ b/debian/apt.manpages @@ -10,6 +10,7 @@ doc/fr/apt-cache.fr.8 doc/fr/apt-cdrom.fr.8 doc/fr/apt-config.fr.8 doc/fr/apt-get.fr.8 +doc/fr/apt-key.fr.8 doc/fr/apt.conf.fr.5 doc/fr/apt_preferences.fr.5 doc/fr/sources.list.fr.5 diff --git a/debian/changelog b/debian/changelog index 9784b0c92..a01e1491b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,35 +1,17 @@ -apt (0.6.39ubuntu4) breezy; urgency=low +apt (0.6.40) unstable; urgency=low - * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this - before...) + * Patch from Jordi Mallach to mark some additional strings for translation + * Updated Catalan translation from Jordi Mallach + * Merge from bubulle@debian.org--2005/apt--main--0: + - Update pot and merge with *.po + - Updated French translation, including apt-key.fr.8 + * Restore changelog entries from the 0.6.x series that went to Debian + experimental + * Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 + - Provide an interface for progress reporting which can be used by + (e.g.) base-config - -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 - -apt (0.6.39ubuntu3) breezy; urgency=low - - * Fix keyring locations for Ubuntu in apt-key too. - - -- Colin Watson Wed, 29 Jun 2005 14:45:36 +0100 - -apt (0.6.39ubuntu2) breezy; urgency=low - - * Install ubuntu-archive.gpg rather than debian-archive.gpg as - /etc/apt/trusted.gpg. - - -- Colin Watson Wed, 29 Jun 2005 11:53:34 +0100 - -apt (0.6.39ubuntu1) breezy; urgency=low - - * Michael Vogt - - Change debian/bugscript to use #!/bin/bash (Closes: #313402) - - Fix a incorrect example in the man-page (closes: #282918) - - Support architecture-specific extra overrides - (closes: #225947). Thanks to Anthony Towns for idea and - the patch, thanks to Colin Watson for testing it. - - better report network timeouts from the methods to the acuire code, - only timeout once per sources.list line - - -- Matt Zimmerman Tue, 28 Jun 2005 11:52:24 -0700 + -- Matt Zimmerman Thu, 28 Jul 2005 11:57:32 -0700 apt (0.6.39) unstable; urgency=low @@ -41,14 +23,7 @@ apt (0.6.39) unstable; urgency=low * Update priority of apt-utils to important, to match the override file * Install only one keyring on each branch (Closes: #316119) - -- Matt Zimmerman Tue, 28 Jun 2005 11:35:21 -0700 - -apt (0.6.38ubuntu1) breezy; urgency=low - - * First release from Ubuntu branch - * Merge with --main--0, switch back to Ubuntu keyring - - -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 + -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 apt (0.6.38) unstable; urgency=low @@ -64,26 +39,7 @@ apt (0.6.38) unstable; urgency=low (closes ubuntu #9935) -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 -======= - -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 ->>>>>>> MERGE-SOURCE -apt (0.6.38) unstable; urgency=low - - * Merge michael.vogt@ubuntu.com--2005/apt--fixes--0--patch-6, a workaround - for the French man pages' failure to build - * Branch Debian and Ubuntu - - apt.postinst, apt-key: use the appropriate keyring - - debian/rules: install all keyrings - * Add the current Debian archive signing key (4F368D5D) to - debian-archive.gpg - * make pinning on the "component" work again (using the section of the - archive, we don't use per-section Release files anymore with apt-0.6) - (closes ubuntu #9935) - - -- Matt Zimmerman Sat, 25 Jun 2005 09:51:00 -0700 - ->>>>>>> MERGE-SOURCE apt (0.6.37) breezy; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-81 @@ -262,6 +218,236 @@ apt (0.6.27) hoary; urgency=low -- Matt Zimmerman Mon, 13 Dec 2004 01:03:11 -0800 +apt (0.6.25) experimental; urgency=low + + * Fix handling of two-part sources for sources.list deb-src entries in + the same way that deb entries were fixed + + -- Matt Zimmerman Wed, 9 Jun 2004 05:29:50 -0700 + +apt (0.6.24) experimental; urgency=low + + * YnPrompt fixes were inadvertently left out, include them (Closes: + #249251) + + -- Matt Zimmerman Sun, 16 May 2004 14:18:53 -0700 + +apt (0.6.23) experimental; urgency=low + + * Remove obsolete pkgIterator::TargetVer() (Closes: #230159) + * Reverse test in CheckAuth to match new prompt (Closes: #248211) + + -- Matt Zimmerman Sun, 9 May 2004 21:01:58 -0700 + +apt (0.6.22) experimental; urgency=low + + * Merge 0.5.25 + * Make the unauthenticated packages prompt more intuitive (yes to + continue, default no), but require --force-yes in addition to + --assume-yes in order to override + + -- Matt Zimmerman Fri, 19 Mar 2004 13:55:35 -0800 + +apt (0.6.21) experimental; urgency=low + + * Merge 0.5.24 + + -- Matt Zimmerman Tue, 16 Mar 2004 22:52:34 -0800 + +apt (0.6.20) experimental; urgency=low + + * Merge 0.5.23 + + -- Matt Zimmerman Thu, 26 Feb 2004 17:17:02 -0800 + +apt (0.6.19) experimental; urgency=low + + * Merge 0.5.22 + * Convert apt-key(8) to docbook XML + + -- Matt Zimmerman Mon, 9 Feb 2004 15:44:49 -0800 + +apt (0.6.18) experimental; urgency=low + + * Add new Debian Archive Automatic Signing Key to the default keyring + (existing keyrings are not updated; do that yourself) + + -- Matt Zimmerman Sat, 17 Jan 2004 17:04:30 -0800 + +apt (0.6.17) experimental; urgency=low + + * Merge 0.5.21 + * Handle more IMS stuff correctly + + -- Matt Zimmerman Fri, 16 Jan 2004 10:54:25 -0800 + +apt (0.6.16) experimental; urgency=low + + * Fix some cases where the .gpg file could be left in place when it is + invalid + + -- Matt Zimmerman Fri, 9 Jan 2004 09:22:15 -0800 + +apt (0.6.15) experimental; urgency=low + + * s/Debug::Acquire::gpg/&v/ + * Honor the [vendor] syntax in sources.list again (though it is not + presently used for anything) + * Don't ship vendors.list(5) since it isn't used yet + * Revert change from 0.6.10; it was right in the first place and the + problem was apparently something else. Archive = Suite. + + -- Matt Zimmerman Mon, 5 Jan 2004 17:43:01 -0800 + +apt (0.6.14) experimental; urgency=low + + * Merge 0.5.20 + + -- Matt Zimmerman Sun, 4 Jan 2004 11:09:21 -0800 + +apt (0.6.13) experimental; urgency=low + + * Merge 0.5.19 + + -- Matt Zimmerman Sat, 3 Jan 2004 16:22:31 -0800 + +apt (0.6.12) experimental; urgency=low + + * Have pkgAcquireIndex calculate an MD5 sum if one is not provided by + the method (as with file: and copy:). Local repositories + * Fix warning about dist name mismatch to actually print what it was + expecting + * Don't expect any particular distribution name for two-part + sources.list entries + * Merge 0.5.18 + + -- Matt Zimmerman Fri, 2 Jan 2004 13:59:00 -0800 + +apt (0.6.11) experimental; urgency=low + + * Support IMS requests of Release.gpg and Release + * This required API changes, bump the libapt-pkg version + * Copy local Release files into Dir::State::Lists + * Set IndexFile attribute when retrieving Release and Release.gpg so + that the appropriate Cache-Control headers are sent + + -- Matt Zimmerman Fri, 2 Jan 2004 10:46:17 -0800 + +apt (0.6.10) experimental; urgency=low + + * Use "Codename" (woody, sarge, etc.) to supply the value of the + "Archive" package file attribute, used to match "release a=" type + pins, rather than "Suite" (stable, testing, etc.) + + -- Matt Zimmerman Thu, 1 Jan 2004 16:56:47 -0800 + +apt (0.6.9) experimental; urgency=low + + * Another tagfile workaround + + -- Matt Zimmerman Thu, 1 Jan 2004 13:56:08 -0800 + +apt (0.6.8) experimental; urgency=low + + * Add a config option and corresponding command line option + (--allow-unauthenticated) to apt-get, to make buildd operators happy + (Closes: #225648) + + -- Matt Zimmerman Wed, 31 Dec 2003 08:28:04 -0800 + +apt (0.6.7) experimental; urgency=low + + * Forgot to revert part of the changes to tagfile in 0.6.4. Hopefully + will fix segfaults for some folks. + + -- Matt Zimmerman Wed, 31 Dec 2003 08:01:28 -0800 + +apt (0.6.6) experimental; urgency=low + + * Restore the ugly hack I removed from indexRecords::Load which set the + pkgTagFile buffer size to (file size)+256. This is concealing a bug, + but I can't fix it right now. This should fix the segfaults that + folks are seeing with 0.6.[45]. + + -- Matt Zimmerman Mon, 29 Dec 2003 18:11:13 -0800 + +apt (0.6.5) experimental; urgency=low + + * Move the authentication check into a separate function in apt-get + * Fix display of unauthenticated packages when they are in the cache + (Closes: #225336) + + -- Matt Zimmerman Sun, 28 Dec 2003 16:47:57 -0800 + +apt (0.6.4) experimental; urgency=low + + * Use the top-level Release file in LoadReleaseInfo, rather than looking + for the per-section ones (which aren't downloaded anymore). This + unbreaks release pinning, including the NotAutomatic bit used by + project/experimental + * Use FileFd::Size() rather than a separate stat() call in + LoadReleaseInfo + * Fix pkgTagFile to leave a little extra room at the end of the buffer + to append the record separator if it isn't present + * Change LoadReleaseInfo to use "Suite" rather than "Archive", to match + the Debian archive's dist-level Release files + + -- Matt Zimmerman Sun, 28 Dec 2003 15:55:55 -0800 + +apt (0.6.3) experimental; urgency=low + + * Fix MetaIndexURI for flat ("foo/") sources + + -- Matt Zimmerman Sun, 28 Dec 2003 12:11:56 -0800 + +apt (0.6.2) experimental; urgency=low + + * Add space between package names when multiple unauthenticated packages + are being installed (Closes: #225212) + * Provide apt-key with a secret keyring and a trustdb, even though we + would never use them, because it blows up if it doesn't have them + * Fix typo in apt-key(8) (standard input is '-', not '/') + + -- Matt Zimmerman Sat, 27 Dec 2003 13:01:40 -0800 + +apt (0.6.1) experimental; urgency=low + + * Merge apt 0.5.17 + * Rearrange Release file authentication code to be more clear + * If Release is present, but Release.gpg is not, don't forget to still + queue Packages files + * Convert distribution "../project/experimental" to "experimental" for + comparison purposes + * Make a number of Release file errors into warnings; for now, it is OK + not to have a codename, for example. We mostly care about checksums + for now + + -- Matt Zimmerman Fri, 26 Dec 2003 15:12:47 -0800 + +apt (0.6.0) experimental; urgency=low + + * Signature verification support patch ("apt-secure") from Colin Walters + and Isaac Jones . This + implements: + - Release signature verification (Release.gpg) + - Packages, Sources md5sum verification against Release + - Closes: #203741 + * Make some modifications to signature verification support: + - Release.gpg is always retrieved and verified if present, rather than + requiring that sources be configured as secure + - Print a hint about installing gnupg if exec(gpgv) fails + - Remove obsolete pkgAcqIndexRel + - Move vendors.list stuff into a separate module (vendorlist.{h,cc}) + - If any files about to be retrieved are not authenticated, issue a + warning to the user and require confirmation + - Fix a heap corruption bug in pkgSrcRecords::pkgSrcRecords() + * Suggests: gnupg + * Install a keyring in /usr/share/apt/debian-archive.gpg containing an + initial set of Debian archive signing keys to seed /etc/apt/trusted.gpg + * Add a new tool, apt-key(8) used to manage the keyring + + -- Matt Zimmerman Fri, 26 Dec 2003 08:27:19 -0800 + apt (0.5.32) hoary; urgency=low * Call setlocale in the methods, so that the messages are properly -- cgit v1.2.3 From dfa11ecc05d342af77f86120c123a3ea618544b6 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 5 Aug 2005 12:04:22 +0000 Subject: * merged the fixes from apt--progress-reporting Patches applied: * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-23 * remvoed a debug string * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-24 * soname changed, fixed a bug in the parsing code when dpkg send the same state more than once (at the end) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-25 * merged with apt@packages.debian.org/apt--main--0, added changelog entry for the 0.6.40.1 upload * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-26 * fix a bug when out-of-order states are send from dpkg * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-27 * changelog update * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-28 * a real changelog entry now --- debian/changelog | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index a01e1491b..7194dd328 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +apt (0.6.40.1) unstable; urgency=low + + * bugfix in the parsing code for the apt<->dpkg communication. apt + crashed when dpkg sends the same state more than once under certain + conditions + * 0.6.40 breaks the ABI but I accidentally didn't change the soname :/ + + -- + apt (0.6.40) unstable; urgency=low * Patch from Jordi Mallach to mark some additional strings for translation -- cgit v1.2.3 From cc5c189e92cbe5899aff4e0b4952097b63a89eca Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Aug 2005 20:18:38 +0000 Subject: * fix the changelog entries --- debian/changelog | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++-- 1 file changed, 54 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7194dd328..f9756624e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.6.40.1ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Michael Vogt Fri, 5 Aug 2005 14:20:56 +0200 + apt (0.6.40.1) unstable; urgency=low * bugfix in the parsing code for the apt<->dpkg communication. apt @@ -5,7 +11,13 @@ apt (0.6.40.1) unstable; urgency=low conditions * 0.6.40 breaks the ABI but I accidentally didn't change the soname :/ - -- + -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 + +apt (0.6.40ubuntu1) breezy; urgency=low + + * Synchronize with Debian + + -- Matt Zimmerman Thu, 4 Aug 2005 15:53:22 -0700 apt (0.6.40) unstable; urgency=low @@ -22,6 +34,39 @@ apt (0.6.40) unstable; urgency=low -- Matt Zimmerman Thu, 28 Jul 2005 11:57:32 -0700 +apt (0.6.39ubuntu4) breezy; urgency=low + + * Fix keyring paths in apt-key, apt.postinst (I swear I remember doing this + before...) + + -- Matt Zimmerman Wed, 29 Jun 2005 08:39:17 -0700 + +apt (0.6.39ubuntu3) breezy; urgency=low + + * Fix keyring locations for Ubuntu in apt-key too. + + -- Colin Watson Wed, 29 Jun 2005 14:45:36 +0100 + +apt (0.6.39ubuntu2) breezy; urgency=low + + * Install ubuntu-archive.gpg rather than debian-archive.gpg as + /etc/apt/trusted.gpg. + + -- Colin Watson Wed, 29 Jun 2005 11:53:34 +0100 + +apt (0.6.39ubuntu1) breezy; urgency=low + + * Michael Vogt + - Change debian/bugscript to use #!/bin/bash (Closes: #313402) + - Fix a incorrect example in the man-page (closes: #282918) + - Support architecture-specific extra overrides + (closes: #225947). Thanks to Anthony Towns for idea and + the patch, thanks to Colin Watson for testing it. + - better report network timeouts from the methods to the acuire code, + only timeout once per sources.list line + + -- Matt Zimmerman Tue, 28 Jun 2005 11:52:24 -0700 + apt (0.6.39) unstable; urgency=low * Welsh translation update: daf@muse.19inch.net--2005/apt--main--0--patch-6 @@ -32,7 +77,14 @@ apt (0.6.39) unstable; urgency=low * Update priority of apt-utils to important, to match the override file * Install only one keyring on each branch (Closes: #316119) - -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 + -- Matt Zimmerman Tue, 28 Jun 2005 11:35:21 -0700 + +apt (0.6.38ubuntu1) breezy; urgency=low + + * First release from Ubuntu branch + * Merge with --main--0, switch back to Ubuntu keyring + + -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 apt (0.6.38) unstable; urgency=low -- cgit v1.2.3 From 4a28c4f1707f66abf5f3a142e69d2d868b3bc2ad Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 8 Aug 2005 20:37:53 +0000 Subject: * fixed the changelog entires (once more) --- debian/changelog | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f9756624e..8bad1ba96 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,7 +2,7 @@ apt (0.6.40.1ubuntu1) breezy; urgency=low * Synchronize with Debian - -- Michael Vogt Fri, 5 Aug 2005 14:20:56 +0200 + -- Michael Vogt Fri, 5 Aug 2005 14:20:56 +0200 apt (0.6.40.1) unstable; urgency=low @@ -11,13 +11,13 @@ apt (0.6.40.1) unstable; urgency=low conditions * 0.6.40 breaks the ABI but I accidentally didn't change the soname :/ - -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 + -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 apt (0.6.40ubuntu1) breezy; urgency=low * Synchronize with Debian - -- Matt Zimmerman Thu, 4 Aug 2005 15:53:22 -0700 + -- Matt Zimmerman Thu, 4 Aug 2005 15:53:22 -0700 apt (0.6.40) unstable; urgency=low -- cgit v1.2.3 From 64995601ae9335dedd180d634940f1426598f7f0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 9 Aug 2005 08:48:41 +0000 Subject: * merged with apt--main Patches applied: * apt@packages.debian.org/apt--main--0--patch-109 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-110 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-29 * changelog finalized * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-30 * propper (and sane) support for pmerror and pmconffile added --- debian/apt-doc.docs | 1 + debian/changelog | 8 ++++++++ 2 files changed, 9 insertions(+) create mode 100644 debian/apt-doc.docs (limited to 'debian') diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs new file mode 100644 index 000000000..a7507f4e7 --- /dev/null +++ b/debian/apt-doc.docs @@ -0,0 +1 @@ +README.progress-reporting \ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 8bad1ba96..35cba6007 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.6.40.2) unstable; urgency=low + + * improved the support for "error" and "conffile" reporting from + dpkg, added the format to README.progress-reporting + * added README.progress-reporting to the apt-doc package + + -- + apt (0.6.40.1ubuntu1) breezy; urgency=low * Synchronize with Debian -- cgit v1.2.3 From 2a7e07c7578048abd9f7bfd4ce0ca5c3696b9f3a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 18 Aug 2005 10:38:58 +0000 Subject: * merged from main Patches applied: * apt@packages.debian.org/apt--main--0--patch-100 Use debian.org address in mainline * apt@packages.debian.org/apt--main--0--patch-101 Update pot file * apt@packages.debian.org/apt--main--0--patch-102 Open 0.6.40 * apt@packages.debian.org/apt--main--0--patch-103 Patch from Jordi Mallach to mark some additional strings for translation * apt@packages.debian.org/apt--main--0--patch-104 Updated Catalan translation from Jordi Mallach * apt@packages.debian.org/apt--main--0--patch-105 Merge from bubulle@debian.org--2005/apt--main--0 * apt@packages.debian.org/apt--main--0--patch-106 Restore lost changelog entries * apt@packages.debian.org/apt--main--0--patch-107 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-108 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-109 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * apt@packages.debian.org/apt--main--0--patch-110 Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 * bubulle@debian.org--2005/apt--main--0--patch-90 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-91 Updated Slovak translation * bubulle@debian.org--2005/apt--main--0--patch-92 Add apt-key French man page * bubulle@debian.org--2005/apt--main--0--patch-93 Update Greek translations * bubulle@debian.org--2005/apt--main--0--patch-94 Merge with Matt * bubulle@debian.org--2005/apt--main--0--patch-95 Sync PO files with the POT file/French translation update * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-85 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-1 * inital proof of concept code, understands what dpkg tells it already * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-2 * progress reporting works now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-3 * added "APT::Status-Fd" variable * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-4 * do i18n now too * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-5 * define N_(x) if it is not defined already * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-6 * PackageManager::DoInstall(int status_fd) added (does not break the ABI) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-7 * merged with apt--fixes--0 to make it build again * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-8 * added support for "error" and "conffile-prompt" messages from dpkg * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-9 merge with main * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-10 * use sizeof() for all snprintf() uses; fix a potential line break problem in the status reading code; changed the N_() to _() calls * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-11 * added APT::KeepFDs configuration list for file descriptors that apt should leave open (needed for various frontends like debconf, synaptic) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-12 * fixed a API breakage * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-13 * doc added, should be releasable now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-14 * merged with apt--main--0 * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-15 * more source comments, added Debug::DpkgPM debug code to inspect the dpkg<->apt communication, broke the abi (ok with matt) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-16 * the progress reporting has it's own "Debug::pkgDPkgProgressReporting" debug variable now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-17 * merged PackageOps and TranslatedPackageOps into a single Map with the new DpkgState struct * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-18 * clear the APT::Keep-Fds configuration when it's no longer needed * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-19 * rewrote the reading from dpkg so that it never blocks * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-20 * merged the two status arrays into one * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-21 * added support for download progress reporting too (for Kamion and base-config) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-22 * ABI break; added Configuration::Clear(string List, {int,string} value) added (to remove a single Value from a list); test/conf_clear.cc added * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-23 * remvoed a debug string * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-24 * soname changed, fixed a bug in the parsing code when dpkg send the same state more than once (at the end) * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-25 * merged with apt@packages.debian.org/apt--main--0, added changelog entry for the 0.6.40.1 upload * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-26 * fix a bug when out-of-order states are send from dpkg * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-27 * changelog update * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-28 * a real changelog entry now * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-29 * changelog finalized * michael.vogt@ubuntu.com--2005/apt--progress-reporting--0--patch-30 * propper (and sane) support for pmerror and pmconffile added --- debian/apt-doc.docs | 1 + debian/apt.manpages | 1 + debian/changelog | 280 ++++++++++++++++++++++++++++++++++++++++++++++++---- 3 files changed, 263 insertions(+), 19 deletions(-) create mode 100644 debian/apt-doc.docs (limited to 'debian') diff --git a/debian/apt-doc.docs b/debian/apt-doc.docs new file mode 100644 index 000000000..a7507f4e7 --- /dev/null +++ b/debian/apt-doc.docs @@ -0,0 +1 @@ +README.progress-reporting \ No newline at end of file diff --git a/debian/apt.manpages b/debian/apt.manpages index 7a15245d4..e621e1c49 100644 --- a/debian/apt.manpages +++ b/debian/apt.manpages @@ -10,6 +10,7 @@ doc/fr/apt-cache.fr.8 doc/fr/apt-cdrom.fr.8 doc/fr/apt-config.fr.8 doc/fr/apt-get.fr.8 +doc/fr/apt-key.fr.8 doc/fr/apt.conf.fr.5 doc/fr/apt_preferences.fr.5 doc/fr/sources.list.fr.5 diff --git a/debian/changelog b/debian/changelog index a11b4ab31..af57cc2b4 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,16 +1,35 @@ -apt (0.6.39ubuntu4mvo1) unstable; urgency=low +apt (0.6.40.2) unstable; urgency=low - * Michael Vogt - - Change debian/bugscript to use #!/bin/bash (Closes: #313402) - - Fix a incorrect example in the man-page (closes: #282918) - - Support architecture-specific extra overrides - (closes: #225947). Thanks to Anthony Towns for idea and - the patch, thanks to Colin Watson for testing it. - - better report network timeouts from the methods to the acuire code, - only timeout once per sources.list line - - support for automatic removal of unused dependencies added + * improved the support for "error" and "conffile" reporting from + dpkg, added the format to README.progress-reporting + * added README.progress-reporting to the apt-doc package + * automatic removal of unused dependencies + + -- Michael Vogt Thu, 18 Aug 2005 11:09:25 +0200 + +apt (0.6.40.1) unstable; urgency=low + + * bugfix in the parsing code for the apt<->dpkg communication. apt + crashed when dpkg sends the same state more than once under certain + conditions + * 0.6.40 breaks the ABI but I accidentally didn't change the soname :/ + + -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 + +apt (0.6.40) unstable; urgency=low - -- Michael Vogt Wed, 29 Jun 2005 13:01:36 +0200 + * Patch from Jordi Mallach to mark some additional strings for translation + * Updated Catalan translation from Jordi Mallach + * Merge from bubulle@debian.org--2005/apt--main--0: + - Update pot and merge with *.po + - Updated French translation, including apt-key.fr.8 + * Restore changelog entries from the 0.6.x series that went to Debian + experimental + * Merge michael.vogt@ubuntu.com--2005/apt--progress-reporting--0 + - Provide an interface for progress reporting which can be used by + (e.g.) base-config + + -- Matt Zimmerman Thu, 28 Jul 2005 11:57:32 -0700 apt (0.6.39) unstable; urgency=low @@ -22,14 +41,7 @@ apt (0.6.39) unstable; urgency=low * Update priority of apt-utils to important, to match the override file * Install only one keyring on each branch (Closes: #316119) - -- Matt Zimmerman Tue, 28 Jun 2005 11:35:21 -0700 - -apt (0.6.38ubuntu1) breezy; urgency=low - - * First release from Ubuntu branch - * Merge with --main--0, switch back to Ubuntu keyring - - -- Matt Zimmerman Sat, 25 Jun 2005 16:52:41 -0700 + -- Matt Zimmerman Tue, 28 Jun 2005 11:51:09 -0700 apt (0.6.38) unstable; urgency=low @@ -225,6 +237,236 @@ apt (0.6.27) hoary; urgency=low -- Matt Zimmerman Mon, 13 Dec 2004 01:03:11 -0800 +apt (0.6.25) experimental; urgency=low + + * Fix handling of two-part sources for sources.list deb-src entries in + the same way that deb entries were fixed + + -- Matt Zimmerman Wed, 9 Jun 2004 05:29:50 -0700 + +apt (0.6.24) experimental; urgency=low + + * YnPrompt fixes were inadvertently left out, include them (Closes: + #249251) + + -- Matt Zimmerman Sun, 16 May 2004 14:18:53 -0700 + +apt (0.6.23) experimental; urgency=low + + * Remove obsolete pkgIterator::TargetVer() (Closes: #230159) + * Reverse test in CheckAuth to match new prompt (Closes: #248211) + + -- Matt Zimmerman Sun, 9 May 2004 21:01:58 -0700 + +apt (0.6.22) experimental; urgency=low + + * Merge 0.5.25 + * Make the unauthenticated packages prompt more intuitive (yes to + continue, default no), but require --force-yes in addition to + --assume-yes in order to override + + -- Matt Zimmerman Fri, 19 Mar 2004 13:55:35 -0800 + +apt (0.6.21) experimental; urgency=low + + * Merge 0.5.24 + + -- Matt Zimmerman Tue, 16 Mar 2004 22:52:34 -0800 + +apt (0.6.20) experimental; urgency=low + + * Merge 0.5.23 + + -- Matt Zimmerman Thu, 26 Feb 2004 17:17:02 -0800 + +apt (0.6.19) experimental; urgency=low + + * Merge 0.5.22 + * Convert apt-key(8) to docbook XML + + -- Matt Zimmerman Mon, 9 Feb 2004 15:44:49 -0800 + +apt (0.6.18) experimental; urgency=low + + * Add new Debian Archive Automatic Signing Key to the default keyring + (existing keyrings are not updated; do that yourself) + + -- Matt Zimmerman Sat, 17 Jan 2004 17:04:30 -0800 + +apt (0.6.17) experimental; urgency=low + + * Merge 0.5.21 + * Handle more IMS stuff correctly + + -- Matt Zimmerman Fri, 16 Jan 2004 10:54:25 -0800 + +apt (0.6.16) experimental; urgency=low + + * Fix some cases where the .gpg file could be left in place when it is + invalid + + -- Matt Zimmerman Fri, 9 Jan 2004 09:22:15 -0800 + +apt (0.6.15) experimental; urgency=low + + * s/Debug::Acquire::gpg/&v/ + * Honor the [vendor] syntax in sources.list again (though it is not + presently used for anything) + * Don't ship vendors.list(5) since it isn't used yet + * Revert change from 0.6.10; it was right in the first place and the + problem was apparently something else. Archive = Suite. + + -- Matt Zimmerman Mon, 5 Jan 2004 17:43:01 -0800 + +apt (0.6.14) experimental; urgency=low + + * Merge 0.5.20 + + -- Matt Zimmerman Sun, 4 Jan 2004 11:09:21 -0800 + +apt (0.6.13) experimental; urgency=low + + * Merge 0.5.19 + + -- Matt Zimmerman Sat, 3 Jan 2004 16:22:31 -0800 + +apt (0.6.12) experimental; urgency=low + + * Have pkgAcquireIndex calculate an MD5 sum if one is not provided by + the method (as with file: and copy:). Local repositories + * Fix warning about dist name mismatch to actually print what it was + expecting + * Don't expect any particular distribution name for two-part + sources.list entries + * Merge 0.5.18 + + -- Matt Zimmerman Fri, 2 Jan 2004 13:59:00 -0800 + +apt (0.6.11) experimental; urgency=low + + * Support IMS requests of Release.gpg and Release + * This required API changes, bump the libapt-pkg version + * Copy local Release files into Dir::State::Lists + * Set IndexFile attribute when retrieving Release and Release.gpg so + that the appropriate Cache-Control headers are sent + + -- Matt Zimmerman Fri, 2 Jan 2004 10:46:17 -0800 + +apt (0.6.10) experimental; urgency=low + + * Use "Codename" (woody, sarge, etc.) to supply the value of the + "Archive" package file attribute, used to match "release a=" type + pins, rather than "Suite" (stable, testing, etc.) + + -- Matt Zimmerman Thu, 1 Jan 2004 16:56:47 -0800 + +apt (0.6.9) experimental; urgency=low + + * Another tagfile workaround + + -- Matt Zimmerman Thu, 1 Jan 2004 13:56:08 -0800 + +apt (0.6.8) experimental; urgency=low + + * Add a config option and corresponding command line option + (--allow-unauthenticated) to apt-get, to make buildd operators happy + (Closes: #225648) + + -- Matt Zimmerman Wed, 31 Dec 2003 08:28:04 -0800 + +apt (0.6.7) experimental; urgency=low + + * Forgot to revert part of the changes to tagfile in 0.6.4. Hopefully + will fix segfaults for some folks. + + -- Matt Zimmerman Wed, 31 Dec 2003 08:01:28 -0800 + +apt (0.6.6) experimental; urgency=low + + * Restore the ugly hack I removed from indexRecords::Load which set the + pkgTagFile buffer size to (file size)+256. This is concealing a bug, + but I can't fix it right now. This should fix the segfaults that + folks are seeing with 0.6.[45]. + + -- Matt Zimmerman Mon, 29 Dec 2003 18:11:13 -0800 + +apt (0.6.5) experimental; urgency=low + + * Move the authentication check into a separate function in apt-get + * Fix display of unauthenticated packages when they are in the cache + (Closes: #225336) + + -- Matt Zimmerman Sun, 28 Dec 2003 16:47:57 -0800 + +apt (0.6.4) experimental; urgency=low + + * Use the top-level Release file in LoadReleaseInfo, rather than looking + for the per-section ones (which aren't downloaded anymore). This + unbreaks release pinning, including the NotAutomatic bit used by + project/experimental + * Use FileFd::Size() rather than a separate stat() call in + LoadReleaseInfo + * Fix pkgTagFile to leave a little extra room at the end of the buffer + to append the record separator if it isn't present + * Change LoadReleaseInfo to use "Suite" rather than "Archive", to match + the Debian archive's dist-level Release files + + -- Matt Zimmerman Sun, 28 Dec 2003 15:55:55 -0800 + +apt (0.6.3) experimental; urgency=low + + * Fix MetaIndexURI for flat ("foo/") sources + + -- Matt Zimmerman Sun, 28 Dec 2003 12:11:56 -0800 + +apt (0.6.2) experimental; urgency=low + + * Add space between package names when multiple unauthenticated packages + are being installed (Closes: #225212) + * Provide apt-key with a secret keyring and a trustdb, even though we + would never use them, because it blows up if it doesn't have them + * Fix typo in apt-key(8) (standard input is '-', not '/') + + -- Matt Zimmerman Sat, 27 Dec 2003 13:01:40 -0800 + +apt (0.6.1) experimental; urgency=low + + * Merge apt 0.5.17 + * Rearrange Release file authentication code to be more clear + * If Release is present, but Release.gpg is not, don't forget to still + queue Packages files + * Convert distribution "../project/experimental" to "experimental" for + comparison purposes + * Make a number of Release file errors into warnings; for now, it is OK + not to have a codename, for example. We mostly care about checksums + for now + + -- Matt Zimmerman Fri, 26 Dec 2003 15:12:47 -0800 + +apt (0.6.0) experimental; urgency=low + + * Signature verification support patch ("apt-secure") from Colin Walters + and Isaac Jones . This + implements: + - Release signature verification (Release.gpg) + - Packages, Sources md5sum verification against Release + - Closes: #203741 + * Make some modifications to signature verification support: + - Release.gpg is always retrieved and verified if present, rather than + requiring that sources be configured as secure + - Print a hint about installing gnupg if exec(gpgv) fails + - Remove obsolete pkgAcqIndexRel + - Move vendors.list stuff into a separate module (vendorlist.{h,cc}) + - If any files about to be retrieved are not authenticated, issue a + warning to the user and require confirmation + - Fix a heap corruption bug in pkgSrcRecords::pkgSrcRecords() + * Suggests: gnupg + * Install a keyring in /usr/share/apt/debian-archive.gpg containing an + initial set of Debian archive signing keys to seed /etc/apt/trusted.gpg + * Add a new tool, apt-key(8) used to manage the keyring + + -- Matt Zimmerman Fri, 26 Dec 2003 08:27:19 -0800 + apt (0.5.32) hoary; urgency=low * Call setlocale in the methods, so that the messages are properly -- cgit v1.2.3 From 5d4aff08accfd096d50d99a24df1437a2fa41c8d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Aug 2005 17:45:11 +0000 Subject: * merged the trust-cdrom branch Patches applied: * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--base-0 tag of apt@packages.debian.org/apt--main--0--patch-79 * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-1 * implemented "TrustCDROM" mode * michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0--patch-2 * added APT::Authentication::TrustCDROM to the configure-index --- debian/changelog | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 61f5be622..a5f4f11ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.40.2) unstable; urgency=low +apt (0.6.40.1ubuntu2) breezy; urgency=low * improved the support for "error" and "conffile" reporting from dpkg, added the format to README.progress-reporting @@ -11,14 +11,15 @@ apt (0.6.40.2) unstable; urgency=low * apt-pkg/acquire-item.cc: - fail early if a FailReason is TmpResolveFailure (avoids hangs during the install when no network is available) + * merged michael.vogt@ubuntu.com--2005/apt--trust-cdrom--0 - -- + -- Michael Vogt Tue, 23 Aug 2005 19:44:55 +0200 apt (0.6.40.1ubuntu1) breezy; urgency=low - * Synchronize with Debian + * Synchronize with Debian - -- Michael Vogt Fri, 5 Aug 2005 14:20:56 +0200 + -- Michael Vogt Fri, 5 Aug 2005 14:20:56 +0200 apt (0.6.40.1) unstable; urgency=low @@ -27,13 +28,13 @@ apt (0.6.40.1) unstable; urgency=low conditions * 0.6.40 breaks the ABI but I accidentally didn't change the soname :/ - -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 + -- Michael Vogt Fri, 5 Aug 2005 13:24:58 +0200 apt (0.6.40ubuntu1) breezy; urgency=low - * Synchronize with Debian + * Synchronize with Debian - -- Matt Zimmerman Thu, 4 Aug 2005 15:53:22 -0700 + -- Matt Zimmerman Thu, 4 Aug 2005 15:53:22 -0700 apt (0.6.40) unstable; urgency=low -- cgit v1.2.3 From 3971f8e87d659d9ac657dafdf665019a9cfc5c4c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Sep 2005 13:39:41 +0000 Subject: * fix a typo --- debian/apt.cron.daily | 2 +- debian/changelog | 7 +++++++ 2 files changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index e3aaccfb0..26dfa2530 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -121,7 +121,7 @@ check_size_constraints() # check for MinAge of the file if [ ! $MinAge -eq 0 ]; then # check both ctime and mtime - mtime=$(date -c %Y $file) + mtime=$(stat -c %Y $file) ctime=$(stat -c %Z $file) if [ $mtime -gt $ctime ]; then delta=$(($now-$mtime)) diff --git a/debian/changelog b/debian/changelog index a270e3b25..d2c8fabd8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.40.1ubuntu4) breezy; urgency=low + + * debian/apt.cron.daily: + - fix a embarrassing typo + + -- Michael Vogt Wed, 7 Sep 2005 10:10:37 +0200 + apt (0.6.40.1ubuntu3) breezy; urgency=low * debian/apt.cron.daily: -- cgit v1.2.3 From 1e9331420fe8b6bed8aa88fb918f054eab7d2d3f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 13 Sep 2005 11:47:29 +0000 Subject: * changelog spelling :) --- debian/changelog | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c1a625b97..25b9005ec 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,8 +1,8 @@ apt (0.6.40.1ubuntu5) breezy; urgency=low - * Cheery picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}. + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-{50,51}. This adds media-change reporting to the apt status-fd (ubuntu #15213) - * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55: + * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-55: apt-pkg/cdrom.cc: - unmount the cdrom when apt failed to locate any package files -- cgit v1.2.3 From d11052999e27fb482e4858afed09218d01ded299 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 27 Sep 2005 17:03:17 +0000 Subject: * updated po/pot files --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index f9e9c22ef..75aaaa6d6 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.6.40.1ubuntu7) breezy; urgency=low + + * updated the pot/po files , no code changes + + -- Michael Vogt Tue, 27 Sep 2005 18:38:16 +0200 + apt (0.6.40.1ubuntu6) breezy; urgency=low * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-56: -- cgit v1.2.3 From be2d3759d2b9fb35b0e9c5c24f264d3dafbb1ed0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 28 Sep 2005 20:46:12 +0000 Subject: * makefile fixes to make apt rosetta friendly --- debian/changelog | 6 ++++-- debian/rules | 5 +++++ 2 files changed, 9 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 852029360..7cbcdc61e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,10 @@ apt (0.6.40.1ubuntu8) breezy; urgency=low * Cherry picked michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-62: - fix for a bad memory/file leak in the mmap code (ubuntu #15603) - * po/de.po: - - updated the translation + * po/de.po, po/fr.po: + - updated the translations + * po/makefile: + - create a single pot file in each domain dir to make rosetta happy -- Michael Vogt Wed, 28 Sep 2005 10:16:06 +0200 diff --git a/debian/rules b/debian/rules index 3bc9f53d9..1e339aade 100755 --- a/debian/rules +++ b/debian/rules @@ -213,6 +213,11 @@ apt: build debian/shlibs.local # head -n 500 ChangeLog > debian/ChangeLog + # make rosetta happy and remove pot files in po/ (but leave stuff + # in po/domains/* untouched) and cp *.po into each domain dir + rm -f build/po/*.pot + rm -f po/*.pot + dh_installexamples -p$@ $(BLD)/docs/examples/* dh_installman -p$@ dh_installcron -p$@ -- cgit v1.2.3 From 7a6058744badb38d2ccac0158d6ed1359cfb0239 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Dec 2005 17:29:42 +0000 Subject: * merged with the current debian version Patches applied: * bubulle@debian.org--2005/apt--main--0--patch-132 Completed Simplified Chinese translation * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-94 * pkgDirStream has (slightly) better extract support now * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-95 * merge fix for #339533 * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-96 * merged with bubulle * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-97 * some more debug output * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-98 * ABI change: merged more flexible pkgAcquireFile code * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-99 * merged http download limit for apt (#146877) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-100 * applied parts of the string speedup patch from debian #319377 (ABI change) * michael.vogt@ubuntu.com--2005/apt--mvo--0--patch-101 * fix for #340448 --- debian/apt.manpages | 1 + debian/rules | 1 + 2 files changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/apt.manpages b/debian/apt.manpages index e621e1c49..b52ea3d3d 100644 --- a/debian/apt.manpages +++ b/debian/apt.manpages @@ -3,6 +3,7 @@ doc/apt-cdrom.8 doc/apt-config.8 doc/apt-get.8 doc/apt-key.8 +doc/apt-secure.8 doc/apt.8 doc/apt.conf.5 doc/apt_preferences.5 diff --git a/debian/rules b/debian/rules index 1e339aade..6c0a24fd9 100755 --- a/debian/rules +++ b/debian/rules @@ -274,6 +274,7 @@ apt-utils: build debian/shlibs.local cp $(addprefix $(BLD)/bin/apt-,$(APT_UTILS)) debian/$@/usr/bin/ dh_installdocs -p$@ + dh_installexamples -p$@ # Install the man pages.. dh_installman -p$@ -- cgit v1.2.3 From dd3ee0ced482fcd3533e0e5b113bb575fe7a7633 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Dec 2005 17:36:41 +0000 Subject: * added the apt-secure manpage --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 16fdd1596..d57825909 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.43ubuntu2) dapper; urgency=low + + * merged some missing bits that where dropped by the previous + merge (*cough*) + + -- Michael Vogt Thu, 8 Dec 2005 18:35:58 +0100 + apt (0.6.43ubuntu1) dapper; urgency=low * merged with debian -- cgit v1.2.3 From 0f3579bce9bd81a91a6ec8f41051f13fa668cb7b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Dec 2005 17:47:27 +0000 Subject: * add more missing bits from debians apt --- debian/apt-utils.examples | 1 + 1 file changed, 1 insertion(+) create mode 100644 debian/apt-utils.examples (limited to 'debian') diff --git a/debian/apt-utils.examples b/debian/apt-utils.examples new file mode 100644 index 000000000..25aadf996 --- /dev/null +++ b/debian/apt-utils.examples @@ -0,0 +1 @@ +doc/examples/apt-ftparchive.conf \ No newline at end of file -- cgit v1.2.3 From 193593331d2833dbc640f3bb1ad3dd6bfaac858f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 8 Dec 2005 17:57:26 +0000 Subject: * more missing files added, this is really strange, I wonder if baz hates me :( --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 4aa7b5aa2..5c76a90eb 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.1 -Build-Depends: debhelper (>= 4.1.62), libdb4.2-dev, gettext (>= 0.12) +Build-Depends: debhelper (>= 4.1.62), libdb4.3-dev, gettext (>= 0.12) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt -- cgit v1.2.3 From a3e5f77bc1cbd7fcf911782bb264e67b753aef71 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 9 Dec 2005 09:10:38 +0000 Subject: * fixed conflict in changelog --- debian/changelog | 10 +++------- 1 file changed, 3 insertions(+), 7 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 2061f8125..f7f00354f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ apt (0.6.43ubuntu2) dapper; urgency=low - * merged some missing bits that where dropped by the previous - merge (*cough*) + * merged some missing bits that wheren't merged by baz in the previous + upload (*grumble*) -- Michael Vogt Thu, 8 Dec 2005 18:35:58 +0100 @@ -29,8 +29,7 @@ apt (0.6.43) unstable; urgency=medium * Fix GNU/kFreeBSD crash on non-existing server file (closes: #317718) * switch to libdb4.3 in build-depends -<<<<<<< TREE - -- Michael Vogt Fri, 25 Nov 2005 11:22:31 +0100 + -- Michael Vogt Tue, 29 Nov 2005 00:17:07 +0100 apt (0.6.42.3ubuntu2) dapper; urgency=low @@ -47,9 +46,6 @@ apt (0.6.42.3ubuntu1) dapper; urgency=low * synced with debian -- Michael Vogt Thu, 10 Nov 2005 05:05:56 +0100 -======= - -- Michael Vogt Tue, 29 Nov 2005 00:17:07 +0100 ->>>>>>> MERGE-SOURCE apt (0.6.42.3) unstable; urgency=low -- cgit v1.2.3 From fdd15654d89c08ef056905529df4992db1ab67f4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 9 Dec 2005 15:53:02 +0000 Subject: * unattended-upgrade integrated into the APT::Periodic system --- debian/apt.cron.daily | 16 ++++++++++++++++ debian/changelog | 7 +++++++ 2 files changed, 23 insertions(+) (limited to 'debian') diff --git a/debian/apt.cron.daily b/debian/apt.cron.daily index 26dfa2530..b4cbf1c8a 100644 --- a/debian/apt.cron.daily +++ b/debian/apt.cron.daily @@ -14,6 +14,12 @@ # "APT::Periodic::AutocleanInterval" # - Do "apt-get autoclean" every n-days (0=disable) # +# "APT::Periodic::Unattended-Upgrade" +# - Run the "unattended-upgrade" security upgrade script +# every n-days (0=disabled) +# Requires the package "unattended-upgrades" and will write +# a log in /var/log/unattended-upgrades +# # "APT::Archives::MaxAge", # - Set maximum allowed age of a cache package file. If a cache # package file is older it is deleted (0=disable) @@ -148,6 +154,10 @@ eval $(apt-config shell UpdateInterval APT::Periodic::Update-Package-Lists Downl AutocleanInterval=$DownloadUpgradeableInterval eval $(apt-config shell AutocleanInterval APT::Periodic::Autoclean) +UnattendedUpgradeInterval=0 +eval $(apt-config shell UnattendedUpgradeInterval APT::Periodic::Unattended-Upgrade) + + # laptop check, on_ac_power returns: # 0 (true) System is on mains power # 1 (false) System is not on mains power @@ -182,5 +192,11 @@ if check_stamp $AUTOCLEAN_STAMP $AutocleanInterval; then update_stamp $AUTOCLEAN_STAMP fi +UPGRADE_STAMP=/var/lib/apt/periodic/upgrade-stamp +if check_stamp $UPGRADE_STAMP $UnattendedUpgradeInterval; then + unattended-upgrade + update_stamp $UPGRADE_STAMP +fi + # check cache size check_size_constraints diff --git a/debian/changelog b/debian/changelog index f7f00354f..2655e3db7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.43ubuntu3) added; urgency=low + + * added APT::Periodic::Unattended-Upgrade (requires the package + "unattended-upgrade") + + -- Michael Vogt Fri, 9 Dec 2005 16:51:32 +0100 + apt (0.6.43ubuntu2) dapper; urgency=low * merged some missing bits that wheren't merged by baz in the previous -- cgit v1.2.3 From 79b41ef196ed0ec3cfda58cc5d17c4f6ef6423e0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 25 Jan 2006 12:21:39 +0000 Subject: * finalize changelog --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 4a1827985..42056b1b7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -19,7 +19,7 @@ apt (0.6.43.1ubuntu1) dapper; urgency=low * added APT::Periodic::Unattended-Upgrade (requires the package "unattended-upgrade") - -- + -- Michael Vogt Tue, 10 Jan 2006 17:09:31 +0100 apt (0.6.43.1) unstable; urgency=low -- cgit v1.2.3 From 9ceaa28f2ce0bde0cbf6f73a32a68761ec85f11d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 20 Feb 2006 18:50:44 +0000 Subject: * make errors during apt-get update warnings only (default sources spec) --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 92a4671f9..3490fba7c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -25,6 +25,7 @@ apt (0.6.43.3) unstable; urgency=low * make apt-cache madison work without deb-src entries (#352583) * cmdline/apt-get.cc: only run the list-cleaner if a update was successfull + * apt-get update errors are only warnings nowdays -- -- cgit v1.2.3 From 47eb38f452c7477aab782dce56e85a0a85e22764 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 21 Feb 2006 12:23:22 +0000 Subject: * handle network failures more gracefully (default apt sources spec) apt-pkg/acquire-item.cc: - on network failures (Timeout,ResolveFailure,ConnectionRefused) move the old (known good) sigfile back and don't touch the indexfiles cmdline/apt-get.cc: - don't fail on apt-get update problems but issue a warning instead --- debian/changelog | 23 +++++++++++++++++++++-- 1 file changed, 21 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3490fba7c..8c53d7a5c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.43.3) unstable; urgency=low +apt (0.6.43.2ubuntu1) dapper; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-182: * ca.po: Completed to 512t. Closes: #351592 @@ -26,8 +26,9 @@ apt (0.6.43.3) unstable; urgency=low * cmdline/apt-get.cc: only run the list-cleaner if a update was successfull * apt-get update errors are only warnings nowdays + * be more careful with the signature file on network failures - -- + -- Michael Vogt Mon, 20 Feb 2006 22:27:48 +0100 apt (0.6.43.2) unstable; urgency=low @@ -54,6 +55,24 @@ apt (0.6.43.2) unstable; urgency=low -- Michael Vogt Thu, 19 Jan 2006 00:06:33 +0100 +apt (0.6.43.1ubuntu1) dapper; urgency=low + + * Merge bubulle@debian.org--2005/apt--main--0 up to patch-159: + - en_GB.po, de.po: fix spaces errors in "Ign " translations + Closes: #347258 + - makefile: make update-po a pre-requisite of clean target so + that POT and PO files are always up-to-date + - sv.po: Completed to 511t. Closes: #346450 + - sk.po: Completed to 511t. Closes: #346369 + - fr.po: Completed to 511t + - *.po: Updated from sources (511 strings) + * add patch to fix http download corruption problem (thanks to + Petr Vandrovec, closes: #280844, #290694) + * added APT::Periodic::Unattended-Upgrade (requires the package + "unattended-upgrade") + + -- Michael Vogt Tue, 10 Jan 2006 17:09:31 +0100 + apt (0.6.43.1) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-148: -- cgit v1.2.3 From bc57e2bb166cc3657e15294c2bed3d1138cd7d97 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 21 Feb 2006 12:37:31 +0000 Subject: * fixed changelog --- debian/changelog | 2 -- 1 file changed, 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8c53d7a5c..fc1545230 100644 --- a/debian/changelog +++ b/debian/changelog @@ -50,8 +50,6 @@ apt (0.6.43.2) unstable; urgency=low * typos fixed in apt-cache.8 (closes: #348348, #347349) * add patch to fix http download corruption problem (thanks to Petr Vandrovec, closes: #280844, #290694) - * added APT::Periodic::Unattended-Upgrade (requires the package - "unattended-upgrade") -- Michael Vogt Thu, 19 Jan 2006 00:06:33 +0100 -- cgit v1.2.3 From 2913337f8e15ec33e1637a7b7b46c9c11b80d247 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Mar 2006 21:43:03 +0200 Subject: * undo some of the bzr merge damage from the last merge --- debian/apt.postinst | 2 +- debian/rules | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/apt.postinst b/debian/apt.postinst index ae1801198..df0433057 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,7 +17,7 @@ case "$1" in configure) if ! test -f /etc/apt/trusted.gpg; then - cp /usr/share/apt/debian-archive.gpg /etc/apt/trusted.gpg + cp /usr/share/apt/ubuntu-archive.gpg /etc/apt/trusted.gpg fi ;; diff --git a/debian/rules b/debian/rules index bd9073ad2..4d88d5b12 100755 --- a/debian/rules +++ b/debian/rules @@ -210,7 +210,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/debian-archive.gpg debian/$@/usr/share/$@ + cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ # head -n 500 ChangeLog > debian/ChangeLog -- cgit v1.2.3 From cac8ab63905e51def855974d4bf3798779d47e22 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 28 Mar 2006 22:15:08 +0200 Subject: * changelog update --- debian/changelog | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 98d5b0f6b..81e4acf0d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,7 @@ apt (0.6.43.3ubuntu1) dapper; urgency=low - * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large + * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in + the status-fd (ubuntu #28954) -- Michael Vogt Tue, 28 Mar 2006 20:34:46 +0200 -- cgit v1.2.3 From 6627bdccce46a9acdae09d37e6e1444a5f7384e1 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 18 Apr 2006 13:25:13 +0200 Subject: * wording fixes (cherry picked from apt--mvo) --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 81e4acf0d..e8962595f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.6.43.3ubuntu2) dapper; urgency=low + + * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) + + -- Michael Vogt Tue, 18 Apr 2006 13:24:40 +0200 + apt (0.6.43.3ubuntu1) dapper; urgency=low * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large in -- cgit v1.2.3 From c833c7a16381c383588265bbb35ed24ad383b53f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 26 May 2006 18:17:09 +0200 Subject: * methods/http.cc: change user agent from debian to ubuntu --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e8962595f..08ba10a63 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.43.3ubuntu3) dapper; urgency=low + + * methods/http.cc: + - fix the user-agent string + + -- Michael Vogt Fri, 26 May 2006 18:09:32 +0200 + apt (0.6.43.3ubuntu2) dapper; urgency=low * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) -- cgit v1.2.3 From 8953292ef197b80c16d08b31830945fb7ac9ff8d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Jul 2006 11:01:59 +0200 Subject: * merged changes from Kamions upload (thanks!) --- debian/changelog | 6 ++++++ 1 file changed, 6 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e88ec1e37..297ce020b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +apt (0.6.44.2ubuntu3) edgy; urgency=low + + * Close extended_states file after writing it. + + -- Colin Watson Tue, 18 Jul 2006 00:12:13 +0100 + apt (0.6.44.2ubuntu2) edgy; urgency=low * create a empty extended_states file if none exists already -- cgit v1.2.3 From 003585704e7f6542bf2c96c241d05daf06eeb7f2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 21 Jul 2006 11:17:55 +0200 Subject: * debian/changelog: - whitespace change to make lintian happy --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index e13b23138..432776d14 100644 --- a/debian/changelog +++ b/debian/changelog @@ -29,7 +29,7 @@ apt (0.6.44.2ubuntu1) edgy; urgency=low -- Michael Vogt Mon, 3 Jul 2006 18:30:46 +0200 -apt (0.6.44.2) unstable; urgency=low +apt (0.6.44.2) unstable; urgency=low * apt-pkg/depcache.cc: - added Debug::pkgDepCache::AutoInstall (thanks to infinity) -- cgit v1.2.3 From df78a81e47daa9de9d26f9bbc28708c8cd8fc6e4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 25 Jul 2006 14:55:27 +0200 Subject: * changelog update --- debian/changelog | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0c4a4da37..d21348047 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,12 +2,11 @@ apt (0.6.44.2exp1) experimental; urgency=low * added support for i18n of the package descriptions * added support for aptitude like auto-install tracking (a HUGE - HUGE thanks to Daniel Burrows who made this possible, if you meet - him, please give him a HUG and tell him how great he his!) + HUGE thanks to Daniel Burrows who made this possible) * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental - - -- Michael Vogt Tue, 6 Jun 2006 19:31:31 +0200 + + -- Michael Vogt Mon, 3 Jul 2006 21:50:31 +0200 apt (0.6.44.2) unstable; urgency=low -- cgit v1.2.3 From 73c460c358cfa6615ee6760a3fb8d88988a12856 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 9 Aug 2006 17:17:04 +0200 Subject: * apt-pkg/init.cc: - init "install-recommends", "install-suggests" with default "false" * debian/changelog: - updated --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index de9a43d49..65ec82cc1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.45.2) unstable; urgency=low + + * added "--install-recommends" to handle recommends as + dependencies (closes: #42266) + + -- + apt (0.6.45.1) unstable; urgency=low * debian/control: -- cgit v1.2.3 From ca7013a815d076297b16f52798bbe4b2482e9b6f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 14 Aug 2006 13:32:51 +0200 Subject: * changelog updated --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 16678d805..8b8866e7e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,7 +1,7 @@ apt (0.6.45ubuntu3) edgy; urgency=low * ABI break - * merged latest apt--install-recommends + * merged latest apt--install-recommends (closes: #559000) * added "--fix-policy" option to can be used as "--fix-broken" and will install missing weak depends (recommends, and/or suggests depending on the settings) -- cgit v1.2.3 From 8eff320d8061aa7cad48c7eaf834f70e1d3e86b4 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 14 Aug 2006 21:16:02 +0200 Subject: * cmdline/apt-get.cc: - fix the "fix-policy" code * debian/changelog: - new version --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8b8866e7e..0bb679c5a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.45ubuntu4) edgy; urgency=low + + * cmdline/apt-get.cc: + - fix in the new --fix-polciy code + + -- Michael Vogt Mon, 14 Aug 2006 21:08:11 +0200 + apt (0.6.45ubuntu3) edgy; urgency=low * ABI break -- cgit v1.2.3 From a498783013497735fb9fa484be60f6148289b0bb Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 15 Aug 2006 12:08:36 +0200 Subject: * apt-pkg/pkgcachegen.cc: - increased the cache limit --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 0bb679c5a..55c88c4c8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.6.45ubuntu5) edgy; urgency=low + + * apt-pkg/pkgcachegen.cc: + - increase the APT::Cache-Limit to deal with the increased demand due + to the translated descriptions + + -- Michael Vogt Tue, 15 Aug 2006 12:06:26 +0200 + apt (0.6.45ubuntu4) edgy; urgency=low * cmdline/apt-get.cc: -- cgit v1.2.3 From 857a1d4aafc7fd4cc9d1f22c7ef4d274b09c2906 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 15 Aug 2006 12:59:52 +0200 Subject: * apt-pkg/deb/dpkgpm.cc: - pass --auto-deconfigure to dpkg (-B) * debian/control: - depend on a dpkg with support for breaks --- debian/changelog | 5 +++++ debian/control | 2 +- 2 files changed, 6 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 55c88c4c8..da396e755 100644 --- a/debian/changelog +++ b/debian/changelog @@ -3,6 +3,11 @@ apt (0.6.45ubuntu5) edgy; urgency=low * apt-pkg/pkgcachegen.cc: - increase the APT::Cache-Limit to deal with the increased demand due to the translated descriptions + * apt-pkg/deb/dpkgpm.cc: + - pass "--auto-deconfigure" to dpkg on install to support the + new "breaks" in dpkg + * debian/control: + - depend on a dpkg with "breaks" support -- Michael Vogt Tue, 15 Aug 2006 12:06:26 +0200 diff --git a/debian/control b/debian/control index dfcebf41e..62ca713f1 100644 --- a/debian/control +++ b/debian/control @@ -14,7 +14,7 @@ Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} Recommends: ubuntu-keyring -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg +Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev (>= 1.13.22ubuntu4), apt-doc, bzip2, gnupg Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. -- cgit v1.2.3 From 01af346ab90dd293fc54b2d2760466fda73f4be9 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 15 Aug 2006 21:45:12 +0200 Subject: * changelog updated --- debian/changelog | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 88b35413f..0c4ac04b5 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,15 @@ apt (0.6.45exp2) experimental; urgency=low - * merged "install-recommends" branch (ABI break): + * merged "install-recommends" branch (ABI break): - new "--install-recommends" - install new recommends on "upgrade" if --install-recommends is given - new "--fix-policy" option to install all packages with unmet important dependencies (usefull with --install-recommends to see what not-installed recommends are on the system) + - fix of recommended packages display (only show CandidateVersion + fix or-group handling) + (closes: #42266, #281534, #257054) -- Michael Vogt Mon, 14 Aug 2006 17:47:25 +0200 -- cgit v1.2.3 From 308c7d30ed2e937cde65e5fed8cbf717fba113c3 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 25 Aug 2006 15:39:15 +0100 Subject: initial Breaks implementation --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index da396e755..9c6232a6c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.45ubuntu6~iwj) unstable; urgency=low + + * Initial draft of `Breaks' implementation. Appears to compile, + but as yet *completely untested*. + + -- Ian Jackson Fri, 25 Aug 2006 15:39:07 +0100 + apt (0.6.45ubuntu5) edgy; urgency=low * apt-pkg/pkgcachegen.cc: -- cgit v1.2.3 From d242b9e788311e7f19ceaa9dc24f5e426005ae4c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 5 Sep 2006 19:51:17 +0100 Subject: bump cache version --- debian/changelog | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 9c6232a6c..96b752424 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.6.45ubuntu6~iwj2) unstable; urgency=low + + * Tests pass without code changes! Except that we need this: + * Bump cache file major version to force rebuild so that Breaks + dependencies are included. + + -- Ian Jackson Tue, 5 Sep 2006 19:50:02 +0100 + apt (0.6.45ubuntu6~iwj) unstable; urgency=low * Initial draft of `Breaks' implementation. Appears to compile, -- cgit v1.2.3 From 8e72d2085d7c84466d25178c2eb256ad3e972dde Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 Sep 2006 18:07:24 +0200 Subject: * debian/changelog: - don't rewrite history * debian/control: - added dpkg versionized depends --- debian/changelog | 2 -- debian/control | 4 ++-- 2 files changed, 2 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index da396e755..37953090d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -6,8 +6,6 @@ apt (0.6.45ubuntu5) edgy; urgency=low * apt-pkg/deb/dpkgpm.cc: - pass "--auto-deconfigure" to dpkg on install to support the new "breaks" in dpkg - * debian/control: - - depend on a dpkg with "breaks" support -- Michael Vogt Tue, 15 Aug 2006 12:06:26 +0200 diff --git a/debian/control b/debian/control index 62ca713f1..47406b09f 100644 --- a/debian/control +++ b/debian/control @@ -9,12 +9,12 @@ Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, dpkg (>= 1.13.22ubuntu4) Priority: important Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} Recommends: ubuntu-keyring -Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev (>= 1.13.22ubuntu4), apt-doc, bzip2, gnupg +Suggests: aptitude | synaptic | gnome-apt | wajig, dpkg-dev, apt-doc, bzip2, gnupg Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. -- cgit v1.2.3 From ddbad60124be7317ba965386cea7f8c65155991c Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Wed, 6 Sep 2006 17:17:28 +0100 Subject: version 0.6.45ubuntu6 --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 96b752424..376d6035f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -apt (0.6.45ubuntu6~iwj2) unstable; urgency=low +apt (0.6.45ubuntu6) unstable; urgency=low * Tests pass without code changes! Except that we need this: * Bump cache file major version to force rebuild so that Breaks -- cgit v1.2.3 From 9d2938d4e6e86c6afdb9606f76f4ae9ce0ac4ee5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 6 Sep 2006 19:12:34 +0200 Subject: * cmdline/apt-get.cc: - always show the autoremove information and give advice how to use it * debian/rules: - install apt.conf.autoremove with blacklist for linux-image and linux-restriceted-modules --- debian/apt.conf.autoremove | 8 ++++++++ debian/apt.dirs | 1 + debian/rules | 2 +- 3 files changed, 10 insertions(+), 1 deletion(-) create mode 100644 debian/apt.conf.autoremove (limited to 'debian') diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove new file mode 100644 index 000000000..98143ce9a --- /dev/null +++ b/debian/apt.conf.autoremove @@ -0,0 +1,8 @@ +APT +{ + NeverAutoRemove + { + "^linux-image.*"; + "^linux-restricted-modules.*"; + }; +}; diff --git a/debian/apt.dirs b/debian/apt.dirs index e1cb738fa..1543e8bb1 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -2,6 +2,7 @@ usr/bin usr/lib/apt/methods usr/lib/dpkg/methods/apt etc/apt +etc/apt/apt.conf.d etc/apt/sources.list.d var/cache/apt/archives/partial var/lib/apt/lists/partial diff --git a/debian/rules b/debian/rules index 044f742d0..6a142e759 100755 --- a/debian/rules +++ b/debian/rules @@ -211,7 +211,7 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script cp share/debian-archive.gpg debian/$@/usr/share/$@ - + cp debian/apt.conf.autoremove debian/$@/etc/apt/apt.conf.d/01autoremove # head -n 500 ChangeLog > debian/ChangeLog dh_installexamples -p$@ $(BLD)/docs/examples/* -- cgit v1.2.3 From 4716731f20c72dde5b280af90af2dc2bd16a9aff Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 3 Nov 2006 21:59:43 +0100 Subject: * finalized changelog, uploaded --- debian/changelog | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7768234f5..f3b191ca2 100644 --- a/debian/changelog +++ b/debian/changelog @@ -24,7 +24,7 @@ apt (0.6.46.1exp1) experimental; urgency=low * make the internal buffer in pkgTagFile grow dynamically (closes: #388708) - -- + -- Michael Vogt Mon, 2 Oct 2006 01:12:49 +0200 apt (0.6.46) unstable; urgency=low -- cgit v1.2.3 From 07494f6580dd689c1d82d8dc2f7dbbcfedaf6e52 Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Fri, 8 Dec 2006 18:21:59 +0000 Subject: 0.6.46.3ubuntu2 change as uploaded: fix dist-upgrade --- debian/changelog | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6dc69ba12..6e57e1bf8 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.6.46.3ubuntu2) feisty; urgency=low + + * apt-pkg/algorithms.cc: add missing call to MarkKeep + so that dist-upgrade isn't broken by unsatisfiable Breaks. + + -- Ian Jackson Thu, 7 Dec 2006 15:46:52 +0000 + apt (0.6.45ubuntu6) edgy; urgency=low * Tests pass without code changes! Except that we need this: -- cgit v1.2.3 From c5100d8bb855b0dcc80c896b367ae66ca213ce4b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Thu, 14 Dec 2006 11:32:31 +0100 Subject: * changelog prepared --- debian/changelog | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 3b392444b..35bf91080 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,9 +1,15 @@ -apt (0.6.46.5) unstable; urgency=low +apt (0.7.0) experimental; urgency=low + + * Branch that contains tall the new features + + -- Michael Vogt Thu, 14 Dec 2006 11:31:41 +0100 + +apt (0.6.46.5) UNRELEASED; urgency=low * apt-pkg/algorithm.cc: - use clog for all debugging - -- + -- Michael Vogt Thu, 14 Dec 2006 11:31:41 +0100 apt (0.6.46.4) unstable; urgency=high -- cgit v1.2.3 From d546f98d46c6a1d813976825f615e39f17b7ebf5 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Dec 2006 12:03:30 +0100 Subject: * added https transport method as optional pacakge --- debian/control | 11 ++++++++++- debian/rules | 28 +++++++++++++++++++++++++++- 2 files changed, 37 insertions(+), 2 deletions(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 3cba50acb..405c0bf93 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.2.2 -Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12) +Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt @@ -65,3 +65,12 @@ Description: APT utility programs apt-extracttemplates is used by debconf to prompt for configuration questions before installation. apt-ftparchive is used to create Package and other index files. apt-sortpkgs is a Package/Source file normalizer. + +Package: apt-transport-https +Architecture: any +Depends: ${shlibs:Depends} +Priority: optional +Section: admin +Description: APT https transport + This package contains a APT https transport. It makes it possible to + use 'deb https://foo distro main' lines in the sources.list. diff --git a/debian/rules b/debian/rules index 02ee734bb..0208d8ea3 100755 --- a/debian/rules +++ b/debian/rules @@ -185,7 +185,7 @@ apt-doc: build-doc # Build architecture-dependent files here. -binary-arch: apt libapt-pkg-dev apt-utils +binary-arch: apt-transport-https apt libapt-pkg-dev apt-utils apt: build debian/shlibs.local dh_testdir -p$@ dh_testroot -p$@ @@ -286,6 +286,32 @@ apt-utils: build debian/shlibs.local dh_md5sums -p$@ dh_builddeb -p$@ +apt-transport-https: build debian/shlibs.local + dh_testdir -p$@ + dh_testroot -p$@ + dh_clean -p$@ -k + dh_installdirs -p$@ + + # install the method + mkdir -p debian/$@/usr/lib/apt/methods + mv $(BLD)/bin/methods/https debian/$@/usr/lib/apt/methods + + dh_installdocs -p$@ + dh_installexamples -p$@ + + # Install the man pages.. + dh_installman -p$@ + + dh_installchangelogs -p$@ + dh_strip -p$@ + dh_compress -p$@ + dh_fixperms -p$@ + dh_installdeb -p$@ + dh_shlibdeps -p$@ -l`pwd`/debian/apt/usr/lib:`pwd`/debian/$@/usr/lib + dh_gencontrol -p$@ + dh_md5sums -p$@ + dh_builddeb -p$@ + source diff: @echo >&2 'source and diff are obsolete - use dpkg-source -b'; false -- cgit v1.2.3 From e3d924ac623ec88310bfd36f1e425440f5885aab Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 19 Dec 2006 14:51:52 +0100 Subject: * changelog updated --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1ea2a294a..9f8326739 100644 --- a/debian/changelog +++ b/debian/changelog @@ -12,6 +12,7 @@ apt (0.7.0) experimental; urgency=low * handle network failures more gracefully on "update" * support for unattended-upgrades (via unattended-upgrades package) + * added apt-transport-https method -- Michael Vogt Thu, 14 Dec 2006 11:31:41 +0100 -- cgit v1.2.3 From fdd71c58de908ac6ad254b8294a7d8c47a60205c Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 21 Feb 2007 09:58:03 +0100 Subject: * debian/control: - fix dependency to libcurl3-gnutls-dev (>= 7.15.5) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/control b/debian/control index 405c0bf93..183e81844 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.6.2.2 -Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev +Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev (>= 7.15.5) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt -- cgit v1.2.3 From 3bc9f25de62f59cf5d4f90d1c1aaccc9ba23439b Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 2 May 2007 13:39:49 +0200 Subject: * fix version number and changelog --- debian/changelog | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index c40804746..09cdf2b64 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,12 +1,11 @@ apt (0.7.0) experimental; urgency=low - * Branch that contains tall the new features + * Package that contains tall the new features * Removed all #pragma interface/implementation * Branch that contains tall the new features: * translated package descriptions * task install support - * automatic dependency removal - * Removed all #pragma interface/implementation + * automatic dependency removal (thanks to Daniel Burrows) * merged support for the new dpkg "Breaks" field (thanks to Ian Jackson) * handle network failures more gracefully on "update" @@ -14,7 +13,7 @@ apt (0.7.0) experimental; urgency=low package) * added apt-transport-https method - -- Michael Vogt Thu, 14 Dec 2006 11:31:41 +0100 + -- Michael Vogt Fri, 12 Jan 2007 20:48:07 +0100 apt (0.6.46.5) UNRELEASED; urgency=low -- cgit v1.2.3