>From 94fb13ea255a9542bf4bff55841d9b8c11426135 Mon Sep 17 00:00:00 2001
From: =?utf-8?q?P=C3=A1draig=20Brady?= <address@hidden>
Date: Tue, 6 Jul 2010 10:00:05 +0100
Subject: [PATCH] bootstrap: discard non translation project po files

* build-aux/bootstrap (update_po_files): Remove any
local only files from the $po_dir/.reference directory.
The LINGUAS index is generated from this directory
and so those translations will not be distributed.
Note, local only translations are not removed from the
$po_dir directory.
---
 ChangeLog           |    6 ++++++
 build-aux/bootstrap |   11 +++++++----
 2 files changed, 13 insertions(+), 4 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index afcae28..7f79a08 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2010-07-06 Pádraig Brady <address@hidden>
+
+	* build-aux/bootstrap: Remove any local translations
+	from the translation project synchronization directory,
+	so that local only translations are not distributed.
+
 2010-07-04  Bruno Haible  <address@hidden>
 
 	fsusage: Clarify which code applies to which platforms.
diff --git a/build-aux/bootstrap b/build-aux/bootstrap
index 2422549..5ab4cf7 100755
--- a/build-aux/bootstrap
+++ b/build-aux/bootstrap
@@ -1,6 +1,6 @@
 #! /bin/sh
 # Print a version string.
-scriptversion=2010-05-17.18; # UTC
+scriptversion=2010-07-06.10; # UTC
 
 # Bootstrap this package from checked-out sources.
 
@@ -90,7 +90,8 @@ bootstrap_epilogue() { :; }
 # options because the latest/%s directory and the .po files within are
 # all symlinks.
 po_download_command_format=\
-"rsync -Lrtvz 'translationproject.org::tp/latest/%s/' '%s'"
+"rsync --delete --exclude '*.s1' -Lrtvz \
+ 'translationproject.org::tp/latest/%s/' '%s'"
 
 extract_package_name='
   /^AC_INIT(/{
@@ -475,15 +476,17 @@ download_po_files() {
   eval "$cmd"
 }
 
-# Download .po files to $po_dir/.reference and copy only the new
+# Mirror .po files to $po_dir/.reference and copy only the new
 # or modified ones into $po_dir.  Also update $po_dir/LINGUAS.
+# Note po files that exist locally only are left in $po_dir but will
+# not be included in LINGUAS and hence will not be distributed.
 update_po_files() {
   # Directory containing primary .po files.
   # Overwrite them only when we're sure a .po file is new.
   po_dir=$1
   domain=$2
 
-  # Download *.po files into this dir.
+  # Mirror *.po files into this dir.
   # Usually contains *.s1 checksum files.
   ref_po_dir="$po_dir/.reference"
 
-- 
1.6.2.5