[Reproducible-commits] [dpkg] 07/10: debian: Use backports friendly versions in Breaks/Conflicts

[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 fe6f993a29d67d29f4d7cdfa02efda61f5b0ae3d
Author: Guillem Jover <guillem at debian.org>
Date:   Fri Apr 3 18:29:04 2015 +0200

    debian: Use backports friendly versions in Breaks/Conflicts
    
    Given that dpkg is Essential, and in practice it cannot be removed,
    having very strict Breaks/Conflicts disallowing backports makes life
    unnecessarily hard for people wanting to package and use them.
    
    Reported-by: Thorsten Glaser <tg at debian.org>
---
 debian/changelog |  2 ++
 debian/control   | 84 +++++++++++++++++++++++++++++---------------------------
 2 files changed, 45 insertions(+), 41 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a24ddf3..4ef9a2c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,8 @@ dpkg (1.17.25) UNRELEASED; urgency=low
     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
+  * Use backports friendly versions in Breaks/Conflicts.
+    Reported by Thorsten Glaser <tg at debian.org>.
 
   [ Updated programs translations ]
   * Dutch (Frans Spiesschaert). Closes: #779953
diff --git a/debian/control b/debian/control
index 2a8ed0b..ade9839 100644
--- a/debian/control
+++ b/debian/control
@@ -37,56 +37,58 @@ Pre-Depends: ${shlibs:Depends}, tar (>= 1.23)
 Depends: ${misc:Depends}
 Breaks: dpkg-dev (<< 1.15.8), libdpkg-perl (<< 1.15.8),
 # These cause trigger cycles due to using awaiting trigger directives.
- apt-cudf (<< 3.3~beta1-3),
- auctex (<< 11.87-3+deb8u1),
- ccache (<< 3.1.10-1),
- cups (<< 1.7.5-10),
- debian-security-support (<< 2014.10.26),
- distcc (<< 3.1-6.1),
- doc-base (<< 0.10.5),
- fusionforge-plugin-mediawiki (<< 5.3.2+20141104-3),
- gap-core (<< 4r7p5-2),
- gitweb (<< 1:2.1.4-2.1),
- grace (<< 1:5.1.24-3),
- gxine (<< 0.5.908-3.1),
- hoogle (<< 4.2.33-4),
- icecc (<< 1.0.1-2),
- install-info (<< 5.1.dfsg.1-3),
- libapache2-mod-php5 (<< 5.6.4+dfsg-3),
- libapache2-mod-php5filter (<< 5.6.4+dfsg-3),
- libjs-protoaculous (<< 5),
- man-db (<< 2.6.3-6), fontconfig (<< 2.11.0-6.2),
- mcollective (<< 2.6.0+dfsg-2.1),
- php5-fpm (<< 5.6.4+dfsg-3),
- pypy (<< 2.4.0+dfsg-3),
- readahead-fedora (<< 2:1.5.6-5.2),
- wordpress (<< 4.1+dfsg-1),
- xfonts-traditional (<< 1.7),
- xine-ui (<< 0.99.9-1.2),
+ apt-cudf (<< 3.3~beta1-3~),
+ auctex (<< 11.87-3+deb8u1~),
+ ccache (<< 3.1.10-1~),
+ cups (<< 1.7.5-10~),
+ debian-security-support (<< 2014.10.26~),
+ distcc (<< 3.1-6.1~),
+ doc-base (<< 0.10.5~),
+ fontconfig (<< 2.11.0-6.2~),
+ fusionforge-plugin-mediawiki (<< 5.3.2+20141104-3~),
+ gap-core (<< 4r7p5-2~),
+ gitweb (<< 1:2.1.4-2.1~),
+ grace (<< 1:5.1.24-3~),
+ gxine (<< 0.5.908-3.1~),
+ hoogle (<< 4.2.33-4~),
+ icecc (<< 1.0.1-2~),
+ install-info (<< 5.1.dfsg.1-3~),
+ libapache2-mod-php5 (<< 5.6.4+dfsg-3~),
+ libapache2-mod-php5filter (<< 5.6.4+dfsg-3~),
+ libjs-protoaculous (<< 5~),
+ man-db (<< 2.6.3-6~),
+ mcollective (<< 2.6.0+dfsg-2.1~),
+ php5-fpm (<< 5.6.4+dfsg-3~),
+ pypy (<< 2.4.0+dfsg-3~),
+ readahead-fedora (<< 2:1.5.6-5.2~),
+ wordpress (<< 4.1+dfsg-1~),
+ xfonts-traditional (<< 1.7~),
+ xine-ui (<< 0.99.9-1.2~),
 # These do not support triggers.
- apt (<< 0.7.7), aptitude (<< 0.4.7-1)
+ apt (<< 0.7.7~), aptitude (<< 0.4.7-1~)
 Conflicts:
 # The following Conflicts against removed packages using install-info
 # in their prerm script can be removed in jessie+1.
 # 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),
+ 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-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),
- gnat-4.1-doc (<< 4.1.2.nf2-4), cpp-4.2-doc (<< 4.2.4.nf1-4),
- 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),
+ 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~),
+ gnat-4.1-doc (<< 4.1.2.nf2-4~), cpp-4.2-doc (<< 4.2.4.nf1-4~),
+ 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-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),
+ 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~),
  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),
+ 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+rm)
 Suggests: apt

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