Debian packaging updates for xfsprogs.

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

diff --git a/VERSION b/VERSION
index 3aa365126fbe6347a6912085ca1db2fb9175116b..e6188e00a89377e2d64f8b892ef9a382bdee8227 100644 (file)
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=7
-PKG_REVISION=13
+PKG_REVISION=14
 PKG_BUILD=1

diff --git a/debian/changelog b/debian/changelog
index 3a4d5348bffcc5e60e8457c49906cbd11aced4ea..16b85acdc3a063ee9788f8e192c3f68d655607ad 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-xfsprogs (2.7.13-1) unstable; urgency=low
+xfsprogs (2.7.14-1) unstable; urgency=low
 
   * New upstream release.
 
- -- Nathan Scott <nathans@debian.org>  Wed, 08 Feb 2006 09:49:48 +1100
+ -- Nathan Scott <nathans@debian.org>  Wed, 15 Feb 2006 20:04:55 +1100
 
 xfsprogs (2.7.12-1) unstable; urgency=low
 

diff --git a/debian/control b/debian/control
index 7ec1778b3faf2edc845cfd2b2f1dbe9b7a0b5b20..a764d8dfbd7281d5e28c1502c9036f6f7b43f0bf 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: xfsprogs
 Section: admin
 Priority: optional
 Maintainer: Nathan Scott <nathans@debian.org>
-Build-Depends: uuid-dev, autoconf, debhelper, gettext, libtool, libreadline5-dev
+Build-Depends: uuid-dev, autoconf, debhelper (>= 5), gettext, libtool, libreadline5-dev
 Standards-Version: 3.5.9
 
 Package: xfsprogs

diff --git a/debian/rules b/debian/rules
index d019ee49bd7c3a1f3f5279d1a9eb438df11ff2af..667ffe2ac1344731f74a075e9d358651773136ed 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -8,10 +8,10 @@ version = $(shell dpkg-parsechangelog | grep ^Version: | cut -d ' ' -f 2)
 target ?= $(shell dpkg-architecture -qDEB_HOST_ARCH)
 udebpkg = $(bootpkg)_$(version)_$(target).udeb
 
-dirtmp = debian/tmp
+dirme  = debian/$(package)
 dirdev = debian/$(develop)
 dirdi  = debian/$(bootpkg)
-pkgtmp = DIST_ROOT=`pwd`/$(dirtmp); export DIST_ROOT;
+pkgme  = DIST_ROOT=`pwd`/$(dirme);  export DIST_ROOT;
 pkgdev = DIST_ROOT=`pwd`/$(dirdev); export DIST_ROOT;
 pkgdi  = DIST_ROOT=`pwd`/$(dirdi); export DIST_ROOT;
 stdenv = @GZIP=-q; export GZIP;
@@ -22,6 +22,7 @@ options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \
 diopts  = $(options) \
          export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="--enable-gettext=no" ;
 checkdir = test -f debian/rules
+checkver = rm -f debian/compat && echo 5 > debian/compat
 
 build: built
 built: dibuild config
@@ -53,18 +54,20 @@ clean:
        $(checkdir)
        -rm -f built .census mkfs/mkfs.xfs-$(bootpkg)
        $(MAKE) distclean
-       -rm -rf $(dirtmp) $(dirdev) $(dirdi) debian/*substvars debian/files*
+       -rm -rf $(dirme) $(dirdev) $(dirdi)
+       -rm -f debian/*substvars debian/files* debian/*.debhelper debian/compat
 
 binary-indep:
 
 binary-arch: checkroot built
        @echo "== dpkg-buildpackage: binary-arch" 1>&2
        $(checkdir)
-       -rm -rf $(dirtmp) $(dirdev) $(dirdi)
-       $(pkgtmp) $(MAKE) -C . install
+       $(checkver)
+       -rm -rf $(dirme) $(dirdev) $(dirdi)
+       $(pkgme)  $(MAKE) -C . install
        $(pkgdev) $(MAKE) -C . install-dev
-       $(pkgdi) $(MAKE) -C debian install-d-i
-       $(pkgtmp) $(MAKE) -C build src-manifest
+       $(pkgdi)  $(MAKE) -C debian install-d-i
+       $(pkgme)  $(MAKE) -C build src-manifest
 
        dh_installdocs -p$(package) -p$(develop)
        dh_installchangelogs -N$(bootpkg)

diff --git a/doc/CHANGES b/doc/CHANGES
index a3447e2ee6d95d256ecd74a0c51febcdb7f09143..27d3a940676d8bc51deb87996142e069c7497c2f 100644 (file)
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,7 @@
+xfsprogs-2.7.14 (15 February 2006)
+       - Debian packaging updates.
+       - Fix a header to work with additional compiler variants.
+
 xfsprogs-2.7.13 (08 February 2006)
        - Convert fsck into a shell script and make it provide a
          hint to run repair/check (in non-auto fsck modes).