[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.8.3-4-1-ge83a2d5

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit e83a2d5d8ed0ce4b31e89bf4f1443620cb92422c
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Thu Aug 19 21:17:12 2010 +0200

    Fix wesnoth{,-core}.postinst properly

diff --git a/debian/changelog b/debian/changelog
index 0f434e2..d4914c7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,15 @@
+wesnoth-1.8 (1:1.8.3-5) unstable; urgency=low
+
+  * Brown paper bag release.
+  * When changing from directory to symlink in wesnoth and wesnoth-core do use
+    wesnoth-1.8-data, not the non-existing wesnoth-data one. Also remove the
+    now potential existing wrong symlink we might have introduced through -4
+    upgrades. Thanks to my proof reader Julien Cristau again.
+  * Also switch the version comparison to lt-nl instead of le-nl so that the
+    check won't trigger on reinstall, also noticed by Julien.
+
+ -- 
+
 wesnoth-1.8 (1:1.8.3-4) unstable; urgency=low
 
   * Ship default file for the server init script and adapt the init script to
diff --git a/debian/wesnoth-core.postinst b/debian/wesnoth-core.postinst
index dcaea5f..c0ea1b8 100644
--- a/debian/wesnoth-core.postinst
+++ b/debian/wesnoth-core.postinst
@@ -7,12 +7,16 @@ set -e
 
 case "$1" in
     configure|reconfigure)
-	if dpkg --compare-versions "$2" le-nl "1:1.8.3-4"; then
+	if dpkg --compare-versions "$2" lt-nl "1:1.8.3-4"; then
 		if [ -d /usr/share/doc/wesnoth-core ]; then
 			if rmdir /usr/share/doc/wesnoth-core; then
-				ln -s wesnoth-data /usr/share/doc/wesnoth-core
+				ln -s wesnoth-1.8-data /usr/share/doc/wesnoth-core
 			fi
 		fi
+	elif dpkg --compare-versions "$2" lt-nl "1:1.8.3-5"; then
+		if rm /usr/share/doc/wesnoth-core; then
+			ln -s wesnoth-1.8-data /usr/share/doc/wesnoth-core
+		fi
 	fi
     ;;
 esac
diff --git a/debian/wesnoth-core.postinst b/debian/wesnoth-core.postinst.in
similarity index 52%
copy from debian/wesnoth-core.postinst
copy to debian/wesnoth-core.postinst.in
index dcaea5f..06a5650 100644
--- a/debian/wesnoth-core.postinst
+++ b/debian/wesnoth-core.postinst.in
@@ -7,12 +7,16 @@ set -e
 
 case "$1" in
     configure|reconfigure)
-	if dpkg --compare-versions "$2" le-nl "1:1.8.3-4"; then
+	if dpkg --compare-versions "$2" lt-nl "1:1.8.3-4"; then
 		if [ -d /usr/share/doc/wesnoth-core ]; then
 			if rmdir /usr/share/doc/wesnoth-core; then
-				ln -s wesnoth-data /usr/share/doc/wesnoth-core
+				ln -s wesnoth-BRANCH-data /usr/share/doc/wesnoth-core
 			fi
 		fi
+	elif dpkg --compare-versions "$2" lt-nl "1:1.8.3-5"; then
+		if rm /usr/share/doc/wesnoth-core; then
+			ln -s wesnoth-BRANCH-data /usr/share/doc/wesnoth-core
+		fi
 	fi
     ;;
 esac
diff --git a/debian/wesnoth.postinst b/debian/wesnoth.postinst
index c589212..68b4f35 100644
--- a/debian/wesnoth.postinst
+++ b/debian/wesnoth.postinst
@@ -7,12 +7,16 @@ set -e
 
 case "$1" in
     configure|reconfigure)
-	if dpkg --compare-versions "$2" le-nl "1:1.8.3-4"; then
+	if dpkg --compare-versions "$2" lt-nl "1:1.8.3-4"; then
 		if [ -d /usr/share/doc/wesnoth ]; then
 			if rmdir /usr/share/doc/wesnoth; then
-				ln -s wesnoth-data /usr/share/doc/wesnoth
+				ln -s wesnoth-1.8-data /usr/share/doc/wesnoth
 			fi
 		fi
+	elif dpkg --compare-versions "$2" lt-nl "1:1.8.3-5"; then
+		if rm /usr/share/doc/wesnoth; then
+			ln -s wesnoth-1.8-data /usr/share/doc/wesnoth
+		fi
 	fi
     ;;
 esac
diff --git a/debian/wesnoth.postinst b/debian/wesnoth.postinst.in
similarity index 52%
copy from debian/wesnoth.postinst
copy to debian/wesnoth.postinst.in
index c589212..7d98b44 100644
--- a/debian/wesnoth.postinst
+++ b/debian/wesnoth.postinst.in
@@ -7,12 +7,16 @@ set -e
 
 case "$1" in
     configure|reconfigure)
-	if dpkg --compare-versions "$2" le-nl "1:1.8.3-4"; then
+	if dpkg --compare-versions "$2" lt-nl "1:1.8.3-4"; then
 		if [ -d /usr/share/doc/wesnoth ]; then
 			if rmdir /usr/share/doc/wesnoth; then
-				ln -s wesnoth-data /usr/share/doc/wesnoth
+				ln -s wesnoth-BRANCH-data /usr/share/doc/wesnoth
 			fi
 		fi
+	elif dpkg --compare-versions "$2" lt-nl "1:1.8.3-5"; then
+		if rm /usr/share/doc/wesnoth; then
+			ln -s wesnoth-BRANCH-data /usr/share/doc/wesnoth
+		fi
 	fi
     ;;
 esac

-- 
Debian packaging of wesnoth