[SCM] WorldForge configuration library branch, master, updated. upstream/0.6.7-8-g1262e1a

[Stephen M. Webb]

The following commit has been merged in the master branch:
commit f6588b2a35c30f85064b681b2997786455a5ccbb
Author: Stephen M. Webb <stephen.webb at bregmasoft.ca>
Date:   Fri Jan 13 09:33:53 2012 -0500

    convert to debhelper(8)

diff --git a/debian/changelog b/debian/changelog
index ad6d185..addba8e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 varconf (0.6.7-1) UNRELEASED; urgency=low
 
   * new upstream release
+  * convert to debhelper(8)
 
  -- Stephen M. Webb <stephen.webb at bregmasoft.ca>  Fri, 13 Jan 2012 09:23:16 -0500
 
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..45a4fb7 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+8
diff --git a/debian/control b/debian/control
index 16543c4..7949a33 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,23 @@ Source: varconf
 Maintainer: Michael Koch <konqueror at gmx.de>
 Section: libs
 Priority: optional
-Build-Depends: debhelper (>= 5), libsigc++-2.0-dev, chrpath
+Build-Depends: debhelper (>= 8), libsigc++-2.0-dev
 Standards-Version: 3.8.3
 Homepage: http://www.worldforge.org/
 
+Package: libvarconf-1.0-6
+Architecture: any
+Section: libs
+Depends: ${shlibs:Depends}
+Description: WorldForge configuration file handling library
+ Varconf is a configuration system designed for the STAGE server. Varconf
+ can parse configuration files, command-line arguments and environment
+ variables. It supports callbacks and can store its configuration
+ information in separate Config objects or in one global configuration
+ instance.
+ .
+ This package contains the shared libraries.
+
 Package: libvarconf-dev
 Architecture: any
 Section: libdevel
@@ -36,15 +49,3 @@ Description: WorldForge configuration file handling library - debugging librarie
  .
  This package contains the shared libraries with debugging symbols.
 
-Package: libvarconf-1.0-6
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}
-Description: WorldForge configuration file handling library
- Varconf is a configuration system designed for the STAGE server. Varconf
- can parse configuration files, command-line arguments and environment
- variables. It supports callbacks and can store its configuration
- information in separate Config objects or in one global configuration
- instance.
- .
- This package contains the shared libraries.
diff --git a/debian/rules b/debian/rules
index 212427f..1a2cfae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,89 +1,11 @@
 #!/usr/bin/make -f
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@
 
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+override_dh_install:
+	dh_install --fail-missing -X.la -X.a
 
-LIBS = -lstdc++
-ifneq (,$(findstring mips,$(DEB_BUILD_GNU_TYPE)))
-	LIBS += -lm
-endif
+override_dh_strip:
+	dh_strip --dbg-package=libvarconf-1.0-6-dbg
 
-ifeq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CXXFLAGS = -O2
-else
-	CXXFLAGS = -O0
-endif
-ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
-	INSTALL_PROGRAM += -s
-endif
-
-config.status: configure
-	dh_testdir
-	
-	CXXFLAGS="$(CXXFLAGS)" \
-	LIBS="$(LIBS)" \
-	./configure \
-		--host=$(DEB_HOST_GNU_TYPE) \
-		--build=$(DEB_BUILD_GNU_TYPE) \
-		--prefix=/usr \
-		--disable-dependency-tracking \
-		--mandir=\$${prefix}/share/man \
-		--infodir=\$${prefix}/share/info \
-		--disable-debug \
-		--disable-static
-
-build: build-stamp
-build-stamp:  config.status
-	dh_testdir
-
-	$(MAKE)
-
-	touch build-stamp
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp 
-
-	[ ! -f Makefile ] || $(MAKE) distclean
-	#-test -r /usr/share/misc/config.sub && \
-	#  cp -f /usr/share/misc/config.sub config.sub
-	#-test -r /usr/share/misc/config.guess && \
-	#  cp -f /usr/share/misc/config.guess config.guess
-
-	dh_clean
-
-install: build
-	dh_testdir
-	dh_testroot
-	dh_clean -k
-	dh_installdirs
-
-	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
-	
-	chrpath -d $(CURDIR)/debian/tmp/usr/lib/libvarconf-1.0.so.6.0.0
-
-binary-indep: build install
-
-binary-arch: build install
-	dh_testdir
-	dh_testroot
-	dh_install --sourcedir=debian/tmp --list-missing
-	dh_installdocs
-	dh_installchangelogs ChangeLog
-	dh_link
-	dh_strip -k --dbg-package=libvarconf-1.0-6-dbg
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs -plibvarconf-1.0-6 -V 'libvarconf-1.0-6'
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install 

-- 
WorldForge configuration library