From 6fcfa3dc25c1790a8d78c9b88f103fc75b76e82f Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Aug 2013 23:42:35 +0200 Subject: install libapt-private* into the apt binary --- debian/apt.install | 4 ---- debian/apt.install.in | 5 +++++ 2 files changed, 5 insertions(+), 4 deletions(-) delete mode 100644 debian/apt.install create mode 100644 debian/apt.install.in (limited to 'debian') diff --git a/debian/apt.install b/debian/apt.install deleted file mode 100644 index 9d4008fab..000000000 --- a/debian/apt.install +++ /dev/null @@ -1,4 +0,0 @@ -bin/apt-* usr/bin/ -bin/methods/* usr/lib/apt/methods/ -scripts/dselect/* usr/lib/dpkg/methods/apt/ -usr/share/locale/*/*/apt.mo diff --git a/debian/apt.install.in b/debian/apt.install.in new file mode 100644 index 000000000..3527f9005 --- /dev/null +++ b/debian/apt.install.in @@ -0,0 +1,5 @@ +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 -- cgit v1.2.3 From a7737ad3a4e570052415628a02775e84894d897d Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Mon, 12 Aug 2013 23:59:44 +0200 Subject: really build apt.install --- debian/rules | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'debian') 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$@ -- cgit v1.2.3 From 0e279e3527ce3dc9de0e01441ad693f415e75d6a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Apr 2013 08:15:06 +0200 Subject: merge patch from Daniel Hartwig to Clarify units of Acquire::http::Dl-Limit (closes: #705445) Conflicts: debian/changelog --- debian/changelog | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 8e4def2b0..7075cb844 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +apt (0.9.11) UNRELEASED; urgency=low + + [ Daniel Hartwig ] + * Clarify units of Acquire::http::Dl-Limit (closes: #705445) + + -- Michael Vogt Thu, 15 Aug 2013 09:27:35 +0200 + apt (0.9.10) unstable; urgency=low The "Hello to Debconf" upload @@ -38,7 +45,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) -- cgit v1.2.3 From b9674b755d40b1394c397864d1fcd05ad58a88a2 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Tue, 23 Apr 2013 08:16:21 +0200 Subject: merge patch from Daniel Hartwig to Show a error message if {,dist-}upgrade is used with additional arguments (closes: #705510) --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 7075cb844..6172cb332 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.9.11) UNRELEASED; urgency=low [ 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 Thu, 15 Aug 2013 09:27:35 +0200 -- cgit v1.2.3 From d8a06f6e478323b2fa8573f6f885c0b16d403642 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 Oct 2012 10:29:52 +0200 Subject: * lp:~mvo/apt/config-clear: - support Configuration.Clear() for a clear of the entire configuration Conflicts: debian/changelog --- debian/changelog | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 6172cb332..1c7afd863 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,11 @@ apt (0.9.11) UNRELEASED; urgency=low * 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 + -- Michael Vogt Thu, 15 Aug 2013 09:27:35 +0200 apt (0.9.10) unstable; urgency=low -- cgit v1.2.3 From 488011fa99aee25bedb39ae2cc3115ad1ab000c0 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 17 Oct 2012 10:27:50 +0200 Subject: * lp:~mvo/apt/add-glob-function: - add Glob() to fileutl.{cc,h} Conflicts: apt-pkg/contrib/fileutl.h debian/changelog --- debian/changelog | 2 ++ 1 file changed, 2 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index 1c7afd863..b597d1b20 100644 --- a/debian/changelog +++ b/debian/changelog @@ -9,6 +9,8 @@ apt (0.9.11) UNRELEASED; urgency=low * 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} -- Michael Vogt Thu, 15 Aug 2013 09:27:35 +0200 -- cgit v1.2.3 From 34b769c51ac7cf747fb9dc5b8a5697c1c292360b Mon Sep 17 00:00:00 2001 From: Christian PERRIER Date: Sat, 17 Aug 2013 07:58:02 +0200 Subject: French translation update. --- debian/changelog | 1 + 1 file changed, 1 insertion(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index d1ecbff1f..201e5b58a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ apt (0.9.9.5) UNRELEASED; urgency=low * Vietnamese translation update. Closes: #718615 * Japanese translation update. Closes: #719279 + * French translation update. -- Christian Perrier Sat, 03 Aug 2013 16:06:55 +0200 -- cgit v1.2.3 From b44c98f9d80ac59f6602e16e6aedd3a8f9f9485a Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sat, 17 Aug 2013 10:03:02 +0200 Subject: update changelog --- debian/changelog | 13 +++++++++++++ 1 file changed, 13 insertions(+) (limited to 'debian') diff --git a/debian/changelog b/debian/changelog index bd6357c62..3be808686 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,7 @@ 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 @@ -14,6 +16,17 @@ apt (0.9.11) UNRELEASED; urgency=low * 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 Thu, 15 Aug 2013 09:27:35 +0200 -- cgit v1.2.3