[SCM] Debian packaging of wesnoth branch, master, updated. debian/1.8.3-2-7-g41bd419

[Gerfried Fuchs]

The following commit has been merged in the master branch:
commit e36c62257e4f5d9efe8bf47268bd75754c6a8b30
Author: Gerfried Fuchs <rhonda at debian.at>
Date:   Sun Aug 15 21:39:41 2010 +0200

    Directly depend on wesnoth-1.8-core from metas

diff --git a/debian/changelog b/debian/changelog
index 504639c..598aaff 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+wesnoth-1.8 (1:1.8.3-3) unstable; urgency=low
+
+  * Make wesnoth and wesnoth-core packages directly depend on
+    wesnoth-1.8-core.
+
+ -- 
+
 wesnoth-1.8 (1:1.8.3-2) unstable; urgency=low
 
   * Adjust LSB init.d headers to match runlinks.
diff --git a/debian/control b/debian/control
index dd4f2e2..8490e11 100644
--- a/debian/control
+++ b/debian/control
@@ -46,7 +46,8 @@ Description: fantasy turn-based strategy game (branch 1.8)
 
 Package: wesnoth-core
 Architecture: all
-Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${binary:Version})
+Depends: ${misc:Depends}, wesnoth-1.8-core (>= ${binary:Version}),
+  wesnoth-1.8-data (= ${source: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
@@ -108,7 +109,8 @@ Description: fantasy turn-based strategy game - complete suite (branch 1.8)
 
 Package: wesnoth
 Architecture: all
-Depends: ${misc:Depends}, wesnoth-1.8 (>= ${binary:Version})
+Depends: ${misc:Depends}, wesnoth-1.8 (>= ${binary:Version}),
+  wesnoth-1.8-data (= ${source: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
diff --git a/debian/control.in b/debian/control.in
index 5f4557a..1586a70 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -7,7 +7,7 @@ Build-Depends: debhelper (>= 7), quilt, libsdl-image1.2-dev, libfreetype6-dev,
   libsdl-ttf2.0-dev (>= 2.0.8), python-support, libdbus-1-dev,
   libboost-iostreams-dev, libboost-test-dev, libboost-regex-dev,
   libboost-serialization-dev, libpango1.0-dev, automake, liblua5.1-0-dev
-Standards-Version: 3.8.4
+Standards-Version: 3.9.0
 Uploaders: Gerfried Fuchs <rhonda at debian.at>
 Homepage: http://wesnoth.org/
 Vcs-Git: git://git.debian.org/git/pkg-games/wesnoth.git
@@ -46,7 +46,8 @@ Description: fantasy turn-based strategy game (branch BRANCH)
 
 Package: wesnoth-core
 Architecture: all
-Depends: ${misc:Depends}, wesnoth-BRANCH-core (>= ${binary:Version})
+Depends: ${misc:Depends}, wesnoth-BRANCH-core (>= ${binary:Version}),
+  wesnoth-BRANCH-data (= ${source: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
@@ -99,7 +100,7 @@ Description: fantasy turn-based strategy game - complete suite (branch BRANCH)
  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-BRANCH-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
@@ -108,7 +109,8 @@ Description: fantasy turn-based strategy game - complete suite (branch BRANCH)
 
 Package: wesnoth
 Architecture: all
-Depends: ${misc:Depends}, wesnoth-BRANCH (>= ${binary:Version})
+Depends: ${misc:Depends}, wesnoth-BRANCH (>= ${binary:Version}),
+  wesnoth-1.8-data (= ${source: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

-- 
Debian packaging of wesnoth