[Reproducible-commits] [dpkg] 05/13: debian: Add Conflicts for removed packages expecting dpkg to ship install-info

[Holger Levsen]

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

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

commit b748363bf6e4edd8667df769d452ec11ef90a36a
Author: Guillem Jover <guillem at debian.org>
Date:   Tue Feb 3 21:05:41 2015 +0100

    debian: Add Conflicts for removed packages expecting dpkg to ship install-info
    
    These where missing in the previous batch.
    
    Closes: #776984
---
 debian/changelog | 2 ++
 debian/control   | 6 +++++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 376b4ce..d1132e6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ dpkg (1.17.24) UNRELEASED; urgency=low
     Closes: #774794
   * Switch versioned Breaks for trigger cycles from <= to << relations (with
     the necessary version adjustments).
+  * Add Conflicts for removed packages expecting dpkg to ship install-info.
+    Namely octave3.2-info, octave3.0-info and polgen-doc. Closes: #776984
 
   [ Updated manpages translations ]
   * German (Helge Kreutzmann).
diff --git a/debian/control b/debian/control
index 49717fc..18fe580 100644
--- a/debian/control
+++ b/debian/control
@@ -71,6 +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),
 # 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),
@@ -82,9 +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),
  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)
+ 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)
 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