r6704 - packages/trunk/wesnoth/debian

Mon Apr 21 16:42:25 UTC 2008

Author: alfie
Date: 2008-04-21 16:42:25 +0000 (Mon, 21 Apr 2008)
New Revision: 6704

Added:
   packages/trunk/wesnoth/debian/NEWS
Removed:
   packages/trunk/wesnoth/debian/NEWS.Debian
Modified:
   packages/trunk/wesnoth/debian/changelog
   packages/trunk/wesnoth/debian/control
   packages/trunk/wesnoth/debian/wesnoth-all.postinst
   packages/trunk/wesnoth/debian/wesnoth-editor.postinst
   packages/trunk/wesnoth/debian/wesnoth.postinst
Log:
 * Do postinst hooks only on upgrades from older versions than 1:1.4.1-2, also check wether it might be a symlink already and ignore rmdir error message.
 * Switch ttf-sazanami-gothic and ttf-wqy-zenhei to recommends instead of only suggests.
 * Rename debian/NEWS.Debian to debian/NEWS which dh_installchangelogs likes to pick up and install as NEWS.Debian...


Copied: packages/trunk/wesnoth/debian/NEWS (from rev 6699, packages/trunk/wesnoth/debian/NEWS.Debian)
===================================================================

--- packages/trunk/wesnoth/debian/NEWS	                        (rev 0)
+++ packages/trunk/wesnoth/debian/NEWS	2008-04-21 16:42:25 UTC (rev 6704)
@@ -0,0 +1,16 @@
+wesnoth (1:1.4-1) unstable; urgency=low
+
+  * Please be aware what a new stable upstream release of wesnoth means for
+    your save games: You won't be able to continue playing from them. The
+    reasons for those are several, not limited to these two bigger points:
+    - Most of all, balancing changes: Units might have different
+      characteristics and thus fights would end differently.
+    - Most obvious, changes in the campaigns themself. A unit you kept from a
+      former scenario might not be in the campaign anymore, or a whole
+      scenario might have been added or removed somewhere in between. Map
+      changes also affect multiplayer games.
+    Again: You won't be able to continue from your old save games with a new
+    stable upstream release like it happened with this update from the former
+    stable release 1.2 to this new one 1.4.
+
+ -- Gerfried Fuchs <rhonda at debian.at>  Wed, 02 Apr 2008 16:14:20 +0200

Deleted: packages/trunk/wesnoth/debian/NEWS.Debian
===================================================================
--- packages/trunk/wesnoth/debian/NEWS.Debian	2008-04-21 16:27:13 UTC (rev 6703)
+++ packages/trunk/wesnoth/debian/NEWS.Debian	2008-04-21 16:42:25 UTC (rev 6704)
@@ -1,16 +0,0 @@
-wesnoth (1:1.4-1) unstable; urgency=low
-
-  * Please be aware what a new stable upstream release of wesnoth means for
-    your save games: You won't be able to continue playing from them. The
-    reasons for those are several, not limited to these two bigger points:
-    - Most of all, balancing changes: Units might have different
-      characteristics and thus fights would end differently.
-    - Most obvious, changes in the campaigns themself. A unit you kept from a
-      former scenario might not be in the campaign anymore, or a whole
-      scenario might have been added or removed somewhere in between. Map
-      changes also affect multiplayer games.
-    Again: You won't be able to continue from your old save games with a new
-    stable upstream release like it happened with this update from the former
-    stable release 1.2 to this new one 1.4.
-
- -- Gerfried Fuchs <rhonda at debian.at>  Wed, 02 Apr 2008 16:14:20 +0200

Modified: packages/trunk/wesnoth/debian/changelog
===================================================================
--- packages/trunk/wesnoth/debian/changelog	2008-04-21 16:27:13 UTC (rev 6703)
+++ packages/trunk/wesnoth/debian/changelog	2008-04-21 16:42:25 UTC (rev 6704)
@@ -1,3 +1,15 @@
+wesnoth (1:1.4.1-3) unstable; urgency=low
+
+  * Do postinst hooks only on upgrades from older versions than 1:1.4.1-2,
+    also check wether it might be a symlink already and ignore rmdir error
+    message.
+  * Switch ttf-sazanami-gothic and ttf-wqy-zenhei to recommends instead of
+    only suggests.
+  * Rename debian/NEWS.Debian to debian/NEWS which dh_installchangelogs likes
+    to pick up and install as NEWS.Debian...
+
+ -- Gerfried Fuchs <rhonda at debian.at>  Mon, 21 Apr 2008 18:42:21 +0200
+
 wesnoth (1:1.4.1-2) unstable; urgency=low
 
   * Create postinst hooks to change the (hopefully) empty doc dirs of wesnoth,

