[Date Prev][Date Next] [Thread Prev][Thread Next] [Date Index] [Thread Index]

Bug#694038: unblock: wesnoth-1.10/1:1.10.3-3



Package: release.debian.org
Severity: normal
User: release.debian.org@packages.debian.org
Usertags: unblock

Please unblock package wesnoth-1.10

This fixes RC bug #688712 by reverting /usr/share/doc/{wesnoth,wesnoth-core,
wesnoth-music} back into symlinks as they were in previous versions (in squeeze),
and includes postinst scripts to do this manually for users who already have
the wheezy version installed (since apparently dpkg doesn't replace symlinks
with directories and vice versa itself).

debdiff is as follows:

diff -Nru wesnoth-1.10-1.10.3/debian/changelog wesnoth-1.10-1.10.3/debian/changelog
--- wesnoth-1.10-1.10.3/debian/changelog	2012-09-02 04:11:53.000000000 -0700
+++ wesnoth-1.10-1.10.3/debian/changelog	2012-11-22 00:06:08.000000000 -0800
@@ -1,3 +1,10 @@
+wesnoth-1.10 (1:1.10.3-3) unstable; urgency=low
+
+  * Team upload.
+  * Revert /usr/share/doc/wesnoth back into a symlink. (Closes: #688712)
+
+ -- Vincent Cheng <Vincentc1208@gmail.com>  Wed, 21 Nov 2012 23:55:27 -0800
+
 wesnoth-1.10 (1:1.10.3-2) unstable; urgency=low
 
   [ Vincent Cheng ]
diff -Nru wesnoth-1.10-1.10.3/debian/rules wesnoth-1.10-1.10.3/debian/rules
--- wesnoth-1.10-1.10.3/debian/rules	2012-09-02 04:04:18.000000000 -0700
+++ wesnoth-1.10-1.10.3/debian/rules	2012-11-18 23:57:27.000000000 -0800
@@ -144,7 +144,7 @@
 		debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/hicolor/64x64/apps/wesnoth-$(BRANCH_VERSION)_editor-icon.png
 
 	# /usr/share/doc symlinks
-	for i in wesnoth-$(BRANCH_VERSION); do \
+	for i in wesnoth wesnoth-core wesnoth-music wesnoth-$(BRANCH_VERSION); do \
 		install -p -d -m755 debian/$$i/usr/share/doc; \
 		ln -s wesnoth-$(BRANCH_VERSION)-data debian/$$i/usr/share/doc/$$i; \
 		done
diff -Nru wesnoth-1.10-1.10.3/debian/wesnoth-core.postinst wesnoth-1.10-1.10.3/debian/wesnoth-core.postinst
--- wesnoth-1.10-1.10.3/debian/wesnoth-core.postinst	1969-12-31 16:00:00.000000000 -0800
+++ wesnoth-1.10-1.10.3/debian/wesnoth-core.postinst	2012-11-18 23:58:37.000000000 -0800
@@ -0,0 +1,17 @@
+#!/bin/sh
+# postinst script for wesnoth-core
+set -e
+
+if dpkg --compare-versions "$2" lt-nl 1:1.10.3-3; then
+	# Replace directory with symlink. See BTS #688712
+	if [ ! -L /usr/share/doc/wesnoth-core ] && \
+	   [ -d /usr/share/doc/wesnoth-core ]; then
+		if rmdir /usr/share/doc/wesnoth-core 2>/dev/null; then
+			ln -sf wesnoth-1.10-data /usr/share/doc/wesnoth-core
+		fi
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru wesnoth-1.10-1.10.3/debian/wesnoth-core.postinst.in wesnoth-1.10-1.10.3/debian/wesnoth-core.postinst.in
--- wesnoth-1.10-1.10.3/debian/wesnoth-core.postinst.in	1969-12-31 16:00:00.000000000 -0800
+++ wesnoth-1.10-1.10.3/debian/wesnoth-core.postinst.in	2012-11-18 23:58:50.000000000 -0800
@@ -0,0 +1,17 @@
+#!/bin/sh
+# postinst script for wesnoth-core
+set -e
+
+if dpkg --compare-versions "$2" lt-nl 1:1.10.3-3; then
+	# Replace directory with symlink. See BTS #688712
+	if [ ! -L /usr/share/doc/wesnoth-core ] && \
+	   [ -d /usr/share/doc/wesnoth-core ]; then
+		if rmdir /usr/share/doc/wesnoth-core 2>/dev/null; then
+			ln -sf wesnoth-BRANCH-data /usr/share/doc/wesnoth-core
+		fi
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru wesnoth-1.10-1.10.3/debian/wesnoth-music.postinst wesnoth-1.10-1.10.3/debian/wesnoth-music.postinst
--- wesnoth-1.10-1.10.3/debian/wesnoth-music.postinst	1969-12-31 16:00:00.000000000 -0800
+++ wesnoth-1.10-1.10.3/debian/wesnoth-music.postinst	2012-11-18 23:56:25.000000000 -0800
@@ -0,0 +1,17 @@
+#!/bin/sh
+# postinst script for wesnoth-music
+set -e
+
+if dpkg --compare-versions "$2" lt-nl 1:1.10.3-3; then
+	# Replace directory with symlink. See BTS #688712
+	if [ ! -L /usr/share/doc/wesnoth-music ] && \
+	   [ -d /usr/share/doc/wesnoth-music ]; then
+		if rmdir /usr/share/doc/wesnoth-music 2>/dev/null; then
+			ln -sf wesnoth-1.10-data /usr/share/doc/wesnoth-music
+		fi
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru wesnoth-1.10-1.10.3/debian/wesnoth-music.postinst.in wesnoth-1.10-1.10.3/debian/wesnoth-music.postinst.in
--- wesnoth-1.10-1.10.3/debian/wesnoth-music.postinst.in	1969-12-31 16:00:00.000000000 -0800
+++ wesnoth-1.10-1.10.3/debian/wesnoth-music.postinst.in	2012-11-18 23:52:11.000000000 -0800
@@ -0,0 +1,17 @@
+#!/bin/sh
+# postinst script for wesnoth-music
+set -e
+
+if dpkg --compare-versions "$2" lt-nl 1:1.10.3-3; then
+	# Replace directory with symlink. See BTS #688712
+	if [ ! -L /usr/share/doc/wesnoth-music ] && \
+	   [ -d /usr/share/doc/wesnoth-music ]; then
+		if rmdir /usr/share/doc/wesnoth-music 2>/dev/null; then
+			ln -sf wesnoth-BRANCH-data /usr/share/doc/wesnoth-music
+		fi
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru wesnoth-1.10-1.10.3/debian/wesnoth.postinst wesnoth-1.10-1.10.3/debian/wesnoth.postinst
--- wesnoth-1.10-1.10.3/debian/wesnoth.postinst	1969-12-31 16:00:00.000000000 -0800
+++ wesnoth-1.10-1.10.3/debian/wesnoth.postinst	2012-11-18 23:50:49.000000000 -0800
@@ -0,0 +1,17 @@
+#!/bin/sh
+# postinst script for wesnoth
+set -e
+
+if dpkg --compare-versions "$2" lt-nl 1:1.10.3-3; then
+	# Replace directory with symlink. See BTS #688712
+	if [ ! -L /usr/share/doc/wesnoth ] && \
+	   [ -d /usr/share/doc/wesnoth ]; then
+		if rmdir /usr/share/doc/wesnoth 2>/dev/null; then
+			ln -sf wesnoth-1.10-data /usr/share/doc/wesnoth
+		fi
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0
diff -Nru wesnoth-1.10-1.10.3/debian/wesnoth.postinst.in wesnoth-1.10-1.10.3/debian/wesnoth.postinst.in
--- wesnoth-1.10-1.10.3/debian/wesnoth.postinst.in	1969-12-31 16:00:00.000000000 -0800
+++ wesnoth-1.10-1.10.3/debian/wesnoth.postinst.in	2012-11-18 23:50:49.000000000 -0800
@@ -0,0 +1,17 @@
+#!/bin/sh
+# postinst script for wesnoth
+set -e
+
+if dpkg --compare-versions "$2" lt-nl 1:1.10.3-3; then
+	# Replace directory with symlink. See BTS #688712
+	if [ ! -L /usr/share/doc/wesnoth ] && \
+	   [ -d /usr/share/doc/wesnoth ]; then
+		if rmdir /usr/share/doc/wesnoth 2>/dev/null; then
+			ln -sf wesnoth-BRANCH-data /usr/share/doc/wesnoth
+		fi
+	fi
+fi
+
+#DEBHELPER#
+
+exit 0

unblock wesnoth-1.10/1:1.10.3-3

-- System Information:
Debian Release: wheezy/sid
  APT prefers testing
  APT policy: (700, 'testing'), (500, 'unstable'), (200, 'experimental')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.6.5-1-vclaptop-amd64 (SMP w/8 CPU cores; PREEMPT)
Locale: LANG=en_CA.utf8, LC_CTYPE=en_CA.utf8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash


Reply to: