From 1d75192b8fa500f430882f32b5888fe939dba424 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Wed, 27 Jun 2007 14:35:44 +0200 Subject: * cmdline/apt-get.cc: - improve taskinstall regexp --- cmdline/apt-get.cc | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/cmdline/apt-get.cc b/cmdline/apt-get.cc index 7aea9edb3..aa54677be 100644 --- a/cmdline/apt-get.cc +++ b/cmdline/apt-get.cc @@ -1519,7 +1519,8 @@ bool TryInstallTask(pkgDepCache &Cache, pkgProblemResolver &Fix, // build regexp for the task char S[300]; - snprintf(S, sizeof(S), "^Task:.*[^a-z\n]%s[^a-z].*$", taskname); + // better: "^Task:.*[^a-z]lamp-server([^a-z]|\n)" ? + snprintf(S, sizeof(S), "^Task:.*[^a-z]%s[^a-z].*$", taskname); regcomp(&Pattern,S, REG_EXTENDED | REG_NOSUB | REG_NEWLINE); bool found = false; -- cgit v1.2.3-70-g09d2 From 36baa77ad9711a98c1407990a2f04acf666d4408 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Fri, 29 Jun 2007 22:40:44 +0200 Subject: * fixes in the auto-mark code (thanks to Daniel Burrows) --- apt-pkg/depcache.cc | 9 ++++++--- debian/changelog | 2 ++ 2 files changed, 8 insertions(+), 3 deletions(-) diff --git a/apt-pkg/depcache.cc b/apt-pkg/depcache.cc index 50a75843f..7f5719454 100644 --- a/apt-pkg/depcache.cc +++ b/apt-pkg/depcache.cc @@ -1285,6 +1285,7 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, bool follow_suggests) { pkgDepCache::StateCache &state = PkgState[pkg->ID]; + VerIterator currver = pkg.CurrentVer(); VerIterator candver = state.CandidateVerIter(*this); VerIterator instver = state.InstVerIter(*this); @@ -1305,9 +1306,11 @@ void pkgDepCache::MarkPackage(const pkgCache::PkgIterator &pkg, } #endif - // Ignore versions other than the InstVer, and ignore packages - // that are already going to be removed or just left uninstalled. - if(!(ver == instver && !instver.end())) + // For packages that are not going to be removed, ignore versions + // other than the InstVer. For packages that are going to be + // removed, ignore versions other than the current version. + if(!(ver == instver && !instver.end()) && + !(ver == currver && instver.end() && !ver.end())) return; // if we are marked already we are done diff --git a/debian/changelog b/debian/changelog index 23780b5ff..d0103f43a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,8 @@ apt (0.7.3) unstable; urgency=low * fixed compile errors with g++ 7.3 (thanks to Daniel Burrows, closes: #429378) + * fixes in the auto-mark code (thanks to Daniel + Burrows) * fix FTFBFS by changing build-depends to libcurl4-gnutls-dev (closes: #428363) * cmdline/apt-get.cc: -- cgit v1.2.3-70-g09d2 From eca44a5f7e4402dcf254a465150e55d3c967c805 Mon Sep 17 00:00:00 2001 From: Michael Vogt Date: Sun, 1 Jul 2007 12:28:53 +0200 Subject: * Non-maintainer upload. * Build-depend on libcurl4-gnutls-dev instead of the obsolete libcurl3-gnutls-dev. Closes: #428363. --- configure.in | 2 +- debian/changelog | 8 ++++++++ debian/control | 2 +- 3 files changed, 10 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 34d4dcc78..4daa0ab78 100644 --- a/configure.in +++ b/configure.in @@ -18,7 +18,7 @@ AC_CONFIG_AUX_DIR(buildlib) AC_CONFIG_HEADER(include/config.h:buildlib/config.h.in include/apti18n.h:buildlib/apti18n.h.in) dnl -- SET THIS TO THE RELEASE VERSION -- -AC_DEFINE_UNQUOTED(VERSION,"0.7.2") +AC_DEFINE_UNQUOTED(VERSION,"0.7.2-0.1") PACKAGE="apt" AC_DEFINE_UNQUOTED(PACKAGE,"$PACKAGE") AC_SUBST(PACKAGE) diff --git a/debian/changelog b/debian/changelog index 41609bd74..3cbef682d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +apt (0.7.2-0.1) unstable; urgency=low + + * Non-maintainer upload. + * Build-depend on libcurl4-gnutls-dev instead of the obsolete + libcurl3-gnutls-dev. Closes: #428363. + + -- Steve Langasek Thu, 28 Jun 2007 18:46:53 -0700 + apt (0.7.2) unstable; urgency=low * merged the debian/experimental changes back diff --git a/debian/control b/debian/control index 5686926d4..7939e1bca 100644 --- a/debian/control +++ b/debian/control @@ -4,7 +4,7 @@ Priority: important Maintainer: APT Development Team Uploaders: Jason Gunthorpe , Adam Heath , Matt Zimmerman , Michael Vogt Standards-Version: 3.7.2.2 -Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl3-gnutls-dev (>= 7.15.5) +Build-Depends: debhelper (>= 5.0), libdb4.4-dev, gettext (>= 0.12), libcurl4-gnutls-dev | libcurl3-gnutls-dev (>= 7.15.5) Build-Depends-Indep: debiandoc-sgml, docbook-utils (>= 0.6.12-1) XS-Vcs-Bzr: http://bzr.debian.org/apt/debian-sid/ -- cgit v1.2.3-70-g09d2 From ec5e7f30f3bd98749c4b11b4edd64bbb89c4dc15 Mon Sep 17 00:00:00 2001 From: Otavio Salvador Date: Mon, 2 Jul 2007 13:29:03 -0300 Subject: * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) --- debian/changelog | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/debian/changelog b/debian/changelog index 898092652..cb86ce580 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,6 +1,12 @@ +apt (0.7.4) UNRELEASED; urgency=low + + * Fix a typo on 0.7.3 changelog entry about g++ (7.3 to 4.3) + + -- Otavio Salvador Mon, 02 Jul 2007 13:27:54 -0300 + apt (0.7.3) unstable; urgency=low - * fixed compile errors with g++ 7.3 (thanks to + * fixed compile errors with g++ 4.3 (thanks to Daniel Burrows, closes: #429378) * fixes in the auto-mark code (thanks to Daniel Burrows) -- cgit v1.2.3-70-g09d2