[SCM] WorldForge client entity library branch, master, updated. debian/1.3.19-1_RFS1-7-ga1227d4

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit 2f2c90d3c6af7e6cf0dc6ef80b598a37635d4402
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Sat Mar 3 12:56:54 2012 -0500

    converted to use the dh build sequencer (compat level 9)

diff --git a/debian/changelog b/debian/changelog
index a401922..ec98e1c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -9,6 +9,9 @@ eris (1.3.19-1) UNRELEASED; urgency=low
   * debian/control: added Vcs- fields
   * added symbols tracking
   * debian/copyright: converted to DEP-5 format, updated dates
+  * converted to use the dh build sequencer (compat level 9)
+    - made binary packages multi-arch
+    - regenerated autotools auxiliary files on build
 
  -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Sat, 03 Mar 2012 12:29:40 -0500
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+9
diff --git a/debian/control b/debian/control
index c6c5702..730a1d6 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Stephen M. Webb <stephen.webb at bregmasoft.ca>
-Build-Depends: cdbs,
-               debhelper (>= 5),
+Build-Depends: debhelper (>= 9),
+               dh-autoreconf,
                doxygen,
                libatlas-cpp-0.6-dev (>= 0.6.2),
                libglib2.0-dev,
@@ -20,6 +20,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/eris.git
 
 Package: liberis-1.3-19
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: WorldForge client entity library
  Eris is designed to simplify client development (and avoid repeating the
@@ -48,6 +50,7 @@ Description: WorldForge client entity library
 Package: liberis-1.3-dev
 Section: libdevel
 Architecture: any
+Pre-Depends: ${misc:Pre-Depends}
 Depends: libatlas-cpp-0.6-dev (>= 0.6.0-1),
          liberis-1.3-19 (= ${binary:Version}),
          libglib2.0-dev,
@@ -85,7 +88,9 @@ Description: WorldForge client entity library - development files
 Package: liberis-1.3-19-dbg
 Section: debug
 Architecture: any
+Multi-Arch: same
 Priority: extra
+Pre-Depends: ${misc:Pre-Depends}
 Depends: liberis-1.3-19 (= ${binary:Version}), ${misc:Depends}
 Description: WorldForge client entity library - debugging library
  Eris is designed to simplify client development (and avoid repeating the
@@ -118,6 +123,7 @@ Section: doc
 Depends: ${misc:Depends}
 Suggests: liberis-1.3-dev
 Architecture: all
+Multi-Arch: foreign
 Description: WorldForge client entity library - API documentation
  Eris is designed to simplify client development (and avoid repeating the
  same work several times), by providing a common system to deal with the
diff --git a/debian/liberis-1.3-19.install b/debian/liberis-1.3-19.install
index 276a1fd..06de971 100644
--- a/debian/liberis-1.3-19.install
+++ b/debian/liberis-1.3-19.install
@@ -1,2 +1,2 @@
-debian/tmp/usr/lib/liberis-1.3.so.19 /usr/lib
-debian/tmp/usr/lib/liberis-1.3.so.19.* /usr/lib
+usr/lib/*/liberis-1.3.so.19
+usr/lib/*/liberis-1.3.so.19.*
diff --git a/debian/liberis-1.3-dev.install b/debian/liberis-1.3-dev.install
index aeb33b3..7785eb0 100644
--- a/debian/liberis-1.3-dev.install
+++ b/debian/liberis-1.3-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/Eris-1.3/Eris/* /usr/include/Eris-1.3/Eris
-debian/tmp/usr/lib/liberis-1.3.so /usr/lib
-debian/tmp/usr/lib/pkgconfig/eris-1.3.pc /usr/lib/pkgconfig
+usr/include/Eris-1.3/Eris/* 
+usr/lib/*/liberis-1.3.so 
+usr/lib/*/pkgconfig/eris-1.3.pc 
diff --git a/debian/rules b/debian/rules
index 7d5f973..794a090 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,15 +1,22 @@
 #!/usr/bin/make -f
-# -*- mode: makefile; coding: utf-8 -*-
-# Copyright © 2004 Michael Koch <konqueror at gmx.de>
 
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/class/autotools.mk
+%:
+	dh $@ --with autoreconf
 
-DEB_DH_INSTALL_ARGS = --fail-missing -X.la
+override_dh_auto_clean:
+	rm -rf docs
+	dh_auto_clean
 
-clean::
-	rm -fr $(CURDIR)/docs
+override_dh_auto_build-indep:
+	$(MAKE) doc
 
-common-binary-indep::
-	make doc
+override_dh_install:
+	dh_install --fail-missing -X.la -X.a
+
+override_dh_strip:
+	set -e; \
+	for pkg in $(patsubst %-dbg,%,$(filter %-dbg,$(shell dh_listpackages))); do \
+		dh_strip -p$${pkg} --dbg-package=$${pkg}-dbg; \
+	done
+	dh_strip -s --remaining-packages
 

-- 
WorldForge client entity library