diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/apt.install.in (renamed from debian/apt.install) | 1 | ||||
| -rw-r--r-- | debian/changelog | 37 | ||||
| -rwxr-xr-x | debian/rules | 4 |
3 files changed, 39 insertions, 3 deletions
diff --git a/debian/apt.install b/debian/apt.install.in index 9d4008fab..3527f9005 100644 --- a/debian/apt.install +++ b/debian/apt.install.in @@ -2,3 +2,4 @@ bin/apt-* usr/bin/ bin/methods/* usr/lib/apt/methods/ scripts/dselect/* usr/lib/dpkg/methods/apt/ usr/share/locale/*/*/apt.mo +bin/libapt-private* usr/lib/@DEB_HOST_MULTIARCH@/
\ No newline at end of file diff --git a/debian/changelog b/debian/changelog index 494d819f4..af75ee757 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,4 @@ +<<<<<<< HEAD apt (0.9.10~exp1) UNRELEASED; urgency=low [ Michael Vogt ] @@ -15,6 +16,39 @@ apt (0.9.10~exp1) UNRELEASED; urgency=low - use sha{512,256,1} for deb-src when available LP: #1098738 -- Michael Vogt <mvo@debian.org> Fri, 01 Mar 2013 12:12:39 +0100 +======= +apt (0.9.11) UNRELEASED; urgency=low + + The "Happy 20th Birthday Debian" upload + + [ Daniel Hartwig ] + * Clarify units of Acquire::http::Dl-Limit (closes: #705445) + * Show a error message if {,dist-}upgrade is used with additional + arguments (closes: #705510) + + [ Michael Vogt ] + * lp:~mvo/apt/config-clear: + - support Configuration.Clear() for a clear of the entire + configuration + * lp:~mvo/apt/add-glob-function: + - add Glob() to fileutl.{cc,h} + * feature/apt-binary2 + - refactor large chunks of cmdline/*.cc into a new libapt-private + library that is shared between the internal apt cmdline tools + - install libapt-private* into the apt binary + - add PACKAGE_MATCHER_ABI_COMPAT define so that this branch can be + merged without breaking ABI + + [ David Kalnischkies ] + * ensure that pkgTagFile isn't writing past Buffer length (Closes: 719629) + * allow Pre-Install-Pkgs hooks to get info over an FD != stdin + (Closes: #671728) + + [ Christian PERRIER ] + * French translation update. + + -- Michael Vogt <michael.vogt@ubuntu.com> Thu, 15 Aug 2013 09:27:35 +0200 +>>>>>>> debian/sid apt (0.9.10) unstable; urgency=low @@ -23,6 +57,7 @@ apt (0.9.10) unstable; urgency=low [ Christian Perrier ] * Vietnamese translation update. Closes: #718615 * Japanese translation update. Closes: #719279 + * French translation update. [ Michael Vogt ] * work on fixing coverity scan results: @@ -56,7 +91,7 @@ apt (0.9.10) unstable; urgency=low * make the keyring locations in apt-key configurable * let apt-key del work better with softlink and single key keyrings * do not call 'apt-key update' in apt.postinst - + [ Colin Watson ] * prefer native arch over higher priority for providers (Closes: #718482) diff --git a/debian/rules b/debian/rules index fc44d5a68..06ccdac31 100755 --- a/debian/rules +++ b/debian/rules @@ -115,7 +115,7 @@ clean: [ ! -f Makefile ] || $(MAKE) clean distclean rm -rf build rm -f debian/$(LIBAPT_PKG).install debian/$(LIBAPT_INST).install \ - debian/libapt-pkg-dev.install + debian/libapt-pkg-dev.install debian/apt.install test ! -L buildlib/config.guess || rm -f buildlib/config.guess test ! -L buildlib/config.sub || rm -f buildlib/config.sub @@ -174,7 +174,7 @@ apt-doc: build-debiandoc # Build architecture-dependent files here. apt_MANPAGES = apt apt-cache apt-cdrom apt-config apt-get apt-key apt-mark apt-secure apt apt.conf apt_preferences sources.list -apt: build-binary build-manpages +apt: build-binary build-manpages debian/apt.install dh_testdir -p$@ dh_testroot -p$@ dh_prep -p$@ |