Package: aptitude Version: 0.6.3-3.1 Severity: normal Tags: patch pending Dear maintainer,
I've prepared an NMU for aptitude (versioned as 0.6.3-3.2) and uploaded it to DELAYED/2. Please feel free to tell me if I should delay it longer. Regards. diff -Nru aptitude-0.6.3/debian/changelog aptitude-0.6.3/debian/changelog --- aptitude-0.6.3/debian/changelog 2010-08-26 19:00:58.000000000 +0100 +++ aptitude-0.6.3/debian/changelog 2010-10-16 18:36:26.000000000 +0100 @@ -1,3 +1,13 @@ +aptitude (0.6.3-3.2) unstable; urgency=low + + * Non-maintainer upload. + * 0007-preferences-dir.patch: Patch to support /etc/apt/preferences.d/ + directory. (Closes: #557580) + * debian/rules: Fix clean rule. Patch by Stéphane Glondu. + (Closes: #594505) + + -- Tim Retout <dioc...@debian.org> Tue, 12 Oct 2010 21:11:54 +0100 + aptitude (0.6.3-3.1) unstable; urgency=low * Non-maintainer upload to fix FTBFS (closes: 594199). diff -Nru aptitude-0.6.3/debian/patches/0007-preferences-dir.patch aptitude-0.6.3/debian/patches/0007-preferences-dir.patch --- aptitude-0.6.3/debian/patches/0007-preferences-dir.patch 1970-01-01 01:00:00.000000000 +0100 +++ aptitude-0.6.3/debian/patches/0007-preferences-dir.patch 2010-10-16 18:34:30.000000000 +0100 @@ -0,0 +1,48 @@ +Description: Support preferences.d directory. +Author: Tim Retout <dioc...@debian.org> +Bug-Debian: http://bugs.debian.org/557580 + +--- aptitude-0.6.3.orig/src/cmdline/cmdline_do_action.cc ++++ aptitude-0.6.3/src/cmdline/cmdline_do_action.cc +@@ -200,6 +200,7 @@ int cmdline_do_action(int argc, char *ar + + pkgPolicy policy(&(*apt_cache_file)->GetCache()); + ReadPinFile(policy); ++ ReadPinDir(policy); + + pkgset to_upgrade, to_install, to_hold, to_remove, to_purge; + +--- aptitude-0.6.3.orig/src/generic/apt/aptcache.cc ++++ aptitude-0.6.3/src/generic/apt/aptcache.cc +@@ -2179,7 +2179,7 @@ bool aptitudeCacheFile::Open(OpProgress + Policy=new aptitudePolicy(Cache); + if(_error->PendingError()) + return false; +- if(!ReadPinFile(*Policy)) ++ if(ReadPinFile(*Policy) == false || ReadPinDir(*Policy) == false) + return false; + + DCache=new aptitudeDepCache(Cache, Policy); +--- aptitude-0.6.3.orig/src/generic/apt/dump_packages.cc ++++ aptitude-0.6.3/src/generic/apt/dump_packages.cc +@@ -744,6 +744,7 @@ namespace aptitude + // $(Dir::Etc::main) + // $(Dir::Etc::parts)/* + // $(Dir::Etc::preferences) ++ // $(Dir::Etc::preferencesparts)/* + // + // Dir::State::* are truncated copies; the others are copied + // literally. +@@ -837,6 +838,12 @@ namespace aptitude + copy_truncated(preferences, outDir + "/" + preferences, + visited_packages); + } ++ ++ { ++ const std::string preferencesParts = _config->FindDir("Dir::Etc::preferencesparts"); ++ if(!preferencesParts.empty()) ++ recursive_copy_dir(preferencesParts, outDir + "/" + preferencesParts); ++ } + } + + void dump_truncated_packages(const std::set<pkgCache::PkgIterator> &packages, diff -Nru aptitude-0.6.3/debian/patches/series aptitude-0.6.3/debian/patches/series --- aptitude-0.6.3/debian/patches/series 2010-08-26 19:01:27.000000000 +0100 +++ aptitude-0.6.3/debian/patches/series 2010-10-16 18:35:47.000000000 +0100 @@ -5,3 +5,4 @@ 0005-ftbfs-new-apt.patch 0006-Comment-out-std-ostream-operator-std-ostream-out-con.patch debian-changes-0.6.3-3.1 +0007-preferences-dir.patch diff -Nru aptitude-0.6.3/debian/rules aptitude-0.6.3/debian/rules --- aptitude-0.6.3/debian/rules 2010-08-26 18:43:06.000000000 +0100 +++ aptitude-0.6.3/debian/rules 2010-10-12 21:22:13.000000000 +0100 @@ -63,8 +63,8 @@ if [ -f build-stamp-curses ]; then rm build-stamp-curses; fi if [ -f build-indep-stamp ]; then rm build-indep-stamp; fi rm -fr debian/html-docs - if [ -d $(GTK_BUILD_DIR)]; then rm -r $(GTK_BUILD_DIR); fi - if [ -d $(CURSES_BUILD_DIR)]; then rm -r $(CURSES_BUILD_DIR); fi + if [ -d $(GTK_BUILD_DIR) ]; then rm -r $(GTK_BUILD_DIR); fi + if [ -d $(CURSES_BUILD_DIR) ]; then rm -r $(CURSES_BUILD_DIR); fi [ ! -f Makefile ] || $(MAKE) distclean [ ! -f doc/Makefile ] || $(MAKE) -C doc distclean -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
