The following commit has been merged in the debian-sid branch:
commit f8ee0594afb1f533697d76311e419ac331787eb4
Author: Pierre Habouzit <[email protected]>
Date: Fri Jul 30 23:11:51 2010 +0200
Make apt-listchanges guess about binNMUs again (Closes: 590989).
Signed-off-by: Pierre Habouzit <[email protected]>
diff --git a/apt-listchanges/DebianFiles.py b/apt-listchanges/DebianFiles.py
index c52ba96..45aedee 100644
--- a/apt-listchanges/DebianFiles.py
+++ b/apt-listchanges/DebianFiles.py
@@ -70,11 +70,24 @@ class ControlStanza:
return hasattr(self, 'Status') and self.Status.split(' ')[2] ==
'installed'
def version(self):
+ """
+ This function returns the version of the package. One would like it to
+ be the "binary" version, though we have the tough case of source
+ package whose binary packages versioning scheme is different from the
+ source one (see OOo, linux-source, ...).
+
+ This code does the following, if the Source field is set with a
+ specified version, then we use the binary version if and only if the
+ source version is a prefix. We must do that because of binNMUs.
+ """
+ v = self.Version
if hasattr(self, 'Source'):
match = self.source_version_re.match(self.Source)
if match:
- return match.group('version')
- return self.Version
+ sv = match.group('version')
+ if not v.startswith(sv):
+ return sv
+ return v
class ControlParser:
diff --git a/debian/changelog b/debian/changelog
index 8c72413..ae7cb30 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+apt-listchanges (2.85.3) UNRELEASED; urgency=low
+
+ * Make apt-listchanges guess about binNMUs again; Closes: 590989
+
+ -- Pierre Habouzit <[email protected]> Fri, 30 Jul 2010 23:12:37 +0200
+
apt-listchanges (2.85.2) unstable; urgency=low
* apt-listchanges no longer supposes that binary packages all have the same
--
apt-listchanges: package change history notification tool
--
To UNSUBSCRIBE, email to [email protected]
with a subject of "unsubscribe". Trouble? Contact [email protected]
