--- attr-2.4.43.orig/Makefile
+++ attr-2.4.43/Makefile
@@ -41,7 +41,6 @@
 		--bindir=/usr/bin \
 		--libdir=/lib \
 		--libexecdir=/usr/lib \
-		--enable-lib64=yes \
 		--includedir=/usr/include \
 		--mandir=/usr/share/man \
 		--datadir=/usr/share \
--- attr-2.4.43.orig/debian/control
+++ attr-2.4.43/debian/control
@@ -1,10 +1,11 @@
 Source: attr
 Section: utils
 Priority: optional
-Maintainer: Nathan Scott <nathans@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-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
+Build-Depends: autoconf, debhelper (>= 7), gettext, automake, libtool
+Standards-Version: 3.8.2
 Homepage: http://oss.sgi.com/projects/xfs/
 
 Package: attr
--- attr-2.4.43.orig/debian/changelog
+++ attr-2.4.43/debian/changelog
@@ -1,3 +1,43 @@
+attr (1:2.4.43-3ubuntu1~cross2) karmic; urgency=low
+
+  * Force configure to be run with the proper environment variables.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 19 Oct 2009 14:39:09 +0100
+
+attr (1:2.4.43-3ubuntu1~cross1) karmic; urgency=low
+
+  * Support cross-building, based on a patch from Neil Williams in Debian
+    #284044:
+    - Pass --build and (if cross-building) --host to configure.
+    - Run autoreconf in debian/rules, taking care to preserve our
+      install-sh.
+    - Build-depend on automake, for aclocal.
+
+ -- Colin Watson <cjwatson@ubuntu.com>  Mon, 19 Oct 2009 14:01:28 +0100
+
+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
--- attr-2.4.43.orig/debian/rules
+++ attr-2.4.43/debian/rules
@@ -4,6 +4,13 @@
 develop = lib$(package)1-dev
 library = lib$(package)1
 
+DEB_BUILD_GNU_TYPE  = $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
+DEB_HOST_GNU_TYPE   = $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
+export LOCAL_CONFIGURE_OPTIONS = --build=$(DEB_BUILD_GNU_TYPE)
+ifneq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
+LOCAL_CONFIGURE_OPTIONS += --host=$(DEB_HOST_GNU_TYPE)
+endif
+
 dirme  = debian/$(package)
 dirdev = debian/$(develop)
 dirlib = debian/$(library)
@@ -28,6 +35,11 @@
 .census:
 	@echo "== dpkg-buildpackage: configure" 1>&2
 	$(checkdir)
+	# Keep our own install-sh.
+	cp -a install-sh install-sh.safe
+	AUTOHEADER=true autoreconf -i -I m4
+	mv install-sh.safe install-sh
+	rm -f configure # force the following to run
 	$(options) $(MAKE) configure
 	touch .census
 
@@ -38,6 +50,7 @@
 	$(MAKE) distclean
 	-rm -rf $(dirme) $(dirdev) $(dirlib) debian/tmp
 	-rm -f debian/*substvars debian/files* debian/*.debhelper
+	-rm -f config.guess config.sub ltmain.sh
 
 binary-indep:
 
@@ -50,6 +63,9 @@
 	$(pkglib) $(MAKE) -C . install-lib
 	$(pkgme)  $(MAKE) -C build src-manifest
 
+	sed "s/^libdir='\/lib'$$/libdir='\/usr\/lib'/" $(dirdev)/usr/lib/libattr.la > $(dirdev)/usr/lib/libattr.la.new
+	mv $(dirdev)/usr/lib/libattr.la.new $(dirdev)/usr/lib/libattr.la
+
 	-rm -rf $(dirdev)/usr/share/doc/attr
 	-rm -rf $(dirlib)/usr/share/doc/attr
 
--- attr-2.4.43.orig/debian/compat
+++ attr-2.4.43/debian/compat
@@ -1 +1 @@
-5
+7
--- attr-2.4.43.orig/setfattr/setfattr.c
+++ attr-2.4.43/setfattr/setfattr.c
@@ -66,8 +66,11 @@
 
 const char *strerror_ea(int err)
 {
+#ifdef __linux__
+	/* The Linux kernel does not define ENOATTR, but maps it to ENODATA. */
 	if (err == ENODATA)
 		return _("No such attribute");
+#endif
 	return strerror(err);
 }
 
--- attr-2.4.43.orig/getfattr/getfattr.c
+++ attr-2.4.43/getfattr/getfattr.c
@@ -93,8 +93,11 @@
 
 const char *strerror_ea(int err)
 {
+#ifdef __linux__
+	/* The Linux kernel does not define ENOATTR, but maps it to ENODATA. */
 	if (err == ENODATA)
 		return _("No such attribute");
+#endif
 	return strerror(err);
 }