attr debian changes

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

  attr debian changes

6 files changed, 75 insertions, 11 deletions

diff --git a/debian/Makefile b/debian/Makefile
index 49fa1ec..77132e1 100644
--- a/debian/Makefile
+++ b/debian/Makefile
@@ -6,7 +6,7 @@ TOPDIR = ..
 include $(TOPDIR)/include/builddefs
 
 LIBPKG = lib$(PKG_NAME)1
-LSRCFILES = changelog control copyright rules
+LSRCFILES = changelog compat control copyright rules watch
 DEV_DOC_DIR = $(PKG_DOC_DIR)/../$(LIBPKG)-dev
 LIB_DOC_DIR = $(PKG_DOC_DIR)/../$(LIBPKG)
 
diff --git a/debian/changelog b/debian/changelog
index 70041e6..0f1ee76 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,43 @@
+attr (1:2.4.42-1) unstable; urgency=low
+
+  * New upstream release
+  * Updated debian/changelog
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Mon, 28 Apr 2008 16:27:59 +1000
+
+attr (1:2.4.41-1) unstable; urgency=low
+
+  * New upstream release
+  * Add myself to Uploaders
+  * Remove /usr/share/doc/attr (closes: #405106, #445903)
+  * Bump dependency of attr to libattr1 (>= 2.4.41), might be too high but
+    good enough. (closes: #377700)
+  * Upstream closed bugs:
+     Manpage updated (closes: #446877)
+  * Closing old bugs:
+     2.4.36: (closes: #299095)
+  * Bump Standards Versions, no changes were needed.
+  * Bump DH_COMPAT.
+
+ -- Niv Sardi <xaiki@debian.org>  Mon, 11 Feb 2008 17:45:43 +1100
+  
+attr (1:2.4.39-1) unstable; urgency=low
+
+  * New upstream release
+  * debian/control:
+    - Added homepage
+    - Added myself as comaintainer
+    - Set Standards-Version to 3.7.2
+    - libattr1-dev depends on libattr1 (= ${binary:Version})
+    - attr and libattr1 depend on ${misc:Depends}
+  * debian/watch: Added
+  * include/buildrules: Drop --omit-header from xgettext call, so that the
+    generated POT file becomes valid.
+  * debian/rules: Rebuild POT file so that Ubuntu's Rosetta can always
+    import an up to date version.
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Sun, 16 Sep 2007 09:14:11 +1000
+
 attr (2.4.36-1) unstable; urgency=high
 
   * New upstream release
@@ -18,6 +58,23 @@ attr (2.4.33-1) unstable; urgency=low
 
  -- Nathan Scott <nathans@debian.org>  Mon, 03 Jul 2006 10:08:43 +1000
 
+attr (1:2.4.32-1.2) unstable; urgency=low
+
+  * Non-maintainer upload (porter NMU).
+  * add armel support, Closes: #421627
+  * fix kfreebsd build, Closes: #414232
+
+ -- Riku Voipio <riku.voipio@iki.fi>  Wed, 25 Jul 2007 23:33:58 +0300
+
+attr (1:2.4.32-1.1) unstable; urgency=emergency
+
+  * Non-maintainer upload.
+  * Reupload previous version and fix breackage of ls -la, cp -a and other
+    essential utilities.
+    Closes: #403601, #403592, #403585, #403590, #403599 and probably more.
+
+ -- Andreas Barth <aba@not.so.argh.org>  Mon, 18 Dec 2006 13:42:31 +0000
+
 attr (2.4.32-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..7ed6ff8
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+5
diff --git a/debian/control b/debian/control
index b602ffc..853c01d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,12 +2,13 @@ Source: attr
 Section: utils
 Priority: optional
 Maintainer: Nathan Scott <nathans@debian.org>
-Uploaders: Anibal Monsalve Salazar <anibal@debian.org>, Niv Sardi <xaiki@debian.org>
+Uploaders: Niv Sardi <xaiki@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>
 Build-Depends: autoconf, debhelper (>= 5), gettext, libtool
-Standards-Version: 3.5.9
+Standards-Version: 3.7.3
+Homepage: http://oss.sgi.com/projects/xfs/
 
 Package: attr
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xfsdump (<< 2.0.0)
 Architecture: any
 Description: Utilities for manipulating filesystem extended attributes
@@ -19,7 +20,7 @@ Description: Utilities for manipulating filesystem extended attributes
 Package: libattr1-dev
 Section: libdevel
 Priority: extra
-Depends: libc6-dev | libc-dev, libattr1 (>= 2.0.0)
+Depends: libc6-dev | libc-dev, libattr1 (= ${binary:Version})
 Provides: attr-dev
 Replaces: attr-dev
 Conflicts: attr-dev, attr (<< 2.0.0)
@@ -35,7 +36,7 @@ Description: Extended attribute static libraries and headers
  used by programs such as xfsdump(8), xfsrestore(8) and xfs_fsr(8).
 
 Package: libattr1
-Depends: ${shlibs:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}
 Section: libs
 Priority: required
 Conflicts: attr (<< 2.0.0)
diff --git a/debian/rules b/debian/rules
index 139911f..1267c96 100755
--- a/debian/rules
+++ b/debian/rules
@@ -15,12 +15,13 @@ 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
 	@echo "== dpkg-buildpackage: build" 1>&2
 	$(MAKE) default
+	rm -f po/attr.pot
+	$(MAKE) -C po attr.pot
 	touch built
 
 config: .census
@@ -35,28 +36,30 @@ clean:
 	$(checkdir)
 	-rm -f built .census
 	$(MAKE) distclean
-	-rm -rf $(dirme) $(dirdev) $(dirlib)
-	-rm -f debian/*substvars debian/files* debian/*.debhelper debian/compat
+	-rm -rf $(dirme) $(dirdev) $(dirlib) debian/tmp
+	-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) $(dirlib)
 	$(pkgme)  $(MAKE) -C . install
 	$(pkgdev) $(MAKE) -C . install-dev
 	$(pkglib) $(MAKE) -C . install-lib
 	$(pkgme)  $(MAKE) -C build src-manifest
 
+	-rm -rf $(dirdev)/usr/share/doc/attr
+	-rm -rf $(dirlib)/usr/share/doc/attr
+
 	dh_installdocs
 	dh_installchangelogs
 	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -N $(library)
-	dh_makeshlibs -p $(library) -V 'libattr1 (>= 2.4.4-1)'
+	dh_makeshlibs -p $(library) -V 'libattr1 (>= 2.4.41-1)'
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..a87657d
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+ftp://oss.sgi.com/projects/xfs/cmd_tars/ attr_([\d]+[\d\.]*)-[\d].tar.gz