Update debian packaging to build with external libblkid.

Reviewed-by: Christoph Hellwig <hch@lst.de>
Signed-off-by: Nathan Scott <nathans@debian.org>

diff --git a/debian/changelog b/debian/changelog
index c1f3257c5d23f082bfd9ff4ad73e51543bc561c3..24e5c2023c62c2a2b9038d9dd9937de470537eb6 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+xfsprogs (3.1.3) unstable; urgency=low
+
+  * New upstream release
+  * Enforce building with libblkid (closes: #593320)
+
+ -- Nathan Scott <nathans@debian.org>  Thu, 26 Aug 2010 23:06:46 +1000
+
 xfsprogs (3.1.2) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/control b/debian/control
index 5130bab678d70c5064107d4a9d65eb57a79b7464..652ffcb229f456401e449bf45021ba3f56aec414 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -3,15 +3,15 @@ Section: admin
 Priority: optional
 Maintainer: Nathan Scott <nathans@debian.org>
 Uploaders: Anibal Monsalve Salazar <anibal@debian.org>
-Build-Depends: uuid-dev, autoconf, debhelper (>= 5), gettext, libtool, libreadline5-dev
-Standards-Version: 3.8.1
+Build-Depends: uuid-dev, autoconf, debhelper (>= 5), gettext, libtool, libreadline5-dev, libblkid-dev (>= 2.17)
+Standards-Version: 3.9.1
 Homepage: http://oss.sgi.com/projects/xfs/
 
 Package: xfsprogs
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: fsck-backend
 Suggests: xfsdump, acl, attr, quota
-Conflicts: xfsdump (<< 3.0.0)
+Breaks: xfsdump (<< 3.0.0)
 Architecture: any
 Description: Utilities for managing the XFS filesystem
  A set of commands to use the XFS filesystem, including mkfs.xfs.
@@ -29,8 +29,8 @@ Description: Utilities for managing the XFS filesystem
 Package: xfslibs-dev
 Section: libdevel
 Priority: extra
-Depends: libc6-dev | libc-dev, uuid-dev, xfsprogs (>= 3.0.0)
-Conflicts: xfsprogs (<< 3.0.0)
+Depends: libc6-dev | libc-dev, uuid-dev, xfsprogs (>= 3.0.0), ${misc:Depends}
+Breaks: xfsprogs (<< 3.0.0)
 Architecture: any
 Description: XFS filesystem-specific static libraries and headers
  xfslibs-dev contains the libraries and header files needed to

diff --git a/debian/rules b/debian/rules
index 8c15dcb0d53de6b5a30c6f017cd983184199c110..a26195dae81b6f3e7c0d4d40e0abfe781c1a3a9b 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ stdenv = @GZIP=-q; export GZIP;
 
 options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \
          INSTALL_USER=root INSTALL_GROUP=root \
-         LOCAL_CONFIGURE_OPTIONS=--enable-readline=yes ;
+         LOCAL_CONFIGURE_OPTIONS="--enable-readline=yes --enable-blkid=yes" ;
 diopts  = $(options) \
          export OPTIMIZER=-Os LOCAL_CONFIGURE_OPTIONS="--enable-gettext=no" ;
 checkdir = test -f debian/rules