Your message dated Wed, 30 Nov 2011 01:24:12 +0000
with message-id
<CAPQ4b8k=_qctlp_ogwnz5jpf2unlpgb4gjzguqqxwmbgv2c...@mail.gmail.com>
and subject line aptitude bug #600410 can be closed
has caused the Debian Bug report #600410,
regarding aptitude: diff for NMU version 0.6.3-3.2
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
600410: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=600410
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
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 <[email protected]> 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 <[email protected]>
+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
--- End Message ---
--- Begin Message ---
fixed 600410 0.6.4-1
stop
Fixed a while ago, when Daniel Burrows included your changes in 0.6.4-1.
http://anonscm.debian.org/gitweb/?p=aptitude/aptitude.git;a=commitdiff;h=49630c050baf0f87adb28864a6f47dae30c7a3c6
Regards.
--- End Message ---
