diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.dirs | 1 | ||||
| -rw-r--r-- | debian/apt.postinst | 6 | ||||
| -rw-r--r-- | debian/changelog | 36 | ||||
| -rw-r--r-- | debian/control | 10 | ||||
| -rwxr-xr-x | debian/rules | 1 |
5 files changed, 43 insertions, 11 deletions
diff --git a/debian/apt.dirs b/debian/apt.dirs index fb6716c35..66556e453 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -5,6 +5,7 @@ etc/apt etc/apt/apt.conf.d etc/apt/preferences.d etc/apt/sources.list.d +etc/apt/trusted.gpg.d etc/logrotate.d var/cache/apt/archives/partial var/lib/apt/lists/partial diff --git a/debian/apt.postinst b/debian/apt.postinst index 88fb932df..cc0d8b1fe 100644 --- a/debian/apt.postinst +++ b/debian/apt.postinst @@ -15,13 +15,7 @@ set -e case "$1" in configure) - - if ! test -f /etc/apt/trusted.gpg; then - 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 53dfcce12..56d3f79c0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,39 @@ +apt (0.7.25.1) UNRELEASED; urgency=low + + [ Christian Perrier ] + * French manpage translation update + + [Chris Leick] + * spot & fix various typos in all manpages + * German manpage translation update + + [ David Kalnischkies ] + * cmdline/apt-cache.cc: + - remove translatable marker from the "%4i %s\n" string + * buildlib/po4a_manpage.mak: + - instruct debiandoc to build files with utf-8 encoding + * buildlib/tools.m4: + - fix some warning from the buildtools + * apt-pkg/acquire-item.cc: + - add configuration PDiffs::Limit-options to not download + too many or too big patches (Closes: #554349) + * debian/control: + - let all packages depend on ${misc:Depends} + * share/*-archive.gpg: + - remove the horrible outdated files. We already depend on + the keyring so we don't need to ship our own version + * cmdline/apt-key: + - errors out if wget is not installed (Closes: #545754) + - add --keyring option as we have now possibly many + * methods/gpgv.cc: + - pass all keyrings (TrustedParts) to gpgv instead of + using only one trusted.gpg keyring (Closes: #304846) + * methods/https.cc: + - finally merge the rest of the patchset from Arnaud Ebalard + with the CRL and Issuers options, thanks! (Closes: #485963) + + -- Michael Vogt <michael.vogt@ubuntu.com> Fri, 08 Jan 2010 20:17:28 +0100 + apt (0.7.25) unstable; urgency=low [ Christian Perrier ] diff --git a/debian/control b/debian/control index 357fb3f5f..d756871d1 100644 --- a/debian/control +++ b/debian/control @@ -11,7 +11,7 @@ Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ Package: apt Architecture: any -Depends: ${shlibs:Depends}, debian-archive-keyring +Depends: ${shlibs:Depends}, debian-archive-keyring, ${misc:Depends} Replaces: libapt-pkg-doc (<< 0.3.7), libapt-pkg-dev (<< 0.3.7) Provides: ${libapt-pkg:provides} Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, bzip2, lzma, python-apt @@ -26,6 +26,7 @@ Description: Advanced front-end for dpkg Package: apt-doc Architecture: all Priority: optional +Depends: ${misc:Depends} Replaces: apt (<< 0.5.4.9) Section: doc Description: Documentation for APT @@ -35,7 +36,7 @@ Description: Documentation for APT Package: libapt-pkg-dev Architecture: any Priority: optional -Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides} +Depends: apt (= ${binary:Version}), apt-utils (= ${binary:Version}), ${libapt-pkg:provides}, ${libapt-inst:provides}, ${misc:Depends} Section: libdevel Description: Development files for APT's libapt-pkg and libapt-inst This package contains the header files and libraries for @@ -45,6 +46,7 @@ Description: Development files for APT's libapt-pkg and libapt-inst Package: libapt-pkg-doc Architecture: all Priority: optional +Depends: ${misc:Depends} Section: doc Description: Documentation for APT development This package contains documentation for development of the APT @@ -52,7 +54,7 @@ Description: Documentation for APT development Package: apt-utils Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Provides: ${libapt-inst:provides} Replaces: apt (<< 0.5.9) Description: APT utility programs @@ -65,7 +67,7 @@ Description: APT utility programs Package: apt-transport-https Architecture: any -Depends: ${shlibs:Depends} +Depends: ${shlibs:Depends}, ${misc:Depends} Priority: optional Description: APT https transport This package contains a APT https transport. It makes it possible to diff --git a/debian/rules b/debian/rules index d01b57cd6..37c96ef20 100755 --- a/debian/rules +++ b/debian/rules @@ -213,7 +213,6 @@ apt: build build-doc debian/shlibs.local cp debian/bugscript debian/$@/usr/share/bug/apt/script cp debian/apt.logrotate debian/$@/etc/logrotate.d/apt - 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 |