The following commit has been merged in the master branch:
commit 3ce6d4f53f3227962b803a7a04a7721e065d01c0
Author: Raphael Hertzog <hert...@debian.org>
Date: Wed Feb 11 21:14:07 2009 +0100
Move update-alternatives, dpkg-divert and dpkg-statoverride to /usr/bin
* scripts/Makefile.am: Move update-alternatives, dpkg-divert and
dpkg-statoverride to /usr/bin as they can be useful to users since
they have --display or --list options that do not require
administrative rights.
* Makefile.am (EXTRA_DIST): Add debian/dpkg.links
diff --git a/ChangeLog b/ChangeLog
index 7c76524..fbdfa76 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
2009-02-11 Raphael Hertzog <hert...@debian.org>
+ * scripts/Makefile.am: Move update-alternatives, dpkg-divert and
+ dpkg-statoverride to /usr/bin as they can be useful to users since
+ they have --display or --list options that do not require
+ administrative rights.
+ * Makefile.am (EXTRA_DIST): Add debian/dpkg.links.
+
+2009-02-11 Raphael Hertzog <hert...@debian.org>
+
* scripts/dpkg-buildpackage.pl: Add new option --target/-T to
allow a specific debian/rules target to be run. The new --as-root
option forces the target to be run with root rights.
diff --git a/Makefile.am b/Makefile.am
index 77988c7..72254cc 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -43,6 +43,7 @@ EXTRA_DIST = \
debian/dpkg.postrm \
debian/dpkg.preinst \
debian/dpkg.logrotate \
+ debian/dpkg.links \
debian/dpkg.lintian-overrides \
debian/dselect.cfg \
debian/dselect.docs \
diff --git a/TODO b/TODO
index 9d1256a..0b13e06 100644
--- a/TODO
+++ b/TODO
@@ -1,8 +1,8 @@
ROADMAP
=======
-lenny
-~~~~~
+squeeze
+~~~~~~~
* Review this file and remove or update the old entries.
@@ -18,6 +18,12 @@ lenny
(1.x => 2.x) while minor version bump will be used for backwards
compatible extension (e.g. new fields).
+squeeze + 1
+~~~~~~~~~~~
+
+ * Remove compatibility symlinks
+ /usr/sbin/{update-alternatives,dpkg-divert,dpkg-statoverride}.
+
1.14.x
------
diff --git a/debian/changelog b/debian/changelog
index 659dcb8..dc5b5d8 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -141,6 +141,11 @@ dpkg (1.15.0) UNRELEASED; urgency=low
* Add new --target and --as-root options to dpkg-buildpackage to call
any debian/rules target with the proper build environment.
Closes: #477916
+ * Move update-alternatives, dpkg-divert and dpkg-statoverride to /usr/bin
+ but keep compatibility symlinks in /usr/sbin for the squeeze release
+ until all maintainer scripts are fixed (see
+
http://lintian.debian.org/tags/command-with-path-in-maintainer-script.html).
+ Closes: #216606
[ Pierre Habouzit ]
* Add a --query option to update-alternatives. Closes: #336091, #441904
diff --git a/debian/dpkg.install b/debian/dpkg.install
index 0816069..d30617a 100644
--- a/debian/dpkg.install
+++ b/debian/dpkg.install
@@ -5,9 +5,12 @@ etc/alternatives
etc/dpkg/origins
usr/bin/dpkg
usr/bin/dpkg-deb
+usr/bin/dpkg-divert
usr/bin/dpkg-query
usr/bin/dpkg-split
+usr/bin/dpkg-statoverride
usr/bin/dpkg-trigger
+usr/bin/update-alternatives
usr/lib/dpkg/mksplit
usr/sbin
usr/share/dpkg
diff --git a/debian/dpkg.links b/debian/dpkg.links
new file mode 100644
index 0000000..429ab15
--- /dev/null
+++ b/debian/dpkg.links
@@ -0,0 +1,3 @@
+usr/bin/dpkg-divert usr/sbin/dpkg-divert
+usr/bin/dpkg-statoverride usr/sbin/dpkg-statoverride
+usr/bin/update-alternatives usr/sbin/update-alternatives
diff --git a/debian/rules b/debian/rules
index 8b01638..ffe9018 100755
--- a/debian/rules
+++ b/debian/rules
@@ -91,6 +91,7 @@ binary-arch: install
dh_installchangelogs -a ChangeLog
dh_installdocs -a
+ dh_link -a
install -d debian/dpkg/usr/share/lintian/overrides
install -m 644 debian/dpkg.lintian-overrides \
@@ -116,6 +117,7 @@ binary-indep: install
dh_installchangelogs -i ChangeLog
dh_installdocs -i
+ dh_link -i
install -d debian/dpkg-dev/usr/share/lintian/overrides
install -m 644 debian/dpkg-dev.lintian-overrides \
diff --git a/scripts/Makefile.am b/scripts/Makefile.am
index b0a2118..bbc6970 100644
--- a/scripts/Makefile.am
+++ b/scripts/Makefile.am
@@ -8,6 +8,7 @@ bin_SCRIPTS = \
dpkg-buildpackage \
dpkg-checkbuilddeps \
dpkg-distaddfile \
+ dpkg-divert \
dpkg-genchanges \
dpkg-gencontrol \
dpkg-gensymbols \
@@ -16,14 +17,13 @@ bin_SCRIPTS = \
dpkg-scanpackages \
dpkg-scansources \
dpkg-shlibdeps \
- dpkg-source
-
-sbin_SCRIPTS = \
- cleanup-info \
- dpkg-divert \
dpkg-statoverride \
+ dpkg-source \
update-alternatives
+sbin_SCRIPTS = \
+ cleanup-info
+
changelogdir = $(pkglibdir)/parsechangelog
changelog_SCRIPTS = \
changelog/debian
--
dpkg's main repository
--
To UNSUBSCRIBE, email to debian-dpkg-cvs-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
