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

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit 23ce983891f85505cf757faa04f492af5a52e2bc
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Mon Sep 20 21:12:20 2010 +0200

    Add transitional packages for -all and -editor

diff --git a/debian/changelog b/debian/changelog
index 65c667d..d1b52c6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 wesnoth-1.8 (1:1.8.3-6) unstable; urgency=low
 
-  * Also create a wesnoth-music metapackage to ease upgrades (closes: #594317)
+  * Also create metapackages for wesnoth-music and transitional packages for
+    wesnoth-editor and wesnoth-all to ease upgrades (closes: #594317)
 
  -- 
 
diff --git a/debian/control b/debian/control
index b6b33f0..6e4f70f 100644
--- a/debian/control
+++ b/debian/control
@@ -58,6 +58,20 @@ Description: fantasy turn-based strategy game (metapackage)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
+Package: wesnoth-editor
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${binary:Version}),
+  wesnoth-1.8-data (= ${source:Version})
+Description: map editor for Wesnoth (transitional package)
+ This transitional package pulls in the core wesnoth package which now has an
+ included map editor.  There is no standalone version anymore.  You can safely
+ remove this package after the upgrade.
+ .
+ Battle for control of villages, using variety of units which have advantages
+ and disadvantages in different types of terrains and against different types
+ of attacks.  Units gain experience and advance levels, and are carried over
+ from one scenario to the next in a campaign.
+
 Package: wesnoth-1.8-dbg
 Section: debug
 Architecture: any
@@ -107,6 +121,20 @@ Description: fantasy turn-based strategy game - complete suite (branch 1.8)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
+Package: wesnoth-all
+Architecture: all
+Depends: ${misc:Depends}, wesnoth (= ${source:Version}),
+  wesnoth-1.8-data (= ${source:Version})
+Description: fantasy turn-based strategy game - complete suite (transitional package)
+ This transitional package depends on the wesnoth package which pulls in the
+ complete set of the latest stable version.  You can safely remove this
+ package after the upgrade.
+ .
+ Battle for control of villages, using variety of units which have advantages
+ and disadvantages in different types of terrains and against different types
+ of attacks.  Units gain experience and advance levels, and are carried over
+ from one scenario to the next in a campaign.
+
 Package: wesnoth
 Architecture: all
 Depends: ${misc:Depends}, wesnoth-1.8 (>= ${binary:Version}),
diff --git a/debian/control.in b/debian/control.in
index 05bee03..bd7e2d6 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -58,6 +58,20 @@ Description: fantasy turn-based strategy game (metapackage)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
+Package: wesnoth-editor
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-BRANCH-core (>= ${binary:Version}),
+  wesnoth-BRANCH-data (= ${source:Version})
+Description: map editor for Wesnoth (transitional package)
+ This transitional package pulls in the core wesnoth package which now has an
+ included map editor.  There is no standalone version anymore.  You can safely
+ remove this package after the upgrade.
+ .
+ Battle for control of villages, using variety of units which have advantages
+ and disadvantages in different types of terrains and against different types
+ of attacks.  Units gain experience and advance levels, and are carried over
+ from one scenario to the next in a campaign.
+
 Package: wesnoth-BRANCH-dbg
 Section: debug
 Architecture: any
@@ -107,6 +121,20 @@ Description: fantasy turn-based strategy game - complete suite (branch BRANCH)
  of attacks.  Units gain experience and advance levels, and are carried over
  from one scenario to the next in a campaign.
 
+Package: wesnoth-all
+Architecture: all
+Depends: ${misc:Depends}, wesnoth (= ${source:Version}),
+  wesnoth-BRANCH-data (= ${source:Version})
+Description: fantasy turn-based strategy game - complete suite (transitional package)
+ This transitional package depends on the wesnoth package which pulls in the
+ complete set of the latest stable version.  You can safely remove this
+ package after the upgrade.
+ .
+ Battle for control of villages, using variety of units which have advantages
+ and disadvantages in different types of terrains and against different types
+ of attacks.  Units gain experience and advance levels, and are carried over
+ from one scenario to the next in a campaign.
+
 Package: wesnoth
 Architecture: all
 Depends: ${misc:Depends}, wesnoth-BRANCH (>= ${binary:Version}),
diff --git a/debian/rules b/debian/rules
index 8ce8337..d0b7235 100755
--- a/debian/rules
+++ b/debian/rules
@@ -146,7 +146,7 @@ binary-indep: install
 		debian/wesnoth-$(BRANCH_VERSION)-data/usr/share/icons/wesnoth-$(BRANCH_VERSION)_editor-icon.png
 
 	# /usr/share/doc symlinks
-	for i in wesnoth-$(BRANCH_VERSION) wesnoth wesnoth-core; do \
+	for i in wesnoth-$(BRANCH_VERSION) wesnoth wesnoth-core wesnoth-music wesnoth-editor wesnoth-all; do \
 		install -p -d -m755 debian/$$i/usr/share/doc; \
 		ln -s wesnoth-$(BRANCH_VERSION)-data debian/$$i/usr/share/doc/$$i; \
 		done
diff --git a/debian/wesnoth-music.postinst b/debian/wesnoth-all.postinst
similarity index 60%
copy from debian/wesnoth-music.postinst
copy to debian/wesnoth-all.postinst
index c6999b0..6d87df9 100644
--- a/debian/wesnoth-music.postinst
+++ b/debian/wesnoth-all.postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for wesnoth-music
+# postinst script for wesnoth-all
 # copyright 2010 by Gerfried Fuchs <rhonda at debian.at>
 # Licenced under WTFPLv2
 
@@ -8,8 +8,8 @@ set -e
 case "$1" in
     configure|reconfigure)
 	if dpkg --compare-versions "$2" lt-nl "1:1.8.3-6"; then
