xfsprogs debian changes

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

  xfsprogs debian changes

diff --git a/debian/changelog b/debian/changelog
index 336dd424f7bf82e3c6f19040f7b6a1d133658b8a..23925584fc797bf016a1ca0b32674fed16528a15 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,13 @@
 xfsprogs (2.9.8-1) unstable; urgency=low
 
-  * New upstream release.
+  * New upstream release
+  * xfsprogs and xfsprogs-udeb depend on ${misc:Depends}
+  * Add Homepage control header
+  * Add watch file
+  * Fix the following lintian issues:
+    W: xfsprogs source: package-uses-deprecated-debhelper-compat-version 1
+    W: xfsprogs source: ancient-standards-version 3.5.9 (current is 3.7.3)
+    W: xfslibs-dev: package-contains-empty-directory usr/share/doc/xfsprogs/
 
  -- Anibal Monsalve Salazar <anibal@debian.org>  Tue, 22 Apr 2008 13:04:05 +1000
 

diff --git a/debian/compat b/debian/compat
new file mode 100644 (file)
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5

diff --git a/debian/control b/debian/control
index 5fa88cda53ea442a1c8a32cd2348ac2d0727baae..e5fb046731b32a7f292b39cdebdf80378de57db1 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -4,10 +4,11 @@ Priority: optional
 Maintainer: Nathan Scott <nathans@debian.org>
 Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Niv Sardi <xaiki@debian.org>
 Build-Depends: uuid-dev, autoconf, debhelper (>= 5), gettext, libtool, libreadline5-dev
-Standards-Version: 3.5.9
+Standards-Version: 3.7.3
+Homepage: http://oss.sgi.com/projects/xfs/
 
 Package: xfsprogs
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: fsck-backend
 Suggests: xfsdump, attr, dvhtool, quota
 Conflicts: xfsdump (<< 2.0.0)
@@ -41,7 +42,7 @@ XC-Package-Type: udeb
 Section: debian-installer
 Priority: optional
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: A stripped-down version of xfsprogs, for debian-installer
  This package is an xfsprogs package built for reduced size, so that it
  can help to save space in debian-installer.

diff --git a/debian/rules b/debian/rules
index f839adabf7bd418183f46e867af687c78c2130d6..4310a9e12bf0593c07c908d1baa7613acfd25281 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DH_VERBOSE=1
+
 package = xfsprogs
 develop = xfslibs-dev
 bootpkg = xfsprogs-udeb
@@ -22,7 +24,6 @@ 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
@@ -55,20 +56,19 @@ clean:
        -rm -f built .census mkfs/mkfs.xfs-$(bootpkg)
        $(MAKE) distclean
        -rm -rf $(dirme) $(dirdev) $(dirdi)
-       -rm -f debian/*substvars debian/files* debian/*.debhelper debian/compat
+       -rm -f debian/*substvars debian/files* debian/*.debhelper
 
 binary-indep:
 
 binary-arch: checkroot built
        @echo "== dpkg-buildpackage: binary-arch" 1>&2
        $(checkdir)
-       $(checkver)
        -rm -rf $(dirme) $(dirdev) $(dirdi)
        $(pkgme)  $(MAKE) -C . install
        $(pkgdev) $(MAKE) -C . install-dev
        $(pkgdi)  $(MAKE) -C debian install-d-i
        $(pkgme)  $(MAKE) -C build src-manifest
-
+       rmdir debian/xfslibs-dev/usr/share/doc/xfsprogs
        dh_installdocs
        dh_installchangelogs
        dh_strip

diff --git a/debian/watch b/debian/watch
new file mode 100644 (file)
index 0000000..e381adf
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://oss.sgi.com/projects/xfs/cmd_tars/ xfsprogs_([\d]+[\d\.]*)-[\d].tar.gz