From 8f3aa4bd4f8a1ddc4395dab5a1e2382eed75660c Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 22 Aug 2013 16:36:31 +0200 Subject: add a breaks libapt-inst for FileFd changes in 0.9.9 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Partial upgrades… The fix for 704608 assumes that bf35c19b817cc1474b3deabce0b0953c248bad42 was applied to libapt-inst which isn't the case for partial upgrades of course, so break it to ensure that it is the case. Closes: 720449 --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index ca18ff01f..f2532312f 100644 --- a/debian/control +++ b/debian/control @@ -41,7 +41,7 @@ Architecture: any Multi-Arch: same Pre-Depends: ${misc:Pre-Depends} Depends: ${shlibs:Depends}, ${misc:Depends} -Breaks: apt (<< 0.9.4~) +Breaks: apt (<< 0.9.4~), libapt-inst1.5 (<< 0.9.9~) Section: libs Description: package management runtime library This library provides the common functionality for searching and -- cgit v1.2.3 From 5add00693a41234b218512f1f8b3e46b44f5f8d3 Mon Sep 17 00:00:00 2001 From: David Kalnischkies Date: Thu, 22 Aug 2013 16:46:43 +0200 Subject: add versions to manpages-it Replaces+Breaks In the meantime the package was updated to remove the old APT manpages from this package, so we can now add a Breaks and version it, too. The intial Replaces was added in: b57220d815aedbc023847d0885e08c6ed50e629a --- debian/control | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/debian/control b/debian/control index f2532312f..3c5d14fe8 100644 --- a/debian/control +++ b/debian/control @@ -18,7 +18,8 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=apt/apt.git Package: apt Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends}, debian-archive-keyring, gnupg -Replaces: manpages-pl (<< 20060617-3~), manpages-it +Replaces: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) +Breaks: manpages-pl (<< 20060617-3~), manpages-it (<< 2.80-4~) Conflicts: python-apt (<< 0.7.93.2~) Suggests: aptitude | synaptic | wajig, dpkg-dev, apt-doc, xz-utils, python-apt Description: commandline package manager -- cgit v1.2.3 From 7e02baf61fa07a83d6dd5622d135765c47f1b5dc Mon Sep 17 00:00:00 2001 From: Angel Guzman Maeso Date: Thu, 22 Aug 2013 16:54:20 +0200 Subject: fix compiler warning about sign-compare This fix avoids the warning "comparison between signed and unsigned integer expressions [-Wsign-compare]". The index for the loop needs to be unsigned for compare with globbuf.gl_pathc structure member. --- apt-pkg/contrib/fileutl.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/apt-pkg/contrib/fileutl.cc b/apt-pkg/contrib/fileutl.cc index dca468c63..47a91c294 100644 --- a/apt-pkg/contrib/fileutl.cc +++ b/apt-pkg/contrib/fileutl.cc @@ -1777,7 +1777,8 @@ std::vector Glob(std::string const &pattern, int flags) { std::vector result; glob_t globbuf; - int glob_res, i; + int glob_res; + unsigned int i; glob_res = glob(pattern.c_str(), flags, NULL, &globbuf); -- cgit v1.2.3