summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--VERSION2
-rw-r--r--debian/changelog7
-rw-r--r--doc/CHANGES6
-rw-r--r--include/buildrules9
4 files changed, 19 insertions, 5 deletions
diff --git a/VERSION b/VERSION
index 3d294f9..defdf95 100644
--- a/VERSION
+++ b/VERSION
@@ -3,5 +3,5 @@
#
PKG_MAJOR=2
PKG_MINOR=4
-PKG_REVISION=4
+PKG_REVISION=5
PKG_BUILD=0
diff --git a/debian/changelog b/debian/changelog
index 09bdd26..ab3496d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+attr (2.4.5-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed the need to always run msgmerge during the build
+
+ -- Nathan Scott <nathans@debian.org> Thu, 03 Jul 2003 12:47:44 +1000
+
attr (2.4.4-1) unstable; urgency=low
* New upstream release
diff --git a/doc/CHANGES b/doc/CHANGES
index 6179016..93ea44f 100644
--- a/doc/CHANGES
+++ b/doc/CHANGES
@@ -1,4 +1,8 @@
-attr-2.4.4 (04 Junel 2003)
+attr-2.4.5 (03 July 2003)
+ - Tweak the build so we don't always run msgmerge,
+ fix from Steve Langasek originally.
+
+attr-2.4.4 (04 June 2003)
- Some Debian-specific packaging updates.
attr-2.4.3 (26 April 2003)
diff --git a/include/buildrules b/include/buildrules
index 5ef98c1..cecb4c9 100644
--- a/include/buildrules
+++ b/include/buildrules
@@ -59,10 +59,13 @@ ifdef LINGUAS
%.pot: $(XGETTEXTFILES)
xgettext --omit-header --language=C --keyword=_ -o $@ $(XGETTEXTFILES)
-%.tmpo: %.po
- $(MSGMERGE) -o $@ $< $(PKG_NAME).pot
+%.po: $(PKG_NAME).pot
+ $(MSGMERGE) -o $@.tmpo $@ $<
+ @if ! diff $@.tmpo $@ >/dev/null; then \
+ echo "$@ is out of date, see $@.tmpo"; \
+ fi
-%.mo: %.tmpo
+%.mo: %.po
$(MSGFMT) -o $@ $<
endif