Modified: packages/trunk/wesnoth/debian/control
===================================================================
--- packages/trunk/wesnoth/debian/control	2008-04-21 16:27:13 UTC (rev 6703)
+++ packages/trunk/wesnoth/debian/control	2008-04-21 16:42:25 UTC (rev 6704)
@@ -15,8 +15,7 @@
 Package: wesnoth-data
 Architecture: all
 Depends: ttf-dejavu
-Recommends: wesnoth-music
-Suggests: ttf-sazanami-gothic, ttf-wqy-zenhei
+Recommends: wesnoth-music, ttf-sazanami-gothic, ttf-wqy-zenhei
 Description: data files for Wesnoth
  This package contains the sound files and graphics for Wesnoth. It is required
  for being able to play wesnoth or create maps with the editor.

Modified: packages/trunk/wesnoth/debian/wesnoth-all.postinst
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-all.postinst	2008-04-21 16:27:13 UTC (rev 6703)
+++ packages/trunk/wesnoth/debian/wesnoth-all.postinst	2008-04-21 16:42:25 UTC (rev 6704)
@@ -3,9 +3,15 @@
 # copyright 2008 by Gerfried Fuchs <rhonda at debian.at>
 # Licenced the same way as wesnoth itself
 
-if [ "$1" = configure ] && [ -d /usr/share/doc/wesnoth-all ] \
-	&& rmdir /usr/share/doc/wesnoth-all ; then
+action=$1
+version=$2
 
+if dpkg --compare-versions "$version" lt-nl 1:1.4.1-2 \
+	&& [ "$1" = configure ] \
+	&& [ ! -L /usr/share/doc/wesnoth-all ] \
+	&& [ -d /usr/share/doc/wesnoth-all ] \
+	&& rmdir /usr/share/doc/wesnoth-all 2>/dev/null ; then
+
 	ln -s wesnoth-data /usr/share/doc/wesnoth-all
 fi
 

Modified: packages/trunk/wesnoth/debian/wesnoth-editor.postinst
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth-editor.postinst	2008-04-21 16:27:13 UTC (rev 6703)
+++ packages/trunk/wesnoth/debian/wesnoth-editor.postinst	2008-04-21 16:42:25 UTC (rev 6704)
@@ -3,8 +3,11 @@
 # copyright 2008 by Gerfried Fuchs <rhonda at debian.at>
 # Licenced the same way as wesnoth itself
 
-if [ "$1" = configure ] && [ -d /usr/share/doc/wesnoth-editor ] \
-	&& rmdir /usr/share/doc/wesnoth-editor ; then
+if dpkg --compare-versions "$version" lt-nl 1:1.4.1-2 \
+	&& [ "$1" = configure ] \
+	&& [ ! -L /usr/share/doc/wesnoth-editor ] \
+	&& [ -d /usr/share/doc/wesnoth-editor ] \
+	&& rmdir /usr/share/doc/wesnoth-editor 2>/dev/null ; then
 
 	ln -s wesnoth-data /usr/share/doc/wesnoth-editor
 fi

Modified: packages/trunk/wesnoth/debian/wesnoth.postinst
===================================================================
--- packages/trunk/wesnoth/debian/wesnoth.postinst	2008-04-21 16:27:13 UTC (rev 6703)
+++ packages/trunk/wesnoth/debian/wesnoth.postinst	2008-04-21 16:42:25 UTC (rev 6704)
@@ -3,8 +3,11 @@
 # copyright 2008 by Gerfried Fuchs <rhonda at debian.at>
 # Licenced the same way as wesnoth itself
 
-if [ "$1" = configure ] && [ -d /usr/share/doc/wesnoth ] \
-	&& rmdir /usr/share/doc/wesnoth ; then
+if dpkg --compare-versions "$version" lt-nl 1:1.4.1-2 \
+	&& [ "$1" = configure ] \
+	&& [ ! -L /usr/share/doc/wesnoth ] \
+	&& [ -d /usr/share/doc/wesnoth ] \
+	&& rmdir /usr/share/doc/wesnoth 2>/dev/null ; then
 
 	ln -s wesnoth-data /usr/share/doc/wesnoth
 fi


