Debian packaging updates for DMAPI userspace package.

Merge of master-melb:xfs-cmds:25585a by kenmcd.

9 files changed, 42 insertions, 26 deletions

diff --git a/Makefile b/Makefile
index e7f5165..7f301b6 100644
--- a/Makefile
+++ b/Makefile
@@ -50,8 +50,10 @@ aclocal.m4::
 
 install: default
 	$(SUBDIRS_MAKERULE)
+ifneq ($(PKG_DISTRIBUTION), debian)
 	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
 	$(INSTALL) -m 644 README $(PKG_DOC_DIR)
+endif
 
 install-dev: default
 	$(SUBDIRS_MAKERULE)
diff --git a/VERSION b/VERSION
index 4b539ed..54b3e2c 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=2
-PKG_REVISION=4
+PKG_REVISION=5
 PKG_BUILD=1
diff --git a/debian/Makefile b/debian/Makefile
index a886b9f..81c2760 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -15,7 +15,6 @@ include $(BUILDRULES)
 
 install: default
 ifeq ($(PKG_DISTRIBUTION), debian)
-	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
 	$(INSTALL) -m 755 -d $(LIB_DOC_DIR)
 	$(INSTALL) -m 644 copyright $(LIB_DOC_DIR)
 	$(INSTALL) -m 644 changelog $(LIB_DOC_DIR)/changelog.Debian
@@ -23,7 +22,6 @@ endif
 
 install-dev: default
 ifeq ($(PKG_DISTRIBUTION), debian)
-	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
 	$(INSTALL) -m 755 -d $(DEV_DOC_DIR)
 	$(INSTALL) -m 644 copyright $(DEV_DOC_DIR)
 	$(INSTALL) -m 644 changelog $(DEV_DOC_DIR)/changelog.Debian
