summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanilo Šegan <danilo@segan.org>2012-02-05 10:19:32 +0100
committerDanilo Šegan <danilo@segan.org>2012-02-05 10:19:32 +0100
commit62b1c0f84c66341f24ba5715967704b15c4c288f (patch)
treec814b2094a17dab6a69e9ad140e8db07a370f3e1
parentfccf0a23a007d2593adc83877c9676179443e531 (diff)
parente603276a2502c048ca3c78ce40e35530d2f72101 (diff)
downloadintltool-62b1c0f84c66341f24ba5715967704b15c4c288f.tar.gz
Fix #924386: include ChangeLog in dist tarballs and create a NEWS file.
-rw-r--r--Makefile.am15
-rw-r--r--NEWS17
-rw-r--r--configure.ac2
3 files changed, 33 insertions, 1 deletions
diff --git a/Makefile.am b/Makefile.am
index 55ef7ad..f1c3d58 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -26,7 +26,9 @@ CLEANFILES = \
EXTRA_DIST = \
$(distributed_scripts:=.in) \
- intltool-prepare.in
+ intltool-prepare.in \
+ NEWS \
+ ChangeLog
edit = sed -e 's|[@]PACKAGE@|$(PACKAGE)|g' \
-e 's|[@]VERSION@|$(VERSION)|g' \
@@ -36,3 +38,14 @@ edit = sed -e 's|[@]PACKAGE@|$(PACKAGE)|g' \
%: %.in Makefile
$(edit) < $< > $@
chmod +x $@
+
+ChangeLog:
+ @if test -z "$(BZR)"; then \
+ echo "bzr is required for generating the ChangeLog."; \
+ exit 1; \
+ elif test ! -d "$(srcdir)/.bzr"; then \
+ echo "ChangeLog can only be generated in a check-out."; \
+ exit 1; \
+ else \
+ $(BZR) log > $@; \
+ fi
diff --git a/NEWS b/NEWS
new file mode 100644
index 0000000..2d78f1c
--- /dev/null
+++ b/NEWS
@@ -0,0 +1,17 @@
+intltool 0.50.1
+===============
+
+intltool 0.50.1 is a minor release with the following improvements:
+
+ * Support AM_SILENT_RULES (#402516).
+ Patch contributed by Hib Eris (https://launchpad.net/~hiberis).
+
+ * Improve support for extracting messages from GSettings files (#922685).
+ Patch contributed by Ryan Lortie (https://launchpad.net/~desrt).
+
+ * Support attribute tag extraction for Glade/GtkBuilder files (#923841).
+ Patch contributed by Ryan Lortie (https://launchpad.net/~desrt).
+
+ * Start including a ChangeLog in tarballs and provide a NEWS file (#924386).
+ This introduces a soft dependency on "bzr": it's only required for
+ maintainers who wish to regenerate a ChangeLog file from the bzr checkout.
diff --git a/configure.ac b/configure.ac
index e558650..d59d191 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,6 +29,8 @@ if `$PERL -e "require XML::Parser" 2>/dev/null`; then
else
AC_MSG_ERROR([XML::Parser perl module is required for intltool])
fi
+AC_PATH_PROG(BZR, bzr)
+
AC_CONFIG_FILES([
Makefile