Package: aptitude
Version: 0.4.6.1-1
This patch makes aptitude know what to do about the new package states
which can appear when dpkg supports triggers.
The new aptitude source needs to be built against libapt-pkg from the
new apt, but aside from that (which I have declared in the
Build-Depends) it should work straight away. So this change should be
made immediately.
Regards,
Ian.
diff -ru orig/aptitude-0.4.6.1/debian/changelog
aptitude-0.4.6.1/debian/changelog
--- orig/aptitude-0.4.6.1/debian/changelog 2007-08-15 20:43:26.000000000
+0100
+++ aptitude-0.4.6.1/debian/changelog 2007-08-16 01:09:38.000000000 +0100
@@ -1,3 +1,9 @@
+aptitude (0.4.6.1-1ubuntu2) gutsy; urgency=low
+
+ * dpkg-triggers: Deal properly with new package states.
+
+ -- Ian Jackson <[EMAIL PROTECTED]> Wed, 15 Aug 2007 20:48:39 +0100
+
aptitude (0.4.6.1-1ubuntu1) gutsy; urgency=low
* Build against latest apt
Only in aptitude-0.4.6.1/debian: changelog~
diff -ru orig/aptitude-0.4.6.1/debian/control aptitude-0.4.6.1/debian/control
--- orig/aptitude-0.4.6.1/debian/control 2007-08-15 20:43:26.000000000
+0100
+++ aptitude-0.4.6.1/debian/control 2007-08-15 20:52:50.000000000 +0100
@@ -2,7 +2,7 @@
Section: admin
Maintainer: Ubuntu Core Developers <[EMAIL PROTECTED]>
XSBC-Original-Maintainer: Daniel Burrows <[EMAIL PROTECTED]>
-Build-Depends: libapt-pkg-dev (>= 0.7.6), debhelper (>= 4.0.0),
libsigc++-2.0-dev, libcppunit-dev, libncursesw5-dev, gettext, g++ (>=
4:3.2.2-0), docbook-xsl, docbook-xml, xsltproc, html2text, po4a, dpatch
+Build-Depends: libapt-pkg-dev (>= 0.7.6ubuntu6), debhelper (>= 4.0.0),
libsigc++-2.0-dev, libcppunit-dev, libncursesw5-dev, gettext, g++ (>=
4:3.2.2-0), docbook-xsl, docbook-xml, xsltproc, html2text, po4a, dpatch
Standards-Version: 3.6.1.0
Package: aptitude
Only in aptitude-0.4.6.1/debian: control~
diff -ru orig/aptitude-0.4.6.1/src/cmdline/cmdline_show.cc
aptitude-0.4.6.1/src/cmdline/cmdline_show.cc
--- orig/aptitude-0.4.6.1/src/cmdline/cmdline_show.cc 2007-07-26
06:04:39.000000000 +0100
+++ aptitude-0.4.6.1/src/cmdline/cmdline_show.cc 2007-08-15
21:25:01.000000000 +0100
@@ -189,6 +189,10 @@
return _("partially installed");
case pkgCache::State::ConfigFiles:
return _("not installed (configuration files remain)");
+ case pkgCache::State::TriggersAwaited:
+ return _("awaiting trigger processing by other package(s)");
+ case pkgCache::State::TriggersPending:
+ return _("awaiting trigger processing");
case pkgCache::State::Installed:
return _("installed");
default:
Only in aptitude-0.4.6.1/src/cmdline: cmdline_show.cc~
diff -ru orig/aptitude-0.4.6.1/src/generic/apt/apt.cc
aptitude-0.4.6.1/src/generic/apt/apt.cc
--- orig/aptitude-0.4.6.1/src/generic/apt/apt.cc 2007-07-26
06:04:39.000000000 +0100
+++ aptitude-0.4.6.1/src/generic/apt/apt.cc 2007-08-15 20:47:04.000000000
+0100
@@ -408,7 +408,9 @@
return pkg_reinstall;
// States where --configure fixes things.
else if(pkg->CurrentState == pkgCache::State::UnPacked ||
- pkg->CurrentState == pkgCache::State::HalfConfigured)
+ pkg->CurrentState == pkgCache::State::HalfConfigured ||
+ pkg->CurrentState == pkgCache::State::TriggersAwaited ||
+ pkg->CurrentState == pkgCache::State::TriggersPending)
return pkg_unconfigured;
return pkg_unchanged;
Only in aptitude-0.4.6.1/src/generic/apt: apt.cc~
diff -ru orig/aptitude-0.4.6.1/src/pkg_columnizer.cc
aptitude-0.4.6.1/src/pkg_columnizer.cc
--- orig/aptitude-0.4.6.1/src/pkg_columnizer.cc 2007-07-26 06:04:39.000000000
+0100
+++ aptitude-0.4.6.1/src/pkg_columnizer.cc 2007-08-15 20:47:32.000000000
+0100
@@ -217,6 +217,10 @@
return column_disposition("c", 0);
case pkgCache::State::Installed:
return column_disposition("i", 0);
+ case pkgCache::State::TriggersAwaited:
+ return column_disposition("W", 0);
+ case pkgCache::State::TriggersPending:
+ return column_disposition("T", 0);
default:
return column_disposition("E", 0);
}
@@ -247,6 +251,10 @@
return column_disposition(_("config-files"), 0);
case pkgCache::State::Installed:
return column_disposition(_("installed"), 0);
+ case pkgCache::State::TriggersAwaited:
+ return column_disposition(_("triggers-awaited"), 0);
+ case pkgCache::State::TriggersPending:
+ return column_disposition(_("triggers-pending"), 0);
default:
return column_disposition(_("ERROR"), 0);
}
Only in aptitude-0.4.6.1/src: pkg_columnizer.cc~
diff -ru orig/aptitude-0.4.6.1/src/pkg_ver_item.cc
aptitude-0.4.6.1/src/pkg_ver_item.cc
--- orig/aptitude-0.4.6.1/src/pkg_ver_item.cc 2007-07-26 06:04:39.000000000
+0100
+++ aptitude-0.4.6.1/src/pkg_ver_item.cc 2007-08-15 20:48:08.000000000
+0100
@@ -190,6 +190,10 @@
return column_disposition("c", 0);
case pkgCache::State::Installed:
return column_disposition("i", 0);
+ case pkgCache::State::TriggersAwaited:
+ return column_disposition("W", 0);
+ case pkgCache::State::TriggersPending:
+ return column_disposition("T", 0);
default:
return column_disposition("E", 0);
}
Only in aptitude-0.4.6.1/src: pkg_ver_item.cc~
