debian/changelog | 9 +++++++++
debian/rules | 26 ++++++++++++--------------
2 files changed, 21 insertions(+), 14 deletions(-)
New commits:
commit 78abf4acc8963b2c055b3780f6a3a1ea0b8a2181
Author: Christopher James Halse Rogers <christopher.halse.rog...@canonical.com>
Date: Tue Jul 19 17:37:01 2011 +1000
Drop manual doc directory symlinking.
It's a bit dangerous, and it's caused LP #812665. We can let
pkgbinarymangler handle this for us now.
diff --git a/debian/changelog b/debian/changelog
index e12b0c3..9562104 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+xorg (1:7.6+7ubuntu3) oneiric; urgency=low
+
+ * debian/rules:
+ - Reverse the symlinking of /usr/share/doc directories to x11-common.
+ This should now be handled automatically by pkgbinarymangler, and the
+ directory symlink now causes file conflicts. (LP: #812665)
+
+ -- Christopher James Halse Rogers <r...@ubuntu.com> Tue, 19 Jul 2011
17:32:01 +1000
+
xorg (1:7.6+7ubuntu2) oneiric; urgency=low
* debian/local/Xsession.d/60x11-common_xdg_path: Add session script to
diff --git a/debian/rules b/debian/rules
index 5304491..44aba1c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -78,14 +78,13 @@ binary-indep: build install
dh_lintian
dh_link
dh_compress
- t=x11-common; \
- for p in $$(dh_listpackages -i -N$$t); do \
- rm -rf debian/$$p/usr/share/doc/$$p; \
- ln -s $$t debian/$$p/usr/share/doc/$$p; \
+ set -e ;\
+ for p in $$(dh_listpackages -i); do \
( \
- echo "# doc dir is now a symlink to $$p"; \
- echo 'if [ "$$1" = upgrade ] && [ ! -L /usr/share/doc/'$$p' ];
then'; \
- echo " rm -rf /usr/share/doc/$$p"; \
+ echo "# Undo doc-dir symlinking. Leave this to pkgbinarymangler"; \
+ echo "# This can be removed after the next LTS" ; \
+ echo 'if [ "$$1" = upgrade ] && [ -L /usr/share/doc/'$$p' ]; then';
\
+ echo " rm -f /usr/share/doc/$$p"; \
echo "fi"; \
) >> debian/$$p.preinst.debhelper; \
done
@@ -121,14 +120,13 @@ endif
dh_link
dh_strip
dh_compress
- t=x11-common; \
- for p in $$(dh_listpackages -s -N$$t); do \
- rm -rf debian/$$p/usr/share/doc/$$p; \
- ln -s $$t debian/$$p/usr/share/doc/$$p; \
+ set -e ;\
+ for p in $$(dh_listpackages -a); do \
( \
- echo "# doc dir is now a symlink to $$p"; \
- echo 'if [ "$$1" = upgrade ] && [ ! -L /usr/share/doc/'$$p' ];
then'; \
- echo " rm -rf /usr/share/doc/$$p"; \
+ echo "# Undo doc-dir symlinking. Leave this to pkgbinarymangler.";
\
+ echo "# This can be removed after the next LTS" ; \
+ echo 'if [ "$$1" = upgrade ] && [ -L /usr/share/doc/'$$p' ]; then';
\
+ echo " rm -f /usr/share/doc/$$p"; \
echo "fi"; \
) >> debian/$$p.preinst.debhelper; \
done
--
To UNSUBSCRIBE, email to debian-x-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
Archive: http://lists.debian.org/e1qjlpx-00044c...@vasks.debian.org
