[SCM] WorldForge protocol library branch, master, updated. debian/0.6.2-1_RFS1-6-g5f002c6

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit ef77d56db01d916fb000c08495e7d7808ef78ba4
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Fri Jan 27 22:40:18 2012 -0500

    debian/rules: convert to use dh build sequencer

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..845ca06
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+.pc
diff --git a/debian/changelog b/debian/changelog
index 34303e1..1c07fb1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,8 +12,9 @@ atlas-cpp (0.6.2-1) UNRELEASED; urgency=low
   * added a manpage for the atlas_convert tool
   * added lintian override for multiple DSOs in package
   * added more zlib and libbz build dependencies
+  * debian/rules: convert to use dh build sequencer
 
- -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Wed, 11 Jan 2012 12:08:11 -0500
+ -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Fri, 27 Jan 2012 22:29:36 -0500
 
 atlas-cpp (0.6.1-4) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 1f81d30..f2a281e 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,7 @@ Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Stephen M. Webb <stephen.webb at bregmasoft.ca>
 Section: libs
 Priority: optional
-Build-Depends: autoconf,
-               automake,
-               cdbs,
-               debhelper (>= 8),
+Build-Depends: debhelper (>= 8),
                dh-autoreconf,
                doxygen,
                libbz2-dev,
diff --git a/debian/patches/0001-remove-werror.patch b/debian/patches/0001-remove-werror.patch
new file mode 100644
index 0000000..5919ef3
--- /dev/null
+++ b/debian/patches/0001-remove-werror.patch
@@ -0,0 +1,18 @@
+Description: removes -Werror from non-debug build
+Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
+
+--- a/configure.ac
++++ b/configure.ac
+@@ -35,10 +35,10 @@
+         if test "$enableval" = "yes"; then
+             CXXFLAGS="$CXXFLAGS -Wall -Werror -DDEBUG"
+         else
+-            CXXFLAGS="$CXXFLAGS -Wall -Werror -DNDEBUG"
++            CXXFLAGS="$CXXFLAGS -Wall -DNDEBUG"
+         fi
+     ],[
+-        CXXFLAGS="$CXXFLAGS -Wall -Werror -DNDEBUG"
++        CXXFLAGS="$CXXFLAGS -Wall -DNDEBUG"
+     ]
+ )
+ 
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..da8ab9a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-remove-werror.patch
diff --git a/debian/rules b/debian/rules
index 9aae6d7..933091e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,16 +1,23 @@
 #!/usr/bin/make -f
 
-include /usr/share/cdbs/1/class/autotools.mk
-include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/autoreconf.mk
+%:
+	dh $@ --with autoreconf
 
-DEB_CONFIGURE_EXTRA_FLAGS = --enable-debug
-DEB_DH_INSTALL_ARGS = --fail-missing -X.la
-DEB_DH_MAKESHLIBS_ARGS_libatlas-cpp-0.6-1 := -V 'libatlas-cpp-0.6-1'
+override_dh_install:
+	dh_install --fail-missing -X.la -X.a
 
-clean::
-	rm -rf $(CURDIR)/doc/*
+override_dh_auto_build-indep:
+	$(MAKE) docs
+
+override_dh_auto_clean:
+	rm -rf doc/*
+	dh_auto_clean
+
+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
 
-common-binary-indep::
-	doxygen
 

-- 
WorldForge protocol library