/pidgin/main: 2cac629e4549: Add a few comments and change versio...

Mark Doliner mark at kingant.net
Thu Jul 5 13:24:35 EDT 2012


Changeset: 2cac629e454948b76abb999133414e02b6f27a1b
Author:	 Mark Doliner <mark at kingant.net>
Date:	 2012-07-02 22:47 -0700
Branch:	 release-2.x.y
URL: http://hg.pidgin.im/pidgin/main/rev/2cac629e4549

Description:

Add a few comments and change version-check to not depend on commit-check
because I don't see any reason for that

diffstat:

 Makefile.am |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (29 lines):

diff --git a/Makefile.am b/Makefile.am
--- a/Makefile.am
+++ b/Makefile.am
@@ -34,11 +34,15 @@
 
 commit-check:
 	(cd po ; intltool-update -m 2>&1 | grep -v '^mismatched quotes.*\.py$$' | sed "s|current directory|po directory|" | grep . ; if [ $$? = 0 ] ; then exit 1 ; else exit 0 ; fi)
+
+# Ensure these files are sorted and contain no duplicates:
 	LC_ALL=C sort -c -t/ -u po/POTFILES.in
 	LC_ALL=C sort -c -t/ -u po/POTFILES.skip
+
+# Ensure COPYRIGHT is 100% UTF-8
 	iconv -f utf8 -t utf8 COPYRIGHT | cmp COPYRIGHT -
 
-version-check: commit-check
+version-check:
 # We don't want to release development versions.
 	test x`echo $(PACKAGE_VERSION) | grep dev` = x
 
@@ -55,7 +59,7 @@
 # ... and have no changes in the working copy. (this isn't really necessary with hg because hg id appends a "+")
 	test "x`hg st -mard`" = x
 
-release: version-check distcheck packages
+release: commit-check version-check distcheck packages
 
 packages:
 	gpg -ab pidgin-$(PACKAGE_VERSION).tar.gz



More information about the Commits mailing list