Update attr package to better integrate into the Ubuntu localisation up-to-dated-ness tracking system (Rosetta).

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

9 files changed, 45 insertions, 195 deletions

diff --git a/VERSION b/VERSION
index ab6482c..2b18c21 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
 #
 PKG_MAJOR=2
 PKG_MINOR=4
-PKG_REVISION=32
+PKG_REVISION=33
 PKG_BUILD=0
diff --git a/aclocal.m4 b/aclocal.m4
index eada4b1..1f8a578 100644
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -41,7 +41,7 @@ dnl From Bruno Haible.
 
 dnl AC_MULTILIB creates a variable libdirsuffix, containing
 dnl the suffix of the libdir, either "" or "64".
-dnl Only do this if enable param is yes.
+dnl Only do this if the given enable parameter is "yes".
 AC_DEFUN([AC_MULTILIB],
 [
   dnl There is no formal standard regarding lib and lib64. The current
@@ -121,7 +121,7 @@ AC_DEFUN([AC_PACKAGE_GLOBALS],
 
 #
 # Check for specified utility (env var) - if unset, fail.
-# 
+#
 AC_DEFUN([AC_PACKAGE_NEED_UTILITY],
   [ if test -z "$2"; then
         echo
@@ -135,7 +135,7 @@ AC_DEFUN([AC_PACKAGE_NEED_UTILITY],
 # Generic macro, sets up all of the global build variables.
 # The following environment variables may be set to override defaults:
 #  CC MAKE LIBTOOL TAR ZIP MAKEDEPEND AWK SED ECHO SORT
-#  MSGFMT MSGMERGE RPM
+#  MSGFMT MSGMERGE XGETTEXT RPM
 #
 AC_DEFUN([AC_PACKAGE_UTILITIES],
   [ AC_PROG_CC
@@ -222,6 +222,13 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
         msgmerge=$MSGMERGE
         AC_SUBST(msgmerge)
         AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
+
+        if test -z "$XGETTEXT"; then
+                AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+        fi
+        xgettext=$XGETTEXT
+        AC_SUBST(xgettext)
+        AC_PACKAGE_NEED_UTILITY($1, "$xgettext", xgettext, gettext)
     fi
 
     if test -z "$RPM"; then
diff --git a/debian/changelog b/debian/changelog
index d0f1b0f..217b5b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+attr (2.4.33-1) unstable; urgency=low
+
+  * New upstream release
+
+ -- Nathan Scott <nathans@debian.org>  Mon, 03 Jul 2006 10:08:43 +1000
+
 attr (2.4.32-1) unstable; urgency=low
 
   * New upstream release
diff --git a/doc/CHANGES b/doc/CHANGES
index e410bdd..6541b8e 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,3 +1,9 @@
+attr-2.4.33 (03 July 2006)
+	- Update translation Makefile to work better with the Ubuntu
+	  translation system.  Thanks to feedback from Martin Pitt.
+	- Fix annoying "ignores datarootdir" warning from configure.
+	- Fix issues with makedepend build infrastructure.
+
 attr-2.4.32 (28 March 2006)
 	- Debian packaging updates (libc-dev dependency fixed)
 	- Enable -O2 optimised builds by default
diff --git a/include/builddefs.in b/include/builddefs.in
index 634ee35..0ee49db 100644
--- a/include/builddefs.in
+++ b/include/builddefs.in
@@ -17,6 +17,7 @@ LIBMISC = $(TOPDIR)/libmisc/libmisc.la
 
 prefix = @prefix@
 exec_prefix = @exec_prefix@
+datarootdir = @datarootdir@
 
 PKG_NAME	= @pkg_name@
 PKG_USER	= @pkg_user@
@@ -48,6 +49,7 @@ MAKEDEPEND	= @makedepend@
 
 MSGFMT		= @msgfmt@
 MSGMERGE	= @msgmerge@
+XGETTEXT	= @xgettext@
 
 RPM		= @rpm@
 RPMBUILD	= @rpmbuild@
diff --git a/include/buildrules b/include/buildrules
index f721283..41aaef5 100644
--- a/include/buildrules
+++ b/include/buildrules
@@ -35,15 +35,15 @@ $(LTLIBRARY) : $(SUBDIRS) $(LTOBJECTS)
 	$(LTCOMPILE) -c $<
 endif
 
-ifdef LINGUAS
+ifdef POTHEAD
 %.pot: $(XGETTEXTFILES)
-	xgettext --omit-header --language=C --keyword=_ -o $@ $(XGETTEXTFILES)
+	$(XGETTEXT) --language=C --keyword=_ -o $@ $(XGETTEXTFILES)
 
-%.po:
-	$(MSGMERGE) -o $@.tmpo $@ $(PKG_NAME).pot
-	@if ! diff $@.tmpo $@ >/dev/null; then \
-		echo "$@ is out of date, see $@.tmpo"; \
-	fi
+# Generate temp .po files, to check whether translations need updating.
+# Not by default, due to gettext output differences between versions.
+%.po: $(POTHEAD)
+#	$(MSGMERGE) -o $@.tmpo $@ $(POTHEAD)
+#	if ! diff $@.tmpo $@ >/dev/null; then echo "$@ dated, see $@.tmpo"; fi
 
 %.mo: %.po
 	$(MSGFMT) -o $@ $<
diff --git a/m4/package_utilies.m4 b/m4/package_utilies.m4
index c034a7c..fa66f95 100644
--- a/m4/package_utilies.m4
+++ b/m4/package_utilies.m4
@@ -1,6 +1,6 @@
 #
 # Check for specified utility (env var) - if unset, fail.
-# 
+#
 AC_DEFUN([AC_PACKAGE_NEED_UTILITY],
   [ if test -z "$2"; then
         echo
@@ -14,7 +14,7 @@ AC_DEFUN([AC_PACKAGE_NEED_UTILITY],
 # Generic macro, sets up all of the global build variables.
 # The following environment variables may be set to override defaults:
 #  CC MAKE LIBTOOL TAR ZIP MAKEDEPEND AWK SED ECHO SORT
-#  MSGFMT MSGMERGE RPM
+#  MSGFMT MSGMERGE XGETTEXT RPM
 #
 AC_DEFUN([AC_PACKAGE_UTILITIES],
   [ AC_PROG_CC
@@ -101,6 +101,13 @@ AC_DEFUN([AC_PACKAGE_UTILITIES],
         msgmerge=$MSGMERGE
         AC_SUBST(msgmerge)
         AC_PACKAGE_NEED_UTILITY($1, "$msgmerge", msgmerge, gettext)
+
+        if test -z "$XGETTEXT"; then
+                AC_PATH_PROG(XGETTEXT, xgettext,, /usr/bin:/usr/local/bin:/usr/freeware/bin)
+        fi
+        xgettext=$XGETTEXT
+        AC_SUBST(xgettext)
+        AC_PACKAGE_NEED_UTILITY($1, "$xgettext", xgettext, gettext)
     fi
 
     if test -z "$RPM"; then
diff --git a/po/Makefile b/po/Makefile
index d4cd0da..94cc6c0 100644
--- a/po/Makefile
+++ b/po/Makefile
@@ -5,8 +5,10 @@
 TOPDIR = ..
 include $(TOPDIR)/include/builddefs
 
+POTHEAD = $(PKG_NAME).pot
 LINGUAS = de fr nl pl sv
-LSRCFILES = $(LINGUAS:%=%.po) $(PKG_NAME).pot
+LSRCFILES = $(LINGUAS:%=%.po) $(POTHEAD)
+LDIRT = $(POTHEAD)
 
 XGETTEXTFILES =	$(TOPDIR)/attr/attr.c \
 		$(TOPDIR)/getfattr/getfattr.c \
@@ -14,7 +16,7 @@ XGETTEXTFILES =	$(TOPDIR)/attr/attr.c \
 		$(TOPDIR)/libattr/attr_copy_fd.c \
 		$(TOPDIR)/libattr/attr_copy_file.c
 
-default: $(LINGUAS:%=%.mo)
+default: $(POTHEAD) $(LINGUAS:%=%.mo)
 
 include $(BUILDRULES)
 
diff --git a/po/attr.pot b/po/attr.pot
deleted file mode 100644
index 5fb8455..0000000
--- a/po/attr.pot
+++ /dev/null
@@ -1,180 +0,0 @@
-#: ../attr/attr.c:46
-#, c-format
-msgid ""
-"Usage: %s [-LRSq] -s attrname [-V attrvalue] pathname  # set value\n"
-"       %s [-LRSq] -g attrname pathname                 # get value\n"
-"       %s [-LRSq] -r attrname pathname                 # remove attr\n"
-"       %s [-LRq]  -l pathname                          # list attrs \n"
-"      -s reads a value from stdin and -g writes a value to stdout\n"
-msgstr ""
-
-#: ../attr/attr.c:83 ../attr/attr.c:100 ../attr/attr.c:109 ../attr/attr.c:118
-#, c-format
-msgid "Only one of -s, -g, -r, or -l allowed\n"
-msgstr ""
-
-#: ../attr/attr.c:91
-#, c-format
-msgid "-V only allowed with -s\n"
-msgstr ""
-
-#: ../attr/attr.c:136
-#, c-format
-msgid "Unrecognized option: %c\n"
-msgstr ""
-
-#: ../attr/attr.c:143
-#, c-format
-msgid "A filename to operate on is required\n"
-msgstr ""
-
-#: ../attr/attr.c:171
-#, c-format
-msgid "Could not set \"%s\" for %s\n"
-msgstr ""
-
-#: ../attr/attr.c:176
-#, c-format
-msgid "Attribute \"%s\" set to a %d byte value for %s:\n"
-msgstr ""
-
-#: ../attr/attr.c:194
-#, c-format
-msgid "Could not get \"%s\" for %s\n"
-msgstr ""
-
-#: ../attr/attr.c:199
-#, c-format
-msgid "Attribute \"%s\" had a %d byte value for %s:\n"
-msgstr ""
-
-#: ../attr/attr.c:212
-#, c-format
-msgid "Could not remove \"%s\" for %s\n"
-msgstr ""
-
-#: ../attr/attr.c:230
-#, c-format
-msgid "Could not list \"%s\" for %s\n"
-msgstr ""
-
-#: ../attr/attr.c:240
-#, c-format
-msgid "Attribute \"%s\" has a %d byte value for %s\n"
-msgstr ""
-
-#: ../attr/attr.c:252
-#, c-format
-msgid "At least one of -s, -g, -r, or -l is required\n"
-msgstr ""
-
-#: ../getfattr/getfattr.c:98 ../setfattr/setfattr.c:70
-msgid "No such attribute"
-msgstr ""
-
-#: ../getfattr/getfattr.c:256
-#, c-format
-msgid "%s: Removing leading '/' from absolute path names\n"
-msgstr ""
-
-#: ../getfattr/getfattr.c:394
-#, c-format
-msgid "%s %s -- get extended attributes\n"
-msgstr ""
-
-#: ../getfattr/getfattr.c:396 ../setfattr/setfattr.c:175
-#, c-format
-msgid "Usage: %s %s\n"
-msgstr ""
-
-#: ../getfattr/getfattr.c:399
-#, c-format
-msgid ""
-"  -n, --name=name         get the named extended attribute value\n"
-"  -d, --dump              get all extended attribute values\n"
-"  -e, --encoding=...      encode values (as 'text', 'hex' or 'base64')\n"
-"      --match=pattern     only get attributes with names matching pattern\n"
-"      --only-values       print the bare values only\n"
-"  -h, --no-dereference    do not dereference symbolic links\n"
-"      --absolute-names    don't strip leading '/' in pathnames\n"
-"  -R, --recursive         recurse into subdirectories\n"
-"  -L, --logical           logical walk, follow symbolic links\n"
-"  -P  --physical          physical walk, do not follow symbolic links\n"
-"      --version           print version and exit\n"
-"      --help              this help text\n"
-msgstr ""
-
-#: ../getfattr/getfattr.c:496
-#, c-format
-msgid "%s: invalid regular expression \"%s\"\n"
-msgstr ""
-
-#: ../getfattr/getfattr.c:514
-#, c-format
-msgid ""
-"Usage: %s %s\n"
-"Try `%s --help' for more information.\n"
-msgstr ""
-
-#: ../setfattr/setfattr.c:123
-#, c-format
-msgid "%s: %s: No filename found in line %d, aborting\n"
-msgstr ""
-
-#: ../setfattr/setfattr.c:127
-#, c-format
-msgid "%s: No filename found in line %d of standard input, aborting\n"
-msgstr ""
-
-#: ../setfattr/setfattr.c:174
-#, c-format
-msgid "%s %s -- set extended attributes\n"
-msgstr ""
-
-#: ../setfattr/setfattr.c:176
-#, c-format
-msgid "       %s %s\n"
-msgstr ""
-
-#: ../setfattr/setfattr.c:178
-#, c-format
-msgid ""
-"  -n, --name=name         set the value of the named extended attribute\n"
-"  -x, --remove=name       remove the named extended attribute\n"
-"  -v, --value=value       use value as the attribute value\n"
-"  -h, --no-dereference    do not dereference symbolic links\n"
-"      --restore=file      restore extended attributes\n"
-"      --version           print version and exit\n"
-"      --help              this help text\n"
-msgstr ""
-
-#: ../setfattr/setfattr.c:253
-#, c-format
-msgid ""
-"Usage: %s %s\n"
-"       %s %s\n"
-"Try `%s --help' for more information.\n"
-msgstr ""
-
-#: ../libattr/attr_copy_fd.c:82 ../libattr/attr_copy_fd.c:97
-#: ../libattr/attr_copy_file.c:80 ../libattr/attr_copy_file.c:95
-#, c-format
-msgid "listing attributes of %s"
-msgstr ""
-
-#: ../libattr/attr_copy_fd.c:118 ../libattr/attr_copy_fd.c:135
-#: ../libattr/attr_copy_file.c:116 ../libattr/attr_copy_file.c:133
-#, c-format
-msgid "getting attribute %s of %s"
-msgstr ""
-
-#: ../libattr/attr_copy_fd.c:148 ../libattr/attr_copy_fd.c:166
-#: ../libattr/attr_copy_file.c:145 ../libattr/attr_copy_file.c:164
-#, c-format
-msgid "setting attributes for %s"
-msgstr ""
-
-#: ../libattr/attr_copy_fd.c:154 ../libattr/attr_copy_file.c:152
-#, c-format
-msgid "setting attribute %s for %s"
-msgstr ""