Replaced debian-dir

10 files changed, 172 insertions, 14 deletions

diff --git a/debian/changelog b/debian/changelog
index 21931e0..e92ce93 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,106 @@
+attr (1:2.4.46-5) unstable; urgency=low
+
+  * Add Debian epoch version to shlibs dependency.
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Sat, 03 Dec 2011 22:04:54 +1100
+
+attr (1:2.4.46-4) unstable; urgency=low
+
+  * Mark libattr1-dev Multi-Arch: same
+    Patch by Steve Langasek
+    Closes: 647855
+  * Build if autconf2.13 is installed
+    Add 12-643587-attr-autoconf-version-check.patch
+    Patch by Wookey
+    Closes: 643587
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Sat, 03 Dec 2011 21:25:23 +1100
+
+attr (1:2.4.46-3) unstable; urgency=medium
+
+  * libattr1: Don't pass "-Zbzip2 -z9" to dpkg-deb
+    Closes: 634090
+  * Don't ship .la files
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Sun, 17 Jul 2011 12:19:48 +1000
+
+attr (1:2.4.46-2) unstable; urgency=low
+
+  * Append 'libattr 1 libattr1 (>= 2.4.46-2)' to
+    debian/libattr1/DEBIAN/shlibs
+  * Remove debian/{attr,libattr1,libattr1-dev}.debhelper.log
+  * Set standards-version to 3.9.2
+  * Pass "-Zbzip2 -z9" to dpkg-deb
+  * Fix debian-rules-missing-recommended-target
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Mon, 04 Jul 2011 21:29:12 +1000
+
+attr (1:2.4.46-1) unstable; urgency=low
+
+  * New upstream release (Closes: #626622).
+  - All patches are incorporated upstream.
+  * Add multiarch support (Closes: #528141).
+
+ -- Luk Claes <luk@debian.org>  Fri, 24 Jun 2011 07:37:19 +0200
+
+attr (1:2.4.44-3) unstable; urgency=medium
+
+  * Add myself as comaintainer
+  * Use bash in build process (Closes: #621927)
+  * Pass host & build to allow cross builds to succeed (Closes: #284044) 
+
+ -- Luk Claes <luk@debian.org>  Sat, 28 May 2011 15:48:08 +0200
+
+attr (1:2.4.44-2) unstable; urgency=low
+
+  * Source format is 3.0 (quilt)
+  * Add upstream patches 
+    02-fix_memory_leak_in_attr_copy_action.patch
+    03-pull_in_string.h.patch
+    05-eliminate_a_memory_leak.patch
+    06-eliminate_a_double_free.patch
+    07-fix_thinko_in_restore.patch
+  * Fix debhelper-but-no-misc-depends
+  * Fix out-of-date-standards-version
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Tue, 08 Jun 2010 13:58:30 +1000
+
+attr (1:2.4.44-1) unstable; urgency=low
+
+  * New upstream release
+  * Fix out-of-date-standards-version
+  * Fix copyright-refers-to-versionless-license-file
+  * Update homepage in debian/control
+  * Add Vcs-Git and Vcs-Browser to debian/control
+  * Update download page in debian/copyright
+  * Update debian/watch
+  * Add automake as a build-dependency
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Tue, 25 Aug 2009 11:23:53 +1000
+
+attr (1:2.4.43-3) unstable; urgency=low
+
+  [ Cyril Brulebois ]
+  * Backport the following fix by Petr Salinger from upstream to fix
+    FTBFS on GNU/kFreeBSD (Closes: #531950): [git commit b4636a4e9e]
+    On Linux, ENOATTR aliases to ENODATA. On other operating systems
+    like Irix and BSD*, ENOATTR is a separate error number. Therefore,
+    protect the check on “err == ENODATA” with “#ifdef __linux__” in
+    strerror_ea() in both getfattr/getfattr.c and setfattr/setfattr.c
+
+  [ Anibal Monsalve Salazar ]
+  * Standards version is 3.8.2
+  * DH compatibility level is 7
+  * Fix "incorrect-libdir-in-la-file usr/lib/libattr.la /lib != /usr/lib"
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Sat, 27 Jun 2009 00:29:24 +1000
+
+attr (1:2.4.43-2) unstable; urgency=high
+
+  * Remove --enable-lib64=yes in Makefile (closes: #514017)
+
+ -- Anibal Monsalve Salazar <anibal@debian.org>  Tue, 10 Feb 2009 20:32:30 +1100
+
 attr (1:2.4.43-1) unstable; urgency=low
 
   * New upstream release
diff --git a/debian/compat b/debian/compat
index 7ed6ff8..7f8f011 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-5
+7
diff --git a/debian/control b/debian/control
index 5614da9..126775c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,16 +1,19 @@
 Source: attr
 Section: utils
 Priority: optional
-Maintainer: Nathan Scott <nathans@debian.org>
-Uploaders: Niv Sardi <xaiki@debian.org>, Anibal Monsalve Salazar <anibal@debian.org>
-Build-Depends: autoconf, debhelper (>= 5), gettext, libtool
-Standards-Version: 3.8.0
-Homepage: http://oss.sgi.com/projects/xfs/
+Maintainer: Anibal Monsalve Salazar <anibal@debian.org>
+Uploaders: Nathan Scott <nathans@debian.org>, Luk Claes <luk@debian.org>
+Build-Depends: autoconf, automake, debhelper (>= 8.1.3), gettext, libtool
+Standards-Version: 3.9.2
+Homepage: http://savannah.nongnu.org/projects/attr/
+Vcs-Git: git://git.savannah.nongnu.org/attr.git
+Vcs-Browser: http://git.savannah.gnu.org/cgit/attr.git
 
 Package: attr
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Conflicts: xfsdump (<< 2.0.0)
 Architecture: any
+Multi-Arch: foreign
 Description: Utilities for manipulating filesystem extended attributes
  A set of tools for manipulating extended attributes on filesystem
  objects, in particular getfattr(1) and setfattr(1).
@@ -20,11 +23,12 @@ Description: Utilities for manipulating filesystem extended attributes
 Package: libattr1-dev
 Section: libdevel
 Priority: extra
-Depends: libc6-dev | libc-dev, libattr1 (= ${binary:Version})
+Depends: ${misc:Depends}, libc6-dev | libc-dev, libattr1 (= ${binary:Version})
 Provides: attr-dev
 Replaces: attr-dev
 Conflicts: attr-dev, attr (<< 2.0.0)
 Architecture: any
+Multi-Arch: same
 Description: Extended attribute static libraries and headers
  attr-dev contains the libraries and header files needed to develop
  programs which make use of extended attributes.  For Linux programs,
@@ -41,6 +45,8 @@ Section: libs
 Priority: required
 Conflicts: attr (<< 2.0.0)
 Architecture: any
+Multi-Arch: same
+Pre-Depends: ${misc:Pre-Depends}
 Description: Extended attribute shared library
  Contains the runtime environment required by programs that make use
  of extended attributes.
diff --git a/debian/copyright b/debian/copyright
index ef9f486..0289a27 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,7 +1,7 @@
 This package was debianized by Nathan Scott nathans@debian.org on
 Sun, 19 Nov 2000 07:37:09 -0500.
 
-It can be downloaded from ftp://oss.sgi.com/projects/xfs/download/
+It can be downloaded from http://download.savannah.gnu.org/releases-noredirect/attr/
 
 Copyright:
 
@@ -16,4 +16,4 @@ for the complete text of the GNU Lesser General Public License.
 Certain components (as annotated in the source) are licensed
 under version 2 of the terms of the GNU General Public License.
 On Debian systems, the complete text of the GNU General Public
-License can be found in /usr/share/common-licenses/GPL file.
+License can be found in /usr/share/common-licenses/GPL-2 file.
diff --git a/debian/patches/12-643587-attr-autoconf-version-check.patch b/debian/patches/12-643587-attr-autoconf-version-check.patch
new file mode 100644
index 0000000..6941ea0
--- /dev/null
+++ b/debian/patches/12-643587-attr-autoconf-version-check.patch
@@ -0,0 +1,20 @@
+http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=643587
+
+Description: Fix for incompatibility with autoconf2.13
+ This package will not build if autconf2.13 is installed.
+ Adding AC_PREREQ allows the automatic checks to run the correct
+ version of autconf, whichever is installed, or to get a clear error
+ message about the problem.
+ 
+Author: Wookey <wookey@linaro.org>
+
+--- attr-2.4.44.orig/configure.in
++++ attr-2.4.44/configure.in
+@@ -13,6 +13,7 @@
+ # You should have received a copy of the GNU General Public License
+ # along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ #
++AC_PREREQ([2.59])
+ AC_INIT(include/attributes.h)
+ AC_CONFIG_AUX_DIR([.])
+ AC_CONFIG_MACRO_DIR([m4])
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..610bb4a
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+12-643587-attr-autoconf-version-check.patch
diff --git a/debian/rules b/debian/rules
index 1267c96..e9e6e5b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,7 @@
 #!/usr/bin/make -f
 
+export DH_VERBOSE=1
+
 package = attr
 develop = lib$(package)1-dev
 library = lib$(package)1
@@ -13,9 +15,24 @@ pkglib = DIST_ROOT=`pwd`/$(dirlib); export DIST_ROOT;
 stdenv = @GZIP=-q; export GZIP;
 
 options = export DEBUG=-DNDEBUG DISTRIBUTION=debian \
-	  INSTALL_USER=root INSTALL_GROUP=root ;
+	  INSTALL_USER=root INSTALL_GROUP=root \
+	  CONFIG_SHELL=/bin/bash ;
 checkdir = test -f debian/rules
 
+DEB_HOST_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+ifneq ($(DEB_BUILD_GNU_TYPE), $(DEB_HOST_GNU_TYPE))
+        LOCAL_CONFIGURE_OPTIONS += --host $(DEB_HOST_GNU_TYPE) --build $(DEB_BUILD_GNU_TYPE)
+endif
+
+LOCAL_CONFIGURE_OPTIONS += \
+		--libdir=/lib/$(DEB_HOST_MULTIARCH) \
+		--libexecdir=/usr/lib/$(DEB_HOST_MULTIARCH)
+
+build-arch: build
+build-indep: build
 build: built
 built: config
 	@echo "== dpkg-buildpackage: build" 1>&2
@@ -28,7 +45,7 @@ config: .census
 .census:
 	@echo "== dpkg-buildpackage: configure" 1>&2
 	$(checkdir)
-	$(options) $(MAKE) configure
+	$(options) $(MAKE) configure LOCAL_CONFIGURE_OPTIONS="$(LOCAL_CONFIGURE_OPTIONS)"
 	touch .census
 
 clean:
@@ -50,8 +67,14 @@ binary-arch: checkroot built
 	$(pkglib) $(MAKE) -C . install-lib
 	$(pkgme)  $(MAKE) -C build src-manifest
 
+	rm -f $(dirdev)/usr/lib/$(DEB_HOST_MULTIARCH)/libattr.la
+	rm -f $(dirdev)/lib/$(DEB_HOST_MULTIARCH)/libattr.la
+
 	-rm -rf $(dirdev)/usr/share/doc/attr
 	-rm -rf $(dirlib)/usr/share/doc/attr
+	-rm -rf $(dirlib)/usr/share/locale
+	-rm -rf $(dirlib)/usr/share/man
+	-rm -rf $(dirlib)/usr/bin
 
 	dh_installdocs
 	dh_installchangelogs
@@ -59,13 +82,15 @@ binary-arch: checkroot built
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -N $(library)
-	dh_makeshlibs -p $(library) -V 'libattr1 (>= 2.4.41-1)'
+	dh_makeshlibs -p $(library) -V 'libattr1 (>= 1:2.4.46-5)'
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
 
 	dh_md5sums
-	dh_builddeb
+	dh_builddeb -p$(package) -- -Zbzip2 -z9
+	dh_builddeb -p$(develop) -- -Zbzip2 -z9
+	dh_builddeb -p$(library)
 
 binary: binary-indep binary-arch
 
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/source/options b/debian/source/options
new file mode 100644
index 0000000..779dbfd
--- /dev/null
+++ b/debian/source/options
@@ -0,0 +1,2 @@
+compression = "bzip2"
+compression-level = 9
diff --git a/debian/watch b/debian/watch
index a87657d..69fa8b0 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
 version=3
-ftp://oss.sgi.com/projects/xfs/cmd_tars/ attr_([\d]+[\d\.]*)-[\d].tar.gz
+http://download.savannah.gnu.org/releases-noredirect/attr/ attr-([\d]+[\d\.]*).src.tar.gz