diff --git a/debian/changelog b/debian/changelog
index 49d8b25..0b1c460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+dmapi (2.2.5-1) unstable; urgency=low
+
+  * New upstream release
+  * Switch from debmake to debhelper
+
+ -- Nathan Scott <nathans@debian.org>  Tue, 28 Mar 2006 17:24:09 +1100
+
 dmapi (2.2.4-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/control b/debian/control
index f5ba471..81851bd 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: dmapi
 Section: admin
 Priority: optional
 Maintainer: Nathan Scott <nathans@debian.org>
-Build-Depends: xfslibs-dev (>= 2.7.13), autoconf, debmake, libtool
+Build-Depends: xfslibs-dev (>= 2.7.13), autoconf, debhelper (>= 5), libtool
 Standards-Version: 3.5.9
 
 Package: libdm0
@@ -23,7 +23,7 @@ Description: Data Management API runtime environment
 Package: libdm0-dev
 Section: libdevel
 Priority: extra
-Depends: libc6-dev, libdm0, xfslibs-dev (>= 2.7.13)
+Depends: libc6-dev | libc-dev, libdm0, xfslibs-dev (>= 2.7.13)
 Provides: dmapi-dev
 Replaces: dmapi-dev
 Conflicts: xfslibs-dev (<< 2.7.13)
diff --git a/debian/rules b/debian/rules
index 28e3f61..baa41d2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -5,7 +5,7 @@ develop = libdm0-dev
 library = libdm0
 
 dirdev = debian/$(develop)
-dirlib = debian/tmp
+dirlib = debian/$(library)
 pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT;
 pkglib = DIST_ROOT=`pwd`/$(dirlib); export DIST_ROOT;
 stdenv = @GZIP=-q; export GZIP;
@@ -13,6 +13,7 @@ stdenv = @GZIP=-q; export GZIP;
 options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \
 	  INSTALL_USER=root INSTALL_GROUP=root ;
 checkdir = test -f debian/rules
+checkver = rm -f debian/compat && echo 5 > debian/compat
 
 build: built
 built: config
@@ -32,30 +33,32 @@ clean:
 	$(checkdir)
 	-rm -f built .census
 	$(MAKE) distclean
-	-rm -rf $(dirtmp) $(dirdev) $(dirtmp) debian/*substvars debian/files*
+	-rm -rf $(dirdev) $(dirlib)
+	-rm -f debian/*substvars debian/files* debian/*.debhelper debian/compat
 
 binary-indep:
 
-# Note1: dev pkg with .so symlinks to base pkg confuses debstd;
-# so the .so 'Dangling symlink' message is benign.
-# Note2: absolute symlinks (required by policy) confuse debstd;
-# so we'll filter out symlink messages entirely now.
-# 
 binary-arch: checkroot built
 	@echo "== dpkg-buildpackage: binary-arch" 1>&2
 	$(checkdir)
-	-rm -rf $(dirtmp) $(dirdev) $(dirlib)
+	$(checkver)
+	-rm -rf $(dirdev) $(dirlib)
 	$(pkgdev) $(MAKE) -C . install-dev
 	$(pkglib) $(MAKE) -C . install
 	$(pkglib) $(MAKE) -C build src-manifest
-	@echo "== dpkg-buildpackage: debstd" 1>&2
-	$(stdenv) debstd -m | grep -v 'Dangling symlink'
-	dpkg-gencontrol -isp -p$(develop) -P$(dirdev)
-	dpkg-gencontrol -isp -p$(library) -P$(dirlib)
-	chown -R root.root $(dirtmp) $(dirdev) $(dirlib)
-	chmod -R go=rX $(dirtmp) $(dirdev) $(dirlib)
-	dpkg --build $(dirdev) ..
-	dpkg --build $(dirlib) .. 
+
+	dh_installdocs
+	dh_installchangelogs
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_makeshlibs
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
 
diff --git a/doc/CHANGES b/doc/CHANGES
index 84cbb78..e4e7f83 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,7 @@
-dmapi-2.2.4 (21 November 2005)
+dmapi-2.2.5 (28 March 2006)
+	- Debian packaging updates (debmake out, debhelper in)
+
+dmapi-2.2.4 (22 March 2006)
 	- Use -O2 for builds, not -O1.
 	- Fix Debian build packaging dependency.
 
diff --git a/doc/Makefile b/doc/Makefile
index 6ff0b7f..64732c7 100644
--- a/doc/Makefile
+++ b/doc/Makefile
@@ -16,12 +16,16 @@ CHANGES.gz:
 	$(ZIP) --best -c < CHANGES > $@
 
 install: default
+ifneq ($(PKG_DISTRIBUTION), debian)
 	$(INSTALL) -m 755 -d $(PKG_DOC_DIR)
 	$(INSTALL) -m 644 PORTING CHANGES.gz $(PKG_DOC_DIR)
-ifeq ($(PKG_DISTRIBUTION), debian)
-	$(INSTALL) -S CHANGES.gz $(PKG_DOC_DIR)/changelog.gz
-else
 	$(INSTALL) -m 644 COPYING $(PKG_DOC_DIR)
 endif
 
+LIB_DOC_DIR = $(PKG_DOC_DIR)/../libdm0
 install-dev:
+ifeq ($(PKG_DISTRIBUTION), debian)
+	$(INSTALL) -m 755 -d $(LIB_DOC_DIR)
+	$(INSTALL) -m 644 PORTING CHANGES.gz $(LIB_DOC_DIR)
+	$(INSTALL) -S CHANGES.gz $(LIB_DOC_DIR)/changelog.gz
+endif
diff --git a/include/buildmacros b/include/buildmacros
index 41a4ef9..928f24f 100644
--- a/include/buildmacros
+++ b/include/buildmacros
@@ -56,7 +56,6 @@ INSTALL_LTLIB = \
 	cd $(TOPDIR)/$(LIBNAME)/.libs; \
 	../$(INSTALL) -m 755 -d $(PKG_LIB_DIR); \
 	../$(INSTALL) -m 644 -T so_dot_version $(LIBNAME).lai $(PKG_LIB_DIR); \
-	test "$(PKG_DISTRIBUTION)" = debian || \
 	../$(INSTALL) -T so_dot_current $(LIBNAME).lai $(PKG_LIB_DIR)
 endif