Switch to automatically generating the ChangeLog file

Keep the old ChangeLog files as ChangeLog.old, and distribute them. Automatically genereate the ChangeLog from “git log”. And update the information for translators.
davidben · Mar 2, 2009 · 1a0b8ad · 1a0b8ad
1 parent 883b6e8
commit 1a0b8ad
Show file tree

Hide file tree

Showing 13 changed files with 29 additions and 34 deletions.
diff --git a/.gitignore b/.gitignore
@@ -10,6 +10,7 @@ autom4te.cache/
 build-tree/
 config/
 ABOUT-NLS
+ChangeLog
 INSTALL
 configure
 config.*

diff --git a/ChangeLog → ChangeLog.old b/ChangeLog → ChangeLog.old
diff --git a/Makefile.am b/Makefile.am
@@ -23,6 +23,7 @@ ACLOCAL_AMFLAGS = -I m4
 dist_pkgdata_DATA = cputable ostable triplettable
 
 EXTRA_DIST = \
+	ChangeLog.old \
 	README.api \
 	README.feature-removal-schedule \
 	README.translators \
@@ -56,6 +57,11 @@ EXTRA_DIST = \
 	debian/shlibs.default \
 	debian/shlibs.override
 
+.PHONY: ChangeLog
+
+ChangeLog:
+	git log -C --stat 1.15.0.. >$@
+
 # If we create the dist tarball from the git repository, make sure
 # that we're not forgetting some files...
 dist-hook:

diff --git a/README.translators b/README.translators
@@ -1,35 +1,10 @@
 Translators, when adding/updating your translation files, please follow
 the following rules:
 
-* Update debian/changelog and one of po/ChangeLog, dselect/po/ChangeLog,
-  scripts/po/ChangeLog or man/po/ChangeLog:
+* Update debian/changelog:
 
-  - Beware the you should NOT update the main ChangeLog file
-    for translation updates. Use the ChangeLog in the relevant
-    subdirectory instead.
-
-  - The format of entries in the subdirectories' ChangeLog is strict:
-
-==========================================================
-2006-02-11  Christian Perrier  <[email protected]>
-
-	* fr.po: Updated to 1011t.
-==========================================================
-
-    Note the date format AND the DOUBLE SPACE between the date and the
-    translator's email address.
-
-    Note also the TAB character before the entry. NOT multiple spaces.
-
-    Also note that the update should mention the file statistics as
-    XXXtYYYfZZZu.
-
-    "XXXt" means "XXX translated strings".
-    "YYYf" means "YYY fuzzy strings strings".
-    "ZZZu" means "ZZZ untranslated strings".
-    YYY or ZZZ may be omitted if they are null.
-
-    This file contents MUST be encoded in UTF-8.
+  - Beware the you should NOT update the any of the legacy ChangeLog.old
+    files for translation updates.
 
 * Format of entries in debian/changelog:
 
@@ -64,18 +39,25 @@ dpkg (1.13.15) unstable; urgency=low
 
 * Format of commit message
 
-  The formats above only apply to ChangeLog files and debian/changelog.
+  The formats above only apply to the debian/changelog file.
   They do not apply to the commit message. Following recommendations
   of http://wiki.debian.org/Teams/Dpkg/GitUsage you should start the
   commit message with a summary line, followed by an empty line and a
   a detailed/long description. For example:
 
 ==========================================================
-Updated german translation of manual pages
+Update german translation of manual pages
 
-	* man/po/fr.po: Updated to 1354t.
+Update to 1354t.
 ==========================================================
 
+  Note that the update should mention the file statistics as XXXtYYYfZZZu.
+
+  "XXXt" means "XXX translated strings".
+  "YYYf" means "YYY fuzzy strings strings".
+  "ZZZu" means "ZZZ untranslated strings".
+  YYY or ZZZ may be omitted if they are null.
+
 * Use of po/LINGUAS, dselect/po/LINGUAS or scripts/po/LINGUAS:
 
   When ADDING a new translation, don't forget adding the language to

diff --git a/debian/rules b/debian/rules
@@ -89,7 +89,7 @@ binary-arch: install
 	install -d debian/dpkg/sbin
 	mv debian/dpkg/usr/sbin/start-stop-daemon debian/dpkg/sbin
 
-	dh_installchangelogs -a ChangeLog
+	dh_installchangelogs -a ChangeLog ChangeLog.old
 	dh_installdocs -a
 	dh_link -a
 	dh_lintian -a
@@ -108,7 +108,7 @@ binary-indep: install
 	dh_testroot -i
 	dh_install --sourcedir=debian/tmp -i -XDpkg/Gettext.pm
 
-	dh_installchangelogs -i ChangeLog
+	dh_installchangelogs -i ChangeLog ChangeLog.old
 	dh_installdocs -i
 	dh_link -i
 	dh_lintian -i

diff --git a/dselect/po/ChangeLog → dselect/po/ChangeLog.old b/dselect/po/ChangeLog → dselect/po/ChangeLog.old
diff --git a/dselect/po/Makevars b/dselect/po/Makevars
@@ -39,3 +39,5 @@ MSGID_BUGS_ADDRESS = [email protected]
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+DISTFILES.extra1 = ChangeLog.old
diff --git a/man/Makefile.am b/man/Makefile.am
@@ -103,7 +103,7 @@ dist_man_MANS = \
 	update-alternatives.8
 
 EXTRA_DIST = \
-	po/ChangeLog \
+	po/ChangeLog.old \
 	po/po4a.cfg \
 	po/dpkg-man.pot
 

diff --git a/man/po/ChangeLog → man/po/ChangeLog.old b/man/po/ChangeLog → man/po/ChangeLog.old
diff --git a/po/ChangeLog → po/ChangeLog.old b/po/ChangeLog → po/ChangeLog.old
diff --git a/po/Makevars b/po/Makevars
@@ -39,3 +39,5 @@ MSGID_BUGS_ADDRESS = [email protected]
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+DISTFILES.extra1 = ChangeLog.old
diff --git a/scripts/po/ChangeLog → scripts/po/ChangeLog.old b/scripts/po/ChangeLog → scripts/po/ChangeLog.old
diff --git a/scripts/po/Makevars b/scripts/po/Makevars
@@ -39,3 +39,5 @@ MSGID_BUGS_ADDRESS = [email protected]
 # This is the list of locale categories, beyond LC_MESSAGES, for which the
 # message catalogs shall be used.  It is usually empty.
 EXTRA_LOCALE_CATEGORIES =
+
+DISTFILES.extra1 = ChangeLog.old