[gimp-help-2] Replace ".svn" with ".git" for some 'make' commands

[Ulf-D. Ehlert <ulfehlert src gnome org>]

commit f3a8e532eee8c076095535434eaa12063b3b6bf0
Author: Ulf-D. Ehlert <ulfehlert svn gnome org>
Date:   Tue Apr 21 13:37:10 2009 +0200

    Replace ".svn" with ".git" for some 'make' commands
    
    Skip '.git' directories (rather than '.svn') when
    using the "find" or "tar" command.
    Remove the stale "check-svn-property" make target.
---
 ChangeLog                    |   12 ++++++++++++
 Makefile.GNU                 |   20 +++++---------------
 Makefile.am                  |   28 +++++++++-------------------
 tools/get_po_status.pl       |    4 ++--
 tools/make_image_links.pl    |    2 +-
 tools/validate_references.py |    2 +-
 6 files changed, 30 insertions(+), 38 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 72e8105..d5344b6 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,17 @@
 2009-04-21  Ulf-D. Ehlert  <ulfehlert svn gnome org>
 
+	Replace ".svn" with ".git" for some 'make' commands
+
+	* tools/get_po_status.pl
+	* tools/make_image_links.pl
+	* tools/validate_references.py
+	* Makefile.am
+	* Makefile.GNU: Skip '.git' directories (rather than '.svn')
+	when using the "find" or "tar" command.
+	Remove the stale "check-svn-property" make target.
+
+2009-04-21  Ulf-D. Ehlert  <ulfehlert svn gnome org>
+
 	Set pot file timestamps
 
 	* Makefile.am
diff --git a/Makefile.GNU b/Makefile.GNU
index d6122cc..7372810 100644
--- a/Makefile.GNU
+++ b/Makefile.GNU
@@ -72,19 +72,19 @@ abs_builddir := $(shell pwd)
 
 # Find files and directories
 xml_file_predicates =       \
-	-name '.svn' -prune \
+	-name '.git' -prune \
 	          -o        \
 	-name '$(notdir $(AUTHORS_DOCBOOK_XML))' -prune \
 	          -o        \
 	-name '*.xml' -print
 
 file_predicates =           \
-	-name '.svn' -prune \
+	-name '.git' -prune \
 	        -o          \
 	-type f -print
 
 dir_predicates =            \
-	-name '.svn' -prune \
+	-name '.git' -prune \
 	        -o          \
 	-type d -print
 src_dir_predicates = -name images -prune -o $(dir_predicates)
@@ -749,19 +749,9 @@ dist-clean: clean ;
 ########################################################################
 
 check: checks ;
-checks: check-svn-property check-image-references ;
-check-svn: check-svn-property ;
+checks: check-image-references ;
 check-images: check-image-references ;
 
-check-svn-property:
-	$(cmd) if cd $(srcdir) && test -e tools/check_keywords_property.pl && \
-	type perl >/dev/null 2>&1; then \
-	    echo "*** Checking svn property ... "; \
-	    perl tools/check_keywords_property.pl -v || true; \
-	else \
-	    echo >&2 "*** Cannot check svn property (no Perl installed?) ***"; \
-	fi
-
 check-image-references:
 	$(cmd) if cd $(srcdir) && test -e tools/validate_references.py && \
 	type python >/dev/null 2>&1; then \
@@ -780,7 +770,7 @@ check-images-%: FORCE
 # special case 'en':
 check-images-en check-images-C: check-image-references ;
 
-.PHONY: check-svn-property check-image-references
+.PHONY: check-image-references
 
 
 ########################################################################
diff --git a/Makefile.am b/Makefile.am
index 8c7625a..8412f2c 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -50,7 +50,7 @@ echo_n = echo $(ECHO_N)
 
 # options for the "find images" command:
 image_find_predicates =     \
-	-name '.svn' -prune \
+	-name '.git' -prune \
 	-o \
 	  -type d \
 	  \( -name '[a-z][a-z]' -o -name '[a-z][a-z]_[A-Z][A-Z]' \) \
@@ -81,7 +81,7 @@ html_files_find_predicates = \
 
 # XML files excluding automatically generated files
 src_find_predicates =       \
-	-name '.svn' -prune \
+	-name '.git' -prune \
 	-o                  \
 	-name '$(notdir $(AUTHORS_DOCBOOK_XML))' -prune \
 	-o                  \
@@ -89,13 +89,13 @@ src_find_predicates =       \
 
 #  for generating a list of files (of any type)
 file_predicates =           \
-	-name '.svn' -prune \
+	-name '.git' -prune \
 	        -o          \
 	-type f -print
 
 # for generating a list of directories
 dir_predicates =            \
-	-name '.svn' -prune \
+	-name '.git' -prune \
 	        -o          \
 	-type d -print
 
