diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.conf.autoremove | 18 | ||||
| -rw-r--r-- | debian/apt.dirs | 1 | ||||
| -rw-r--r-- | debian/changelog | 21 | ||||
| -rw-r--r-- | debian/control | 2 | ||||
| -rwxr-xr-x | debian/rules | 4 |
5 files changed, 43 insertions, 3 deletions
diff --git a/debian/apt.conf.autoremove b/debian/apt.conf.autoremove index b41be8397..2f00b9f8b 100644 --- a/debian/apt.conf.autoremove +++ b/debian/apt.conf.autoremove @@ -1,9 +1,23 @@ APT { NeverAutoRemove - { + { + "^linux-firmware$"; "^linux-image.*"; "^linux-restricted-modules.*"; - "^kfreebsd-image.*"; + "^linux-ubuntu-modules-.*"; + }; + + Never-MarkAuto-Sections + { + "metapackages"; + "restricted/metapackages"; + "universe/metapackages"; + "multiverse/metapackages"; + "oldlibs"; + "restricted/oldlibs"; + "universe/oldlibs"; + "multiverse/oldlibs"; + }; }; diff --git a/debian/apt.dirs b/debian/apt.dirs index 66556e453..f25e4600b 100644 --- a/debian/apt.dirs +++ b/debian/apt.dirs @@ -9,6 +9,7 @@ etc/apt/trusted.gpg.d etc/logrotate.d var/cache/apt/archives/partial var/lib/apt/lists/partial +var/lib/apt/mirrors/partial var/lib/apt/periodic var/log/apt usr/share/bug/apt diff --git a/debian/changelog b/debian/changelog index 56a17eb38..9135d523b 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,26 @@ apt (0.7.26~exp6) UNRELEASED; urgency=low + [ Michael Vogt ] + * merge the remaining Ubuntu change: + - on gpg verification failure warn and restore the last known + good state + - on failure display the IP of the server (useful for servers + that use round robin DNS) + - support Original-Maintainer in RewritePackageOrder + - enable cdrom autodetection via libudev by default + - show messsage about Vcs in use when apt-get source is run for + packages maintained in a Vcs + - better support transitional packages with mark auto-installed. + when the transitional package is in "oldlibs" the new package + is not marked auto installed (same is true for section + metapackages) + - provide new "deb mirror://archive.foo/mirrors.list sid main" + method expects a list of mirrors (generated on the server e.g. + via geoip) and will use that, including cycle on failure + - write apport crash file on package failure (disabled by default + on debian until apport is available) + - support mirror failure reporting (disabled by default on debian) + [ David Kalnischkies ] * apt-pkg/deb/dpkgpm.cc: - write Disappeared also to the history.log diff --git a/debian/control b/debian/control index 4f41c130b..9ac0d582e 100644 --- a/debian/control +++ b/debian/control @@ -6,7 +6,7 @@ Uploaders: Michael Vogt <mvo@debian.org>, Otavio Salvador <otavio@debian.org>, Christian Perrier <bubulle@debian.org>, Daniel Burrows <dburrows@debian.org>, Luca Bruno <lethalman88@gmail.com>, Julian Andres Klode <jak@debian.org> Standards-Version: 3.8.4 -Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen +Build-Depends: debhelper (>= 5.0), libdb-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5), debiandoc-sgml, xsltproc, docbook-xsl, po4a (>= 0.34-2), autotools-dev, autoconf, automake, doxygen, intltool Build-Conflicts: autoconf2.13, automake1.4 Package: apt diff --git a/debian/rules b/debian/rules index 827fc2034..0ac45f851 100755 --- a/debian/rules +++ b/debian/rules @@ -225,6 +225,10 @@ apt: build build-doc debian/shlibs.local rm -f build/po/*.pot rm -f po/*.pot + # move the mirror failure script in place + #mv debian/$@/usr/bin/apt-report-mirror-failure \ + # debian/$@/usr/lib/apt/apt-report-mirror-failure \ + dh_installexamples -p$@ $(BLD)/docs/examples/* dh_installman -p$@ $(wildcard $(patsubst %,doc/%.[158],$(apt_MANPAGES)) $(patsubst %,doc/*/%.*.[158],$(apt_MANPAGES))) dh_installcron -p$@ |