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

[Gerfried Fuchs]

The following commit has been merged in the devel branch:
commit 81b5b92faebd667458fa51420933b2744ba510f7
Author: Gerfried Fuchs <rhonda at debian.org>
Date:   Thu Jan 27 10:47:39 2011 +0100

    adjust debian/rules for cmake

diff --git a/.gitignore b/.gitignore
index 4f49b90..f8978b4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -4,7 +4,7 @@
 /attic
 /autogen.sh
 /autom4te.cache
-/*-stamp
+/build
 /changelog
 /cmake
 /CMakeLists.txt
@@ -54,3 +54,4 @@
 /debian/*.substvars
 /debian/tmp/
 /debian/wesnoth-*/
+/debian/stamp-*
diff --git a/debian/changelog b/debian/changelog
index c2b2477..d1a02d3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ wesnoth-1.9 (1:1.9.4-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.
+    removed upstream. Adjusted debian/rules accordingly.
 
  -- 
 
diff --git a/debian/rules b/debian/rules
index dff30b2..a2c3225 100755
--- a/debian/rules
+++ b/debian/rules
@@ -47,48 +47,43 @@ 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"
+
 
 clean:
 	dh_testdir
 	dh_testroot
-	rm -f build-stamp
+	rm -f debian/stamp-*
 	# Add here commands to clean up after the build process.
-	[ ! -f Makefile ] || $(MAKE) distclean
-	rm -f aclocal.m4 config.h.in Makefile.in configure m4/Makefile.in \
-		po/Makefile.in doc/Makefile.in doc/man/Makefile.in \
-		doc/manual/Makefile.in src/Makefile.in icons/Makefile.in \
-		config/compile config/config.guess config/config.sub \
-		config/install-sh config/missing config/depcomp \
-		config/py-compile config.log src/lua/Makefile.in
-	find po -name "*.gmo" -exec rm -f {} \;
-	find po -name "stamp-po" -exec rm -f {} \;
-	rm -f config.sub config.guess
+	rm -rf build
 	$(MAKE) -f /usr/share/quilt/quilt.make unpatch
 	dh_clean
 
 
-configure: configure-stamp
-configure-stamp:
+configure: debian/stamp-configure
+debian/stamp-configure:
 	$(MAKE) -f /usr/share/quilt/quilt.make patch
-	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./autogen.sh $(CONFIGURE_SWITCHES)
-	CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CONFIGURE_SWITCHES)
+	mkdir -p build
+	cd build && \
+		cmake .. $(CMAKE_SWITCHES)
+	# CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" ./configure $(CONFIGURE_SWITCHES)
 	touch $@
 
 
-build: build-stamp
-build-stamp: configure-stamp
-	$(MAKE)
+build: debian/stamp-build
+debian/stamp-build: debian/stamp-configure
+	$(MAKE) -C build
 	touch $@
 
 
-install: install-stamp
-install-stamp: build
+install: debian/stamp-install
+debian/stamp-install: build
 	dh_testdir
 	dh_testroot
 	dh_prep
 	dh_installdirs
 
-	$(MAKE) DESTDIR=$(CURDIR)/debian/tmp install
+	$(MAKE) -C build DESTDIR=$(CURDIR)/debian/tmp install
 
 	cd $(CURDIR)/debian/tmp/usr/share/games/wesnoth/$(BRANCH_VERSION)/data/tools \
 		&& chmod +x extractbindings unit_tree/TeamColorizer \

-- 
Debian packaging of wesnoth