This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit 18bfaa4e7588e5607be04c0f64842190d95008a4 Author: Guillem Jover <[email protected]> Date: Thu Dec 4 19:05:43 2014 +0100 debian: Remove old trigger related Breaks/Conflicts from dpkg --- debian/changelog | 1 + debian/control | 42 +----------------------------------------- debian/dpkg.lintian-overrides | 2 -- 3 files changed, 2 insertions(+), 43 deletions(-) diff --git a/debian/changelog b/debian/changelog index c8d5032..690aad7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -76,6 +76,7 @@ dpkg (1.18.0) UNRELEASED; urgency=low except for --raw-extract which does not yet support it. Closes: #616614 Based on a patch by Johannes Schauer <[email protected]>. * Add ‘.mailmap’ to the default dpkg-source ignore lists. + * Remove old trigger related Breaks and Conflicts from dpkg. [ Raphaël Hertzog ] * Drop myself from Uploaders. diff --git a/debian/control b/debian/control index baeb9bf..d8b23ac 100644 --- a/debian/control +++ b/debian/control @@ -35,47 +35,7 @@ Multi-Arch: foreign Essential: yes 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), - ccache (<< 3.1.10-1), - cups (<< 1.7.5-10), - distcc (<< 3.1-6.1), - fusionforge-plugin-mediawiki (<< 5.3.2+20141104-3), - gap-core (<< 4r7p5-2), - gxine (<= 0.5.908-3), - hoogle (<< 4.2.33-4), - icecc (<= 1.0.1-1), - libjs-protoaculous (<< 5), - man-db (<< 2.6.3-6), fontconfig (<< 2.11.0-6.2), - mcollective (<< 2.6.0+dfsg-2.1), - pypy (<< 2.4.0+dfsg-3), - readahead-fedora (<< 2:1.5.6-5.2), - wordpress (<< 4.1+dfsg-1), - xfonts-traditional (<< 1.7), -# These do not support triggers. - 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), -# 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), -# 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), - 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) +Breaks: dpkg-dev (<< 1.15.8), libdpkg-perl (<< 1.15.8) Suggests: apt Replaces: manpages-it (<< 2.80-4) Description: Debian package management system diff --git a/debian/dpkg.lintian-overrides b/debian/dpkg.lintian-overrides index 090d7c3..ca1a983 100644 --- a/debian/dpkg.lintian-overrides +++ b/debian/dpkg.lintian-overrides @@ -3,5 +3,3 @@ dpkg: redundant-bugs-field dpkg: arch-dep-package-has-big-usr-share # False positives, we read from a file not from a tty dpkg: read-in-maintainer-script preinst:* -# False positives, we really need the versioned Conflicts -dpkg: conflicts-with-version * -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git -- To UNSUBSCRIBE, email to [email protected] with a subject of "unsubscribe". Trouble? Contact [email protected]
