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

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit 47517c4297b2360ca63f01a0ec3bf048f2cd39a0
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Fri Jul 16 08:20:25 2010 +0200

    Add wesnoth and wesnoth-core meta packages

diff --git a/debian/changelog b/debian/changelog
index 3df62c5..a9590a6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,8 @@ wesnoth-1.8 (1:1.8.3-2) unstable; urgency=low
     priority)
   * Use alternative handling and dpkg-divert for wesnoth binaries and
     manpages.
+  * Add wesnoth and wesnoth-core meta packages depending on the corresponding
+    branch package.
 
  -- 
 
diff --git a/debian/control b/debian/control
index 87b239f..dd4f2e2 100644
--- a/debian/control
+++ b/debian/control
@@ -44,6 +44,19 @@ Description: fantasy turn-based strategy game (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-core
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${binary:Version})
+Suggests: wesnoth
+Description: fantasy turn-based strategy game (meta package)
+ This meta package pulls in the core wesnoth package which allows you to play
+ using the latest stable version.
+ .
+ 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
@@ -86,7 +99,22 @@ Description: fantasy turn-based strategy game - complete suite (branch 1.8)
  want to have all the official campaigns installed.  If you only want to play
  over the network with other players or want to play only a few campaigns you
  just need to install the wesnoth-1.8-core package and
- the corresponding campaign packages.
+ the wanted campaign packages.
+ .
+ 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})
+Description: fantasy turn-based strategy game - complete suite (meta package)
+ This meta package pulls in the complete set of the latest stable version, most
+ helpful if you always want to have all the official campaigns installed. If
+ you only want to play over the network with other players or want to play only
+ a few campaigns you just need to install the wesnoth-core package and the
+ wanted campaign packages.
  .
  Battle for control of villages, using variety of units which have advantages
  and disadvantages in different types of terrains and against different types
diff --git a/debian/control.in b/debian/control.in
index 9ebdf77..5f4557a 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -44,6 +44,19 @@ Description: fantasy turn-based strategy game (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-core
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-BRANCH-core (>= ${binary:Version})
+Suggests: wesnoth
+Description: fantasy turn-based strategy game (meta package)
+ This meta package pulls in the core wesnoth package which allows you to play
+ using the latest stable version.
+ .
+ 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
@@ -93,6 +106,21 @@ 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
+Architecture: all
+Depends: ${misc:Depends}, wesnoth-BRANCH (>= ${binary:Version})
+Description: fantasy turn-based strategy game - complete suite (meta package)
+ This meta package pulls in the complete set of the latest stable version, most
+ helpful if you always want to have all the official campaigns installed. If
+ you only want to play over the network with other players or want to play only
+ a few campaigns you just need to install the wesnoth-core package and the
+ wanted campaign packages.
+ .
+ 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-music
 Architecture: all
 Depends: ${misc:Depends}
diff --git a/debian/rules b/debian/rules
index 637231f..c673931 100755
--- a/debian/rules
+++ b/debian/rules
@@ -147,7 +147,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); do \
+	for i in wesnoth-$(BRANCH_VERSION) wesnoth wesnoth-core; do \
 		install -p -d -m755 debian/$$i/usr/share/doc; \
 		ln -s wesnoth-$(BRANCH_VERSION)-data debian/$$i/usr/share/doc/$$i; \
 		done

-- 
Debian packaging of wesnoth