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

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit f7555f6f9c2d7bc405326abdaa662b787a3f28c7
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Tue Aug 31 21:59:01 2010 +0200

    wesnoth-music metapackage for upgrades

diff --git a/debian/changelog b/debian/changelog
index 5f53185..65c667d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+wesnoth-1.8 (1:1.8.3-6) unstable; urgency=low
+
+  * Also create a wesnoth-music metapackage to ease upgrades (closes: #594317)
+
+ -- 
+
 wesnoth-1.8 (1:1.8.3-5) unstable; urgency=low
 
   * Brown paper bag release.
diff --git a/debian/control b/debian/control
index 8f1824f..6d2a972 100644
--- a/debian/control
+++ b/debian/control
@@ -135,6 +135,19 @@ Description: music files for Wesnoth (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-music
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-1.8-music (>= ${source:Version}),
+  wesnoth-1.8-data (= ${source:Version})
+Description: fantasy turn-based strategy game (metapackage)
+ This metapackage pulls in the music package for use with the latest stable
+ version of wesnoth.
+ .
+ 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-server
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base
diff --git a/debian/control.in b/debian/control.in
index 1f9c9f8..268b14a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -135,6 +135,19 @@ Description: music files for Wesnoth (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-music
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-BRANCH-music (>= ${source:Version}),
+  wesnoth-BRANCH-data (= ${source:Version})
+Description: fantasy turn-based strategy game (metapackage)
+ This metapackage pulls in the music package for use with the latest stable
+ version of wesnoth.
+ .
+ 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-server
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, lsb-base
diff --git a/debian/wesnoth-music.postinst b/debian/wesnoth-music.postinst
new file mode 100644
index 0000000..e5577a4
--- /dev/null
+++ b/debian/wesnoth-music.postinst
@@ -0,0 +1,20 @@
+#!/bin/sh
+# postinst script for wesnoth-music
+# copyright 2010 by Gerfried Fuchs <rhonda at debian.at>
+# Licenced under WTFPLv2
+
+set -e
+
+case "$1" in
+    configure|reconfigure)
+	if dpkg --compare-versions "$2" lt-nl "1:1.8.3-6"; then
+		if [ -d /usr/share/doc/wesnoth-music ]; then
+			if rmdir /usr/share/doc/wesnoth-music; then
+				ln -s wesnoth-1.8-data /usr/share/doc/wesnoth-music
+			fi
+		fi
+	fi
+    ;;
+esac
+
+#DEBHELPER#
diff --git a/debian/wesnoth-music.postinst.in b/debian/wesnoth-music.postinst.in
new file mode 100644
index 0000000..ea9368b
--- /dev/null
+++ b/debian/wesnoth-music.postinst.in
@@ -0,0 +1,20 @@
+#!/bin/sh
+# postinst script for wesnoth-music
+# copyright 2010 by Gerfried Fuchs <rhonda at debian.at>
+# Licenced under WTFPLv2
+
+set -e
+
+case "$1" in
+    configure|reconfigure)
+	if dpkg --compare-versions "$2" lt-nl "1:1.8.3-6"; then
+		if [ -d /usr/share/doc/wesnoth-music ]; then
+			if rmdir /usr/share/doc/wesnoth-music; then
+				ln -s wesnoth-BRANCH-data /usr/share/doc/wesnoth-music
+			fi
+		fi
+	fi
+    ;;
+esac
+
+#DEBHELPER#

-- 
Debian packaging of wesnoth