epiphany-extensions r1759 - in trunk: . help po

[chpe svn gnome org]

Author: chpe
Date: Sun Sep 21 13:13:58 2008
New Revision: 1759
URL: http://svn.gnome.org/viewvc/epiphany-extensions?rev=1759&view=rev

Log:
Remove po/ChangeLog, and depend on intltool 0.40.4 for svn builds

Added:
   trunk/help/ChangeLog.pre-2-24   (props changed)
      - copied unchanged from r1758, /trunk/help/ChangeLog
   trunk/po/ChangeLog.pre-2-24   (props changed)
      - copied unchanged from r1758, /trunk/po/ChangeLog
Removed:
   trunk/help/ChangeLog
   trunk/po/ChangeLog
Modified:
   trunk/ChangeLog.README
   trunk/Makefile.am
   trunk/autogen.sh

Modified: trunk/ChangeLog.README
==============================================================================
--- trunk/ChangeLog.README	(original)
+++ trunk/ChangeLog.README	Sun Sep 21 13:13:58 2008
@@ -8,6 +8,11 @@
         When removing a toolbar, make its items available again in the toolbar
         editor. (Bug #131182)
 
+If there is no bug report that records who approved the patch for commit, 
+you must add that information to the checkin comment, e.g. "approved by chpe
+on IRC" (unless you're a core contributors and thus can self-approve your
+commits).
+
 Checkin comments MUST use the UTF-8 encoding.
 
 If you forget to check in some changes that belonged in the same commit (e.g.

Modified: trunk/Makefile.am
==============================================================================
--- trunk/Makefile.am	(original)
+++ trunk/Makefile.am	Sun Sep 21 13:13:58 2008
@@ -9,6 +9,7 @@
 	COPYING.README		\
 	ChangeLog		\
 	ChangeLog-20070912	\
+	po/ChangeLog.pre-2-24	\
 	HACKING			\
 	README 			\
 	TODO 			\
@@ -32,7 +33,9 @@
 # Only build this when in an svn checkout.
 
 ChangeLog:
-	@if test -f $(top_srcdir)/.svn/entries; then \
+	if test -f $(top_srcdir)/.git/HEAD; then \
+		git log --stat > $@; \
+	elif test -f $(top_srcdir)/.svn/entries; then \
 		svn log -v --xml -r HEAD:1572 $(SVN_ROOT)/$(SVN_MODULE)/$(SVN_BRANCH) | \
 			xsltproc --stringparam strip-prefix "$(SVN_MODULE)/$(SVN_BRANCH)" \
 				 --stringparam include-rev "yes" $(top_srcdir)/svn2cl.xsl - > $@; \

Modified: trunk/autogen.sh
==============================================================================
--- trunk/autogen.sh	(original)
+++ trunk/autogen.sh	Sun Sep 21 13:13:58 2008
@@ -16,6 +16,6 @@
     echo "You need to install gnome-common from the GNOME CVS"
     exit 1
 }
-REQUIRED_INTLTOOL_VERSION=0.40.0
+REQUIRED_INTLTOOL_VERSION=0.40.4
 REQUIRED_AUTOMAKE_VERSION=1.9 
 . gnome-autogen.sh