[Reproducible-commits] [dpkg] 06/10: debian: Use correct versions in Conflicts for removed packages

[Holger Levsen]

This is an automated email from the git hooks/post-receive script.

holger pushed a commit to annotated tag 1.17.25
in repository dpkg.

commit 5622a53277b7140ab496c1a549db6b5bb2616f90
Author: Guillem Jover <guillem at debian.org>
Date:   Fri Apr 3 18:28:42 2015 +0200

    debian: Use correct versions in Conflicts for removed packages
    
    Use the versions when the unfixed packages got removed, instead of the
    version present in the Debian release before they got removed.
    
    Closes: #776984
---
 debian/changelog | 1 +
 debian/control   | 6 +++---
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4896319..a24ddf3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,7 @@ dpkg (1.17.25) UNRELEASED; urgency=low
     clarify what whitespace really maps to, we should really match the GnuPG
     implementation anyway, as that's what we use to verify the signatures.
     Reported by Jann Horn <jann at thejh.net>. Fixes CVE-2015-0840.
+  * Use correct versions in Conflicts for removed packages. Closes: #776984
 
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #779953
diff --git a/debian/control b/debian/control
index 12fb93f..2a8ed0b 100644
--- a/debian/control
+++ b/debian/control
@@ -71,7 +71,7 @@ Conflicts:
 # These packages have been removed after squeeze:
  ggz-docs (<< 0.0.14.1-2), glame (<< 2.0.1-6), gtalk (<< 0.99.10-16),
  libalogg-dev (<< 1.3.7-2), r6rs-doc (<< 1.0-2), ulog-acctd (<< 0.4.3-3),
- octave3.2-info (<< 3.2.4-8),
+ octave3.2-info (<< 3.2.4-12+rm),
 # These non-free packages have been removed after squeeze:
  cpp-4.1-doc (<< 4.1.2.nf2-4), gcc-4.1-doc (<< 4.1.2.nf2-4),
  gcj-4.1-doc (<< 4.1.2.nf2-4), gfortran-4.1-doc (<< 4.1.2.nf2-4),
@@ -83,12 +83,12 @@ Conflicts:
  bogosort (<< 0.4.2-3), cl-yacc (<< 0.3-3), libgtk1.2-doc (<< 1.2.10-19),
  libnettle-dev (<< 2), liborbit-dev (<< 0.5.17-12), libreadline5-dev (<< 5.2-8),
  librep-doc (<< 0.90), mmucl (<< 1.5.2-3), nxml-mode (<< 20041004-9),
- octave3.0-info (<< 1:3.0.1-6lenny3),
+ octave3.0-info (<< 1:3.0.5-7+rm),
  serveez-doc (<< 0.1.5-3), slat (<< 2.0-6),
  texlive-base-bin-doc (<< 2007.dfsg.2-9), ttcn-el (<< 0.6.9-2),
  xconq-doc (<< 7.4.1-5), zenirc (<< 2.112.dfsg-1),
 # These non-free packages have been removed after lenny:
- polgen-doc (<< 1.3-3)
+ polgen-doc (<< 1.3-3+rm)
 Suggests: apt
 Replaces: manpages-it (<< 2.80-4)
 Description: Debian package management system

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/reproducible/dpkg.git