[SCM] Debian packaging of wesnoth branch, devel, updated. debian/1.9.3-1-10-gd1429d8

[Gerfried Fuchs]

The following commit has been merged in the devel branch:
commit 36e03dbcc1bd25e2fb9d8385eb03046a49f176a6
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Tue Apr 12 21:11:42 2011 +0200

    Further final cmake tweaks

diff --git a/debian/changelog b/debian/changelog
index 3de3165..552bc81 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,8 @@ wesnoth-1.9 (1:1.9.5-1) unstable; urgency=low
   * New upstream devel release.
   * New wesnoth-data directory to install: data/core/encyclopedia.
   * Replace Build-Depends on automake with cmake, building with autotools got
-    removed upstream. Adjusted debian/rules accordingly.
+    removed upstream. Adjusted debian/rules accordingly, also some debhelper
+    install files.
   * Bump Standards-Version to 3.9.2.
 
  -- 
diff --git a/debian/rules b/debian/rules
index a2c3225..74b6d3a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,7 +47,7 @@ BRANCH_VERSION = $(STRIP_MAJOR).$(MINOR_VERSION)
 
 CONFIGURE_SWITCHES = --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --disable-strict-compilation --disable-maintainer-mode --disable-rpath --prefix=/usr --mandir=\$${prefix}/share/man --bindir=\$${prefix}/games --with-datadir-name=wesnoth/$(BRANCH_VERSION) --with-localedir=\$${prefix}/share/games/wesnoth/$(BRANCH_VERSION)/locale --with-fifodir=/var/run/wesnothd --datadir=\$${prefix}/share/games --enable-server --with-fribidi --enable-python-install
 
-CMAKE_SWITCHES = -DBINARY_SUFFIX="-$(BRANCH_VERSION)" -DCMAKE_INSTALL_PREFIX="/usr/" -DBINDIR="/usr/games" -DDATAROOTDIR="/usr/share/games" -DDATADIRNAME="wesnoth/$(BRANCH_VERSION)" -DDESKTOPDIR="/usr/share/applications" -DDOCDIR="/usr/share/doc/wesnoth-$(BRANCH_VERSION)-data" -DLOCALEDIR="wesnoth/$(BRANCH_VERSION)/locale" -DMANDIR="/usr/share/man"
+CMAKE_SWITCHES = -DBINARY_SUFFIX="-$(BRANCH_VERSION)" -DCMAKE_INSTALL_PREFIX="/usr/" -DBINDIR="/usr/games" -DDATAROOTDIR="/usr/share/games" -DDATADIRNAME="wesnoth/$(BRANCH_VERSION)" -DDESKTOPDIR="/usr/share/applications" -DDOCDIR="/usr/share/doc/wesnoth-$(BRANCH_VERSION)-data" -DLOCALEDIR="locale" -DMANDIR="/usr/share/man"
 
 
 clean:
@@ -55,7 +55,7 @@ clean:
 	dh_testroot
 	rm -f debian/stamp-*
 	# Add here commands to clean up after the build process.
-	rm -rf build
+	rm -rf build locale # locale doesn't get generated inside build ...
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean
 
@@ -177,12 +177,6 @@ binary-arch: install
 		mv $$i $$(echo $$i | sed -e 's/wesnothd\.6/wesnothd-$(BRANCH_VERSION).6/'); \
 		done
 
-	# move binaries to their proper name
-	mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth \
-		debian/wesnoth-$(BRANCH_VERSION)-core/usr/games/wesnoth-$(BRANCH_VERSION)
-	mv debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd \
-		debian/wesnoth-$(BRANCH_VERSION)-server/usr/games/wesnothd-$(BRANCH_VERSION)
-
 	# move the desktop files to their proper name
 	mv debian/wesnoth-$(BRANCH_VERSION)-core/usr/share/applications/wesnoth.desktop \
 		debian/wesnoth-$(BRANCH_VERSION)-core/usr/share/applications/wesnoth-$(BRANCH_VERSION).desktop
diff --git a/debian/wesnoth-1.9-core.install b/debian/wesnoth-1.9-core.install
index 1136bea..80663ec 100644
--- a/debian/wesnoth-1.9-core.install
+++ b/debian/wesnoth-1.9-core.install
@@ -1,4 +1,4 @@
-debian/tmp/usr/games/wesnoth
+debian/tmp/usr/games/wesnoth-1.9
 debian/wesnoth-1.9-smallgui /usr/games
 debian/wesnoth-1.9-nolog /usr/games
 debian/wesnoth-1.9_editor /usr/games
diff --git a/debian/wesnoth-1.9-server.install b/debian/wesnoth-1.9-server.install
index f4bf36c..b836804 100644
--- a/debian/wesnoth-1.9-server.install
+++ b/debian/wesnoth-1.9-server.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/games/wesnothd
+debian/tmp/usr/games/wesnothd-1.9
 debian/tmp/usr/share/man/man6/wesnothd.6
 debian/tmp/usr/share/man/*/man6/wesnothd.6
diff --git a/debian/wesnoth-BRANCH-core.install.in b/debian/wesnoth-BRANCH-core.install.in
index 0516187..4660ec2 100644
--- a/debian/wesnoth-BRANCH-core.install.in
+++ b/debian/wesnoth-BRANCH-core.install.in
@@ -1,4 +1,4 @@
-debian/tmp/usr/games/wesnoth
+debian/tmp/usr/games/wesnoth-BRANCH
 debian/wesnoth-BRANCH-smallgui /usr/games
 debian/wesnoth-BRANCH-nolog /usr/games
 debian/wesnoth-BRANCH_editor /usr/games
diff --git a/debian/wesnoth-BRANCH-server.install.in b/debian/wesnoth-BRANCH-server.install.in
index f4bf36c..b836804 100644
--- a/debian/wesnoth-BRANCH-server.install.in
+++ b/debian/wesnoth-BRANCH-server.install.in
@@ -1,3 +1,3 @@
-debian/tmp/usr/games/wesnothd
+debian/tmp/usr/games/wesnothd-1.9
 debian/tmp/usr/share/man/man6/wesnothd.6
 debian/tmp/usr/share/man/*/man6/wesnothd.6

-- 
Debian packaging of wesnoth