[Reproducible-commits] [dpkg] 09/18: debian: Add more Conflicts for packages expecting install-info in dpkg

[Holger Levsen]

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

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

commit 8d15af2fab8fe06982262aac4e1faf304eadcad4
Author: Guillem Jover <guillem at debian.org>
Date:   Sat Aug 8 03:05:25 2015 +0200

    debian: Add more Conflicts for packages expecting install-info in dpkg
    
    Closes: #783657
    Thanks-to: Andreas Beckmann <anbe at debian.org>
---
 debian/changelog | 7 +++++--
 debian/control   | 2 ++
 2 files changed, 7 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f2981e1..909bafc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,10 @@
 dpkg (1.17.26) UNRELEASED; urgency=low
 
+  [ Guillem Jover ]
+  * Add more Conflicts for removed packages expecting dpkg to ship
+    install-info. Namely ada-mode and octave2.1-info. Closes: #783657
+    Thanks to Andreas Beckmann <anbe at debian.org>.
+
   [ Updated programs translations ]
   * Catalan (Jordi Mallach).
   * Turkish (Mert Dirik). Closes: #785095
@@ -10,8 +15,6 @@ dpkg (1.17.26) UNRELEASED; urgency=low
   [ Updated manpages translations ]
   * German (Helge Kreutzmann). (Various fixes)
 
-  *
-
  -- Guillem Jover <guillem at debian.org>  Fri, 10 Apr 2015 03:25:19 +0200
 
 dpkg (1.17.25) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index ade9839..97f06d2 100644
--- a/debian/control
+++ b/debian/control
@@ -80,11 +80,13 @@ Conflicts:
  gcc-4.2-doc (<< 4.2.4.nf1-4~), gcj-4.2-doc (<< 4.2.4.nf1-4~),
  gfortran-4.2-doc (<< 4.2.4.nf1-4~), gnat-4.2-doc (<< 4.2.4.nf1-4~),
 # These packages have been removed after lenny:
+ ada-mode (<< 3.6-3+rm),
  ada-reference-manual (<< 20021112web-4~), asn1-mode (<< 2.7-7~),
  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~),
+ octave2.1-info (<< 1:2.1.73-19+rm),
  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~),

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