[SCM] WorldForge terrain library branch, master, updated. upstream/0.3.0-12-g3fd8495

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit 3fd8495338af7149bec34e41f60107a142dfd064
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Tue Jan 31 10:58:56 2012 -0500

    converted to use the dh build sequencer

diff --git a/debian/changelog b/debian/changelog
index c0c843b..abca77f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,8 +8,9 @@ mercator (0.3.0-1) UNRELEASED; urgency=low
   * debian/control: added Vcs- fields
   * added symbols tracking
   * debian/copyright: convert to DEP-5 format
+  * converted to use the dh build sequencer
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Tue, 31 Jan 2012 10:45:48 -0500
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Tue, 31 Jan 2012 10:51:44 -0500
 
 mercator (0.2.7-3) unstable; urgency=low
 
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 d21dafd..6a5b097 100644
--- a/debian/control
+++ b/debian/control
@@ -3,9 +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: autotools-dev,
-               cdbs,
-               debhelper (>= 5),
+Build-Depends: dh-autoreconf,
+               debhelper (>= 9),
                libwfmath-0.3-dev (>= 0.3.11),
                pkg-config
 Standards-Version: 3.9.2
@@ -15,6 +14,8 @@ Vcs-Browser: http://git.debian.org/?p=pkg-games/mercator.git
 
 Package: libmercator-0.3-1
 Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~), ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: WorldForge terrain library
  Mercator is primarily aimed at terrain for multiplayer online games and
@@ -38,6 +39,8 @@ Description: WorldForge terrain library
 Package: libmercator-0.3-dev
 Section: libdevel
 Architecture: any
+Multi-Arch: same
+Pre-Depends: dpkg (>= 1.15.6~)
 Depends: libmercator-0.3-1 (= ${binary:Version}),
          libwfmath-0.3-dev,
          ${misc:Depends}
@@ -66,6 +69,7 @@ Package: libmercator-0.3-1-dbg
 Section: debug
 Priority: extra
 Architecture: any
+Pre-Depends: dpkg (>= 1.15.6~)
 Depends: libmercator-0.3-1 (= ${binary:Version}), ${misc:Depends}
 Description: WorldForge terrain library - debugging symbols
  Mercator is primarily aimed at terrain for multiplayer online games and
diff --git a/debian/libmercator-0.3-1.install b/debian/libmercator-0.3-1.install
index d137e6c..e4e90d1 100644
--- a/debian/libmercator-0.3-1.install
+++ b/debian/libmercator-0.3-1.install
@@ -1,2 +1,2 @@
-usr/lib/libmercator-0.3.so.1
-usr/lib/libmercator-0.3.so.1.0.0
+usr/lib/*/libmercator-0.3.so.1
+usr/lib/*/libmercator-0.3.so.1.0.0
diff --git a/debian/libmercator-0.3-dev.install b/debian/libmercator-0.3-dev.install
index 0b1de36..54235f6 100644
--- a/debian/libmercator-0.3-dev.install
+++ b/debian/libmercator-0.3-dev.install
@@ -1,3 +1,3 @@
 usr/include/Mercator-0.3/Mercator/*.h
-usr/lib/libmercator-0.3.so
-usr/lib/pkgconfig/mercator-0.3.pc
+usr/lib/*/libmercator-0.3.so
+usr/lib/*/pkgconfig/mercator-0.3.pc
diff --git a/debian/rules b/debian/rules
index 06e9106..abe30be 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,18 @@
 #!/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_SOURCEDIR := debian/tmp
+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
+
+override_dh_builddeb:
+	dh_builddeb -- -Zxz
 
-check-install:
-	dh_install --sourcedir=debian/tmp --fail-missing

-- 
WorldForge terrain library