This is an automated email from the git hooks/post-receive script. guillem pushed a commit to branch master in repository dpkg.
commit 19b2192db8382d435da6f424a9d9bba524670e5f Author: Guillem Jover <[email protected]> Date: Fri Aug 5 23:47:06 2016 +0200 debian: Remove u-a, dpkg-divert and dpkg-statoverride compat symlinks (again) There are very few packages now using the hardcoded paths, with bugs and patches. It's about time to clean this up. --- Makefile.am | 1 - TODO | 3 --- debian/changelog | 2 ++ debian/control | 14 ++++++++++++++ debian/dpkg.links | 3 --- 5 files changed, 16 insertions(+), 7 deletions(-) diff --git a/Makefile.am b/Makefile.am index 0306eaf..3a01a36 100644 --- a/Makefile.am +++ b/Makefile.am @@ -55,7 +55,6 @@ EXTRA_DIST = \ debian/dpkg.preinst \ debian/dpkg.prerm \ debian/dpkg.logrotate \ - debian/dpkg.links \ debian/dpkg.lintian-overrides \ debian/dselect.cfg \ debian/dselect.docs \ diff --git a/TODO b/TODO index a452e1d..f84e57d 100644 --- a/TODO +++ b/TODO @@ -84,9 +84,6 @@ TODO * We should set our own obstack_alloc_failed_handler. - * Remove compatibility symlinks - /usr/sbin/{update-alternatives,dpkg-divert,dpkg-statoverride}. - ------------------------------------------------------------------------------ Old TODO entries from Scott: diff --git a/debian/changelog b/debian/changelog index d2d8972..16dd246 100644 --- a/debian/changelog +++ b/debian/changelog @@ -5,6 +5,8 @@ dpkg (1.18.11) UNRELEASED; urgency=medium - Add liblocale-gettext-perl to libdpkg-perl Recommends. - Wrap and document dependency relationships. - Remove obsolete dependency relationships, since Debian oldstable. + - Remove update-alternatives, dpkg-divert and dpkg-statoverride + compatibility symlinks, again. * Documentation: - Update custom changelog parser API support status in README.api. - Fix typos in docs and man pages. Thanks to Jakub Wilk <[email protected]> diff --git a/debian/control b/debian/control index 334efae..11780da 100644 --- a/debian/control +++ b/debian/control @@ -56,6 +56,20 @@ Suggests: apt, Replaces: manpages-it (<< 2.80-4), +Breaks: +# Due to removal of dpkg-divert compat symlink. + amule (<< 2.3.1+git1a369e47-3), +# Due to removal of dpkg-statoverride compat symlink. + acidbase (<= 1.4.5-4), + beep (<< 1.3-4), + im (<< 1:151-4), + netselect (<< 0.3.ds1-27), + pconsole (<< 1.0-12), + phpgacl (<< 3.3.7-7.3), + pure-ftpd (<< 1.0.43-1), + systemtap (<< 2.8-1), + terminatorx (<< 4.0.1-1), + xvt (<= 2.1-20.1), Description: Debian package management system This package provides the low-level infrastructure for handling the installation and removal of Debian software packages. diff --git a/debian/dpkg.links b/debian/dpkg.links deleted file mode 100644 index 429ab15..0000000 --- a/debian/dpkg.links +++ /dev/null @@ -1,3 +0,0 @@ -usr/bin/dpkg-divert usr/sbin/dpkg-divert -usr/bin/dpkg-statoverride usr/sbin/dpkg-statoverride -usr/bin/update-alternatives usr/sbin/update-alternatives -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/dpkg/dpkg.git