@@ -732,7 +732,7 @@ $(tarball_prefix)-%.tar: html/%/index.html html/%/gimp-help.xml
 	$(cmd) $(MKDIR_P) $(tarball_prefix)-$*
 	$(cmd) cd $(tarball_prefix)-$* && $(LN_S) ../html/$* .
 	$(cmd) cd $(tarball_prefix)-$* && $(LN_S) ../html/images .
-	$(cmd) tar -chf $@ --exclude .svn $(tarball_prefix)-$*
+	$(cmd) tar -chf $@ --exclude .git $(tarball_prefix)-$*
 	$(cmd) rm -rf $(tarball_prefix)-$*
 
 $(tarball_prefix)-%.tar.gz: $(tarball_prefix)-%.tar
@@ -759,19 +759,9 @@ html-dist: \
 ########################################################################
 
 # Note that the default (autoconf) target name is "check".
-checks: check-svn-property check-image-references ;
-check-svn: check-svn-property ;
+checks: check-image-references ;
 check-images: check-image-references ;
 
-check-svn-property:
-	$(cmd) if cd $(srcdir) && test -e tools/check_keywords_property.pl && \
-	type perl >/dev/null 2>&1; then \
-	    echo "*** Checking svn property ... "; \
-	    perl tools/check_keywords_property.pl -v || true; \
-	else \
-	    echo >&2 "*** Cannot check svn property (no Perl installed?) ***"; \
-	fi
-
 check-image-references:
 	$(cmd) if cd $(srcdir) && test -e tools/validate_references.py && \
 	type python >/dev/null 2>&1; then \
@@ -790,7 +780,7 @@ check-images-%: FORCE
 # special case 'en':
 check-images-en check-images-C: check-image-references ;
 
-.PHONY: checks check-svn-property check-image-references
+.PHONY: checks check-image-references
 
 
 
@@ -856,9 +846,9 @@ dist-hook: dist-copy-images
 dist-copy-images:
 	$(cmd) test -d "$(top_srcdir)/images" && test -d "$(distdir)"
 	@echo "Copying images into distdir $(distdir) ..."
-	$(cmd)(cd $(top_srcdir) && tar -cf- --exclude=.svn images) \
+	$(cmd)(cd $(top_srcdir) && tar -cf- --exclude=.git images) \
 	| (cd $(distdir) && tar -xf-)
-	$(cmd) test -d "$(distdir)/images" && test ! -d "$(distdir)/images/.svn"
+	$(cmd) test -d "$(distdir)/images" && test ! -d "$(distdir)/images/.git"
 
 
 clean-local:
diff --git a/tools/get_po_status.pl b/tools/get_po_status.pl
index 4782347..0cc836a 100755
--- a/tools/get_po_status.pl
+++ b/tools/get_po_status.pl
@@ -1,7 +1,7 @@
 #!/usr/bin/env perl
 #
 # gimp-help-2 -- get translation status
-# Copyright (C) 2008 The GIMP Documentation Team.
+# Copyright (C) 2008-2009 The GIMP Documentation Team.
 #
 # This program is free software; you can redistribute it and/or modify
 # it under the terms of the GNU General Public License as published by
@@ -138,7 +138,7 @@ $Language = $Languages{$Language} if defined($Languages{$Language});
 
 # Search po files
 my @Pofiles = ();
-find( sub { /^\.svn/ and ($File::Find::prune = 1)
+find( sub { /^\.git/ and ($File::Find::prune = 1)
                                or
             /\.po$/ and push @Pofiles, $File::Find::name
       },
diff --git a/tools/make_image_links.pl b/tools/make_image_links.pl
index 185820e..eb8eacb 100755
--- a/tools/make_image_links.pl
+++ b/tools/make_image_links.pl
@@ -46,7 +46,7 @@ my $Translatable = (($Language =~ /^[a-z]{2}(_[A-Z]{2})?$/) &&
 
 # Create list of source directories:
 my @Image_dirs;
-find( sub { /^\.svn/ and ($File::Find::prune = 1)
+find( sub { /^\.git/ and ($File::Find::prune = 1)
                              or
             -d and push(@Image_dirs, $File::Find::name) 
       },
diff --git a/tools/validate_references.py b/tools/validate_references.py
index c4319bb..e687cfe 100644
--- a/tools/validate_references.py
+++ b/tools/validate_references.py
@@ -126,7 +126,7 @@ class ImageFilesList(FileNameContainer):
         Logger.info("searching images in %s ..." % imageroot)
 
         for root, dirs, files in os.walk(self.imageroot):
-            for prune in [ 'callouts', '.svn' ]:
+            for prune in [ 'callouts', '.git' ]:
                 if prune in dirs:
                     dirs.remove(prune)