diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/NEWS.Debian | 8 | ||||
| -rw-r--r-- | debian/apt.conf.autoremove | 8 | ||||
| -rw-r--r-- | debian/apt.dirs | 1 | ||||
| -rw-r--r-- | debian/apt.postinst | 4 | ||||
| -rw-r--r-- | debian/changelog | 446 | ||||
| -rw-r--r-- | debian/control | 5 | ||||
| -rwxr-xr-x | debian/rules | 4 |
7 files changed, 163 insertions, 313 deletions
diff --git a/debian/NEWS.Debian b/debian/NEWS.Debian index db04b1e91..f44d1966b 100644 --- a/debian/NEWS.Debian +++ b/debian/NEWS.Debian @@ -1,3 +1,11 @@ +apt (0.6.44) unstable; urgency=low + + * apt-ftparchive --db now uses Berkeley DB_BTREE instead of DB_HASH. + If you use a database created by an older version of apt, delete + it and allow it to be recreated the next time. + + -- Michael Vogt <mvo@debian.org> Wed, 26 Apr 2006 12:57:53 +0200 + apt (0.5.25) unstable; urgency=low * apt-ftparchive --db now uses Berkeley DB version 4.2. If used with a 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/apt.postinst b/debian/apt.postinst index df0433057..88fb932df 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -17,9 +17,11 @@ 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 + apt-key update + ;; abort-upgrade|abort-remove|abort-deconfigure) diff --git a/debian/changelog b/debian/changelog index 254e603aa..52bdced8f 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,31 @@ -apt (0.6.46.4) unstable; urgency=low +apt (0.7.0) experimental; urgency=low + * Branch 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 + * merged support for the new dpkg "Breaks" field + (thanks to Ian Jackson) + * handle network failures more gracefully on "update" + * support for unattended-upgrades (via unattended-upgrades + package) + + + -- Michael Vogt <mvo@debian.org> 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 <mvo@debian.org> Thu, 14 Dec 2006 11:31:41 +0100 + +apt (0.6.46.4) unstable; urgency=high + + * ack NMU (closes: #401017) * added apt-secure.8 to "See also" section * apt-pkg/deb/dpkgpm.cc: - added "Dpkg::StopOnError" variable that controls if apt @@ -10,8 +36,30 @@ apt (0.6.46.4) unstable; urgency=low - uk.po: New Ukrainian translation: 483t28f3u - el.po: Update to 503t9f2u - de.po: Updates and corrections. + * apt-pkg/contrib/progress.cc: + - OpProgress::CheckChange optimized, thanks to Paul Brook + (closes: #398381) + * apt-pkg/contrib/sha256.cc: + - fix building with noopt + + -- Michael Vogt <mvo@debian.org> Thu, 7 Dec 2006 10:49:50 +0100 + +apt (0.6.46.3-0.2) unstable; urgency=high - -- + * Non-maintainer upload with permission of Michael Vogt. + * Fix FTBFS on most arches (regression from the fix of #400874) + + -- Andreas Barth <aba@not.so.argh.org> Tue, 5 Dec 2006 15:51:22 +0000 + +apt (0.6.46.3-0.1) unstable; urgency=high + + * Non-maintainer upload with permission of Michael Vogt. + * Fix segfault at apt-get source. Closes: #400874 + * Add apt-key update in postinst, so that debian-archive-keyring doesn't + need to depend on apt >= 0.6. Closes: #401114 + * Don't double-queue pdiff files. Closes: #401017 + + -- Andreas Barth <aba@not.so.argh.org> Tue, 5 Dec 2006 10:34:56 +0000 apt (0.6.46.3) unstable; urgency=low @@ -20,44 +68,55 @@ apt (0.6.46.3) unstable; urgency=low messages * Merged from Christian Perrier bzr branch: - - ca.po: Updated to 514t - - be.po: Updated to 514t - - it.po: Updated to 514t - - hu.po: Updated to 514t - - zh_TW.po: Updated to 514t - - ar.po: Updated to 293t221u. - - ru.po: Updated to 514t. Closes: #392466 - - nb.po: Updated to 514t. Closes: #392466 - - pt.po: Updated to 514t. Closes: #393199 - - fr.po: One spelling error corrected: s/accèder/accéder - - km.po: Updated to 514t. - - ko.po: Updated to 514t. - - bg.po: Updated to 514t. - - de.po: Updated to 514t. - - en_GB.po: Updated to 514t. - - -- Michael Vogt <mvo@debian.org> Thu, 2 Nov 2006 11:37:58 +0100 + - ca.po: Updated to 514t + - be.po: Updated to 514t + - it.po: Updated to 514t + - hu.po: Updated to 514t + - zh_TW.po: Updated to 514t + - ar.po: Updated to 293t221u. + - ru.po: Updated to 514t. Closes: #392466 + - nb.po: Updated to 514t. Closes: #392466 + - pt.po: Updated to 514t. Closes: #393199 + - fr.po: One spelling error corrected: s/accèder/accéder + - km.po: Updated to 514t. + - ko.po: Updated to 514t. + - bg.po: Updated to 514t. + - de.po: Updated to 514t. + - en_GB.po: Updated to 514t. + + -- Michael Vogt <mvo@debian.org> Thu, 2 Nov 2006 11:37:58 +0100 apt (0.6.46.2) unstable; urgency=low + * debian/control: + - depend on debian-archive-keyring to offer clean upgrade path + (closes: #386800) * Merged from Christian Perrier bzr branch: - es.po: Updated to 514t. Closes: #391661 - da.po: Updated to 514t. Closes: #391424 - cs.po: Updated. Closes: #391064 - es.po: Updated to 514t. Closes: #391661 - da.po: Updated to 514t. Closes: #391424 - + -- Michael Vogt <mvo@debian.org> Wed, 11 Oct 2006 09:03:15 +0200 apt (0.6.46.1) unstable; urgency=low + * 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) + * merged "install-task" branch (use with "apt-get install taskname^") * methods/gzip.cc: - deal with empty files * Applied patch from Daniel Schepler to make apt bin-NMU able. - (closes: bug#359634) * rebuild against current g++ because of: http://gcc.gnu.org/bugzilla/show_bug.cgi?id=29289 - (closes: #390189) * fix broken i18n in the dpkg progress reporting, thanks to Frans Pop and Steinar Gunderson. (closes: #389261) * Merged from Christian Perrier bzr branch: @@ -110,7 +169,7 @@ apt (0.6.45) unstable; urgency=low * apt-pkg/contrib/sha256.cc: - fixed the sha256 generation (closes: #378183) * ftparchive/cachedb.cc: - - applied patch from Anthony Towns to fix Clean() function + - applied patch from ajt to fix Clean() function (closes: #379576) * doc/apt-get.8.xml: - fix path to the apt user build (Closes: #375640) @@ -128,9 +187,6 @@ apt (0.6.45) unstable; urgency=low - fix for string mangling, closes: #373864 * apt-pkg/acquire-item.cc: - check for bzip2 in /bin (closes: #377391) - * apt-pkg/tagfile.cc: - - make it work on non-mapable files again, thanks - to James Troup for confirming the fix (closes: #376777) * Merged from Christian Perrier bzr branch: * ko.po: Updated to 512t. Closes: #378901 * hu.po: Updated to 512t. Closes: #376330 @@ -141,57 +197,42 @@ apt (0.6.45) unstable; urgency=low * dz.po: New Dzongkha translation: 512t * ro.po: Updated to 512t * eu.po: Updated + * eu.po: Updated + * fix apt-get dist-upgrade + * fix warning if no /var/lib/apt/extended_states is present + * don't download Translations for deb-src sources.list lines + * apt-pkg/tagfile.cc: + - support not-mmapable files again - -- Michael Vogt <mvo@debian.org> Thu, 27 Jul 2006 00:52:05 +0200 - -apt (0.6.44.2ubuntu4) edgy; urgency=low - - * Make apt-get dselect-upgrade happy again - - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 21 Jul 2006 11:03:02 +0200 - -apt (0.6.44.2ubuntu3) edgy; urgency=low - - * Close extended_states file after writing it. - - -- Colin Watson <cjwatson@ubuntu.com> Tue, 18 Jul 2006 00:12:13 +0100 - -apt (0.6.44.2ubuntu2) edgy; urgency=low + -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 25 Jul 2006 11:55:22 +0200 - * create a empty extended_states file if none exists already +apt (0.6.44.2exp1) experimental; urgency=low - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 4 Jul 2006 09:23:03 +0200 + * 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) + * synced with the http://people.debian.org/~mvo/bzr/apt/debian-sid branch + * build from http://people.debian.org/~mvo/bzr/apt/debian-experimental -apt (0.6.44.2ubuntu1) edgy; urgency=low + -- Michael Vogt <mvo@debian.org> Mon, 3 Jul 2006 21:50:31 +0200 - * merged with debian/unstable - * merged the "auto-mark" branch to support aptitude like - marking of automatically installed dependencies and added - "apt-get remove --auto-remove" to remove unused auto-installed - packages again - * changed library version from 3.11 to 3.50 to make it clearly - different from the debian version (we are ABI incompatible because - of the auto-mark patch) +apt (0.6.44.2) unstable; urgency=low - -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 3 Jul 2006 18:30:46 +0200 + * apt-pkg/depcache.cc: + - added Debug::pkgDepCache::AutoInstall (thanks to infinity) + * apt-pkg/acquire-item.cc: + - fix missing chmod() in the new aquire code + (thanks to Bastian Blank, Closes: #367425) + * merged from + http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: + * sk.po: Completed to 512t + * eu.po: Completed to 512t + * fr.po: Completed to 512t + * sv.po: Completed to 512t + * Update all PO and the POT. Gives 506t6f for formerly + complete translations -apt (0.6.44.2) unstable; urgency=low - - * apt-pkg/depcache.cc: - - added Debug::pkgDepCache::AutoInstall (thanks to infinity) - * apt-pkg/acquire-item.cc: - - fix missing chmod() in the new aquire code - (thanks to Bastian Blank, Closes: #367425) - * merged from - http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: - * sk.po: Completed to 512t - * eu.po: Completed to 512t - * fr.po: Completed to 512t - * sv.po: Completed to 512t - * Update all PO and the POT. Gives 506t6f for formerly - complete translations - - -- Michael Vogt <mvo@debian.org> Wed, 14 Jun 2006 12:00:57 +0200 + -- Michael Vogt <mvo@debian.org> Wed, 14 Jun 2006 12:00:57 +0200 apt (0.6.44.1-0.1) unstable; urgency=low @@ -203,22 +244,32 @@ apt (0.6.44.1-0.1) unstable; urgency=low apt (0.6.44.1) unstable; urgency=low + * apt-pkg/acquire-item.cc: + - fix reversed logic of the "Acquire::PDiffs" option * merged from http://www.perrier.eu.org/debian/packages/d-i/level4/apt-main: - po/LINGUAS: added "bg" Closes: #360262 - po/gl.po: Galician translation update. Closes: #366849 - po/hu.po: Hungarian translation update. Closes: #365448 - po/cs.po: Czech translation updated. Closes: #367244 + * apt-pkg/contrib/sha256.cc: + - applied patch to fix unaligned access problem. Closes: #367417 + (thanks to David Mosberger) -- Michael Vogt <mvo@debian.org> Tue, 16 May 2006 21:51:16 +0200 apt (0.6.44) unstable; urgency=low * apt-pkg/acquire.cc: don't show ETA if it is 0 or absurdely large + * apt-pkg/contrib/sha256.{cc,h},hashes.{cc,h}: support for sha256 + (thanks to Anthony Towns) + * ftparchive/cachedb.{cc,h},writer.{cc,h}: optimizations + (thanks to Anthony Towns) + * apt pdiff support from experimental merged + * apt-pkg/deb/dpkgpm.cc: wording fixes (thanks to Matt Zimmerman) * apt-pkg/deb/dpkgpm.cc: - wording fixes (thanks to Matt Zimmerman) - - fix error in dpkg interaction (closes: #364513, - thanks to Martin Dickopp) + - fix error in dpkg interaction (closes: #364513, thanks to Martin Dickopp) * apt-pkg/tagfile.{cc,h}: - use MMap to read the entries (thanks to Zephaniah E. Hull for the patch) Closes: #350025 @@ -243,26 +294,6 @@ apt (0.6.44) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Mon, 8 May 2006 22:28:53 +0200 -apt (0.6.43.3ubuntu3) dapper; urgency=low - - * methods/http.cc: - - fix the user-agent string - - -- Michael Vogt <michael.vogt@ubuntu.com> 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) - - -- Michael Vogt <michael.vogt@ubuntu.com> 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 - the status-fd (ubuntu #28954) - - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 28 Mar 2006 20:34:46 +0200 - apt (0.6.43.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-186: @@ -272,46 +303,16 @@ apt (0.6.43.3) unstable; urgency=low * pl.po: Completed to 512t. Closes: #349514 * sk.po: Completed to 512t. Closes: #349474 * gl.po: Completed to 512 strings Closes: #349407 - * vi.po: Completed to 512 strings * sv.po: Completed to 512 strings Closes: #349210 * ru.po: Completed to 512 strings Closes: #349154 * da.po: Completed to 512 strings Closes: #349084 * fr.po: Completed to 512 strings - * LINGUAS: Add Welsh - * *.po: Updated from sources (512 strings) * vi.po: Completed to 511 strings Closes: #348968 - * apt-pkg/deb/deblistparser.cc: - - don't explode on a DepCompareOp in a Provides line, but warn about - it and ignore it otherwise (thanks to James Troup for reporting it) - * cmdline/apt-get.cc: - - don't lock the lists directory in DoInstall, breaks --print-uri - (thanks to James Troup for reporting it) - * debian/apt.dirs: create /etc/apt/sources.list.d - * 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 - * be more careful with the signature file on network failures - - -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100 - -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 - * eu.po: Completed to 512t. Closes: #350483 - * ja.po: Completed to 512t. Closes: #349806 - * pl.po: Completed to 512t. Closes: #349514 - * sk.po: Completed to 512t. Closes: #349474 - * gl.po: Completed to 512 strings Closes: #349407 - * vi.po: Completed to 512 strings - * sv.po: Completed to 512 strings Closes: #349210 - * ru.po: Completed to 512 strings Closes: #349154 - * da.po: Completed to 512 strings Closes: #349084 - * fr.po: Completed to 512 strings + * zh_CN.po: Completed to 512t. Closes: #353936 + * it.po: Completed to 512t. Closes: #352803 + * pt_BR.po: Completed to 512t. Closes: #352419 * LINGUAS: Add Welsh * *.po: Updated from sources (512 strings) - * vi.po: Completed to 511 strings Closes: #348968 * apt-pkg/deb/deblistparser.cc: - don't explode on a DepCompareOp in a Provides line, but warn about it and ignore it otherwise (thanks to James Troup for reporting it) @@ -322,10 +323,8 @@ apt (0.6.43.2ubuntu1) dapper; 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 - * be more careful with the signature file on network failures - -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 20 Feb 2006 22:27:48 +0100 + -- Michael Vogt <mvo@debian.org> Wed, 22 Feb 2006 10:13:04 +0100 apt (0.6.43.2) unstable; urgency=low @@ -350,26 +349,8 @@ apt (0.6.43.2) unstable; urgency=low -- Michael Vogt <mvo@debian.org> 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 <michael.vogt@ubuntu.com> 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: * fr.po: Completed to 510 strings * it.po: Completed to 510t @@ -391,19 +372,6 @@ apt (0.6.43.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 6 Jan 2006 01:17:08 +0100 -apt (0.6.43ubuntu2) dapper; urgency=low - - * merged some missing bits that wheren't merged by baz in the previous - upload (*grumble*) - - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 8 Dec 2005 18:35:58 +0100 - -apt (0.6.43ubuntu1) dapper; urgency=low - - * merged with debian - - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 25 Nov 2005 11:36:29 +0100 - apt (0.6.43) unstable; urgency=medium * Merge bubulle@debian.org--2005/apt--main--0 up to patch-132: @@ -424,22 +392,6 @@ apt (0.6.43) unstable; urgency=medium -- Michael Vogt <mvo@debian.org> Tue, 29 Nov 2005 00:17:07 +0100 -apt (0.6.42.3ubuntu2) dapper; urgency=low - - * Merge bubulle@debian.org--2005/apt--main--0 up to patch-131: - * zh_CN.po: Completed to 507 strings(Closes: #338267) - * gl.po: Completed to 510 strings (Closes: #338356) - * added support for "/etc/apt/sources.list.d" directory - (closes: #66325) - - -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 14 Nov 2005 15:30:12 +0100 - -apt (0.6.42.3ubuntu1) dapper; urgency=low - - * synced with debian - - -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 10 Nov 2005 05:05:56 +0100 - apt (0.6.42.3) unstable; urgency=low * Merge bubulle@debian.org--2005/apt--main--0 up to patch-129: @@ -487,13 +439,13 @@ apt (0.6.42) unstable; urgency=low - unmount the cdrom when apt failed to locate any package files * allow cdrom failures and fallback to other sources in that case (closes: #44135) - * better error text when dpkg-source fails + * better error text when dpkg-source fails * Merge bubulle@debian.org--2005/apt--main--0 up to patch-115: - patch-99: Added Galician translation - patch-100: Completed Danish translation (Closes: #325686) - patch-104: French translation completed - patch-109: Italian translation completed - - patch-112: Swedish translation update + - patch-112: Swedish translation update - patch-115: Basque translation completed (Closes: #333299) * applied french man-page update (thanks to Philippe Batailler) (closes: #316638, #327456) @@ -507,9 +459,9 @@ apt (0.6.42) unstable; urgency=low * apt-pkg/contrib/md5.cc: - fix a alignment problem on sparc64 that gives random bus errors (thanks to Fabbione for providing a test-case) - * init the default ScreenWidth to 79 columns by default + * init the default ScreenWidth to 79 columns by default (Closes: #324921) - * cmdline/apt-cdrom.cc: + * cmdline/apt-cdrom.cc: - fix some missing gettext() calls (closes: #334539) * doc/apt-cache.8.xml: fix typo (closes: #334714) @@ -520,8 +472,8 @@ apt (0.6.41) 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 - * improved the network timeout handling, if a index file from a - sources.list times out or EAI_AGAIN is returned from getaddrinfo, + * improved the network timeout handling, if a index file from a + sources.list times out or EAI_AGAIN is returned from getaddrinfo, don't try to get the other files from that entry * Support architecture-specific extra overrides (closes: #225947). Thanks to Anthony Towns for idea and @@ -529,10 +481,10 @@ apt (0.6.41) unstable; urgency=low * Javier Fernandez-Sanguino Pen~a: - Added a first version of an apt-secure.8 manpage, and modified apt-key and apt.end accordingly. Also added the 'update' - argument to apt-key which was previously not documented + argument to apt-key which was previously not documented (Closes: #322120) * Andreas Pakulat: - - added example apt-ftparchive.conf file to doc/examples + - added example apt-ftparchive.conf file to doc/examples (closes: #322483) * Fix a incorrect example in the man-page (closes: #282918) * Fix a bug for very long lines in the apt-cdrom code (closes: #280356) @@ -541,84 +493,10 @@ apt (0.6.41) unstable; urgency=low * Change pkgPolicy::Pin from private to protected to let subclasses access it too (closes: #321799) * add default constructor for PrvIterator (closes: #322267) - * Reread status configuration on debSystem::Initialize() + * Reread status configuration on debSystem::Initialize() (needed for apt-proxy, thanks to Otavio for this patch) - - -- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200 -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, po/fr.po: - - updated the translations - * po/makefile: - - create a single pot file in each domain dir to make rosetta happy - - -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 28 Sep 2005 10:16:06 +0200 - -apt (0.6.40.1ubuntu7) breezy; urgency=low - - * updated the pot/po files , no code changes - - -- Michael Vogt <michael.vogt@ubuntu.com> 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: - - make it possible for apt to handle a failed MediaChange event and - fall back to other sources (ubuntu #13713) - - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 13 Sep 2005 22:09:50 +0200 - -apt (0.6.40.1ubuntu5) breezy; urgency=low - - * 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) - * 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 - - -- Michael Vogt <michael.vogt@ubuntu.com> Mon, 12 Sep 2005 15:44:26 +0200 - -apt (0.6.40.1ubuntu4) breezy; urgency=low - - * debian/apt.cron.daily: - - fix a embarrassing typo - - -- Michael Vogt <michael.vogt@ubuntu.com> Wed, 7 Sep 2005 10:10:37 +0200 - -apt (0.6.40.1ubuntu3) breezy; urgency=low - - * debian/apt.cron.daily: - - use the ctime as well when figuring what packages need to - be removed. This fixes the problem that packages copied with - "cp -a" (e.g. from the installer) have old mtimes (ubuntu #14504) - - -- Michael Vogt <michael.vogt@ubuntu.com> Tue, 6 Sep 2005 18:30:46 +0200 - -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 - * added README.progress-reporting to the apt-doc package - * Do md5sum checking for file and cdrom method (closes: #319142) - * Change pkgPolicy::Pin from private to protected to let subclasses - access it too (closes: #321799) - * methods/connect.cc: - - send failure reason for EAI_AGAIN (TmpResolveFailure) to acuire-item - * 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 <michael.vogt@ubuntu.com> Tue, 23 Aug 2005 19:44:55 +0200 - -apt (0.6.40.1ubuntu1) breezy; urgency=low - - * Synchronize with Debian - - -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 5 Aug 2005 14:20:56 +0200 + -- Michael Vogt <mvo@debian.org> Mon, 5 Sep 2005 22:59:03 +0200 apt (0.6.40.1) unstable; urgency=low @@ -629,12 +507,6 @@ apt (0.6.40.1) unstable; urgency=low -- Michael Vogt <mvo@debian.org> Fri, 5 Aug 2005 13:24:58 +0200 -apt (0.6.40ubuntu1) breezy; urgency=low - - * Synchronize with Debian - - -- Matt Zimmerman <mdz@ubuntu.com> Thu, 4 Aug 2005 15:53:22 -0700 - apt (0.6.40) unstable; urgency=low * Patch from Jordi Mallach to mark some additional strings for translation @@ -650,39 +522,6 @@ apt (0.6.40) unstable; urgency=low -- Matt Zimmerman <mdz@debian.org> 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 <mdz@ubuntu.com> 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 <cjwatson@ubuntu.com> 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 <cjwatson@ubuntu.com> 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 <mdz@ubuntu.com> 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 @@ -693,14 +532,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 <mdz@debian.org> 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 <mdz@ubuntu.com> Sat, 25 Jun 2005 16:52:41 -0700 + -- Matt Zimmerman <mdz@debian.org> Tue, 28 Jun 2005 11:51:09 -0700 apt (0.6.38) unstable; urgency=low diff --git a/debian/control b/debian/control index dfcebf41e..f331a84c1 100644 --- a/debian/control +++ b/debian/control @@ -9,12 +9,11 @@ Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) Package: apt Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, debian-archive-keyring 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, apt-doc, bzip2 Section: admin Description: Advanced front-end for dpkg This is Debian's next generation front-end for the dpkg package manager. diff --git a/debian/rules b/debian/rules index 4e7490bed..68302daff 100755 --- a/debian/rules +++ b/debian/rules @@ -210,8 +210,8 @@ apt: build debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script - cp share/ubuntu-archive.gpg debian/$@/usr/share/$@ - + 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 # make rosetta happy and remove pot files in po/ (but leave stuff |