-		if rmdir /usr/share/doc/wesnoth-music 2>/dev/null; then
-			ln -s wesnoth-1.8-data /usr/share/doc/wesnoth-music
+		if rmdir /usr/share/doc/wesnoth-all 2>/dev/null; then
+			ln -s wesnoth-1.8-data /usr/share/doc/wesnoth-all
 		fi
 	fi
     ;;
diff --git a/debian/wesnoth-music.postinst b/debian/wesnoth-all.postinst.in
similarity index 60%
copy from debian/wesnoth-music.postinst
copy to debian/wesnoth-all.postinst.in
index c6999b0..22d3564 100644
--- a/debian/wesnoth-music.postinst
+++ b/debian/wesnoth-all.postinst.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for wesnoth-music
+# postinst script for wesnoth-all
 # copyright 2010 by Gerfried Fuchs <rhonda at debian.at>
 # Licenced under WTFPLv2
 
@@ -8,8 +8,8 @@ set -e
 case "$1" in
     configure|reconfigure)
 	if dpkg --compare-versions "$2" lt-nl "1:1.8.3-6"; then
-		if rmdir /usr/share/doc/wesnoth-music 2>/dev/null; then
-			ln -s wesnoth-1.8-data /usr/share/doc/wesnoth-music
+		if rmdir /usr/share/doc/wesnoth-all 2>/dev/null; then
+			ln -s wesnoth-BRANCH-data /usr/share/doc/wesnoth-all
 		fi
 	fi
     ;;
diff --git a/debian/wesnoth-music.postinst b/debian/wesnoth-editor.postinst
similarity index 60%
copy from debian/wesnoth-music.postinst
copy to debian/wesnoth-editor.postinst
index c6999b0..9886fc3 100644
--- a/debian/wesnoth-music.postinst
+++ b/debian/wesnoth-editor.postinst
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for wesnoth-music
+# postinst script for wesnoth-editor
 # copyright 2010 by Gerfried Fuchs <rhonda at debian.at>
 # Licenced under WTFPLv2
 
@@ -8,8 +8,8 @@ set -e
 case "$1" in
     configure|reconfigure)
 	if dpkg --compare-versions "$2" lt-nl "1:1.8.3-6"; then
-		if rmdir /usr/share/doc/wesnoth-music 2>/dev/null; then
-			ln -s wesnoth-1.8-data /usr/share/doc/wesnoth-music
+		if rmdir /usr/share/doc/wesnoth-editor 2>/dev/null; then
+			ln -s wesnoth-1.8-data /usr/share/doc/wesnoth-editor
 		fi
 	fi
     ;;
diff --git a/debian/wesnoth-music.postinst b/debian/wesnoth-editor.postinst.in
similarity index 59%
copy from debian/wesnoth-music.postinst
copy to debian/wesnoth-editor.postinst.in
index c6999b0..c4af061 100644
--- a/debian/wesnoth-music.postinst
+++ b/debian/wesnoth-editor.postinst.in
@@ -1,5 +1,5 @@
 #!/bin/sh
-# postinst script for wesnoth-music
+# postinst script for wesnoth-editor
 # copyright 2010 by Gerfried Fuchs <rhonda at debian.at>
 # Licenced under WTFPLv2
 
@@ -8,8 +8,8 @@ set -e
 case "$1" in
     configure|reconfigure)
 	if dpkg --compare-versions "$2" lt-nl "1:1.8.3-6"; then
-		if rmdir /usr/share/doc/wesnoth-music 2>/dev/null; then
-			ln -s wesnoth-1.8-data /usr/share/doc/wesnoth-music
+		if rmdir /usr/share/doc/wesnoth-editor 2>/dev/null; then
+			ln -s wesnoth-BRANCH-data /usr/share/doc/wesnoth-editor
 		fi
 	fi
     ;;

-- 
Debian packaging of wesnoth