Rename archive.tar.gz to archive.cvs.tar.gz.

diff --git a/gettext-tools/misc/.gitignore b/gettext-tools/misc/.gitignore
index 47b178918a18275adc35103e6e8366ddb45220ea..b51f8a233ab3c68ccc507710d387fc78fd0b090e 100644 (file)
--- a/gettext-tools/misc/.gitignore
+++ b/gettext-tools/misc/.gitignore
@@ -2,5 +2,5 @@
 /Makefile.in
 
 # Files distributed but not under version control:
-/archive.tar.gz
+/archive.cvs.tar.gz
 

diff --git a/gettext-tools/misc/ChangeLog b/gettext-tools/misc/ChangeLog
index 42e8e322563abbc4b42eba074124aecde7724b09..afdfe90853e1d2ff80e4857c19db5f7753f5c6f2 100644 (file)
--- a/gettext-tools/misc/ChangeLog
+++ b/gettext-tools/misc/ChangeLog
@@ -1,3 +1,10 @@
+2009-09-27  Bruno Haible  <bruno@clisp.org>
+
+       * add-to-archive: Use archive.cvs.tar.gz instead of archive.tar.gz.
+       * autopoint.in: Likewise.
+       * Makefile.am (archive.cvs.tar.gz): Renamed from archive.tar.gz.
+       (EXTRA_DIST, gettextsrc_DATA): Update.
+
 2009-08-14  Bruno Haible  <bruno@clisp.org>
 
        * Makefile.am (archive.tar.gz): Update error message.

diff --git a/gettext-tools/misc/Makefile.am b/gettext-tools/misc/Makefile.am
index be5369b4c116f303dd07e215f21116cad55c6c63..589eb21cadd8cdc223ae90233ae4479c05ff2d2f 100644 (file)
--- a/gettext-tools/misc/Makefile.am
+++ b/gettext-tools/misc/Makefile.am
@@ -27,18 +27,18 @@ bin_SCRIPTS = gettextize autopoint
 
 DISTCLEANFILES += gettextize autopoint
 
-EXTRA_DIST += add-to-archive cvsuser.c archive.tar.gz
+EXTRA_DIST += add-to-archive cvsuser.c archive.cvs.tar.gz
 
 gettextsrcdir = $(datadir)/gettext
-gettextsrc_DATA = archive.tar.gz
+gettextsrc_DATA = archive.cvs.tar.gz
 
-# The archive.tar.gz is not in the CVS. Alpha-testers must use the one from an
-# already installed release.
-archive.tar.gz:
-       if test -f $(gettextsrcdir)/archive.tar.gz; then \
-         cp -p $(gettextsrcdir)/archive.tar.gz $@; \
+# The archive.cvs.tar.gz is not in the CVS. Alpha-testers must use the one from
+# an already installed release.
+archive.cvs.tar.gz:
+       if test -f $(gettextsrcdir)/archive.cvs.tar.gz; then \
+         cp -p $(gettextsrcdir)/archive.cvs.tar.gz $@; \
        else \
-         echo "archive.tar.gz is not under version control. Please copy the archive.tar.gz from an already installed release to gettext-tools/misc/." 1>&2; \
+         echo "archive.cvs.tar.gz is not under version control. Please copy the archive.cvs.tar.gz from an already installed release to gettext-tools/misc/." 1>&2; \
          exit 1; \
        fi
 

diff --git a/gettext-tools/misc/add-to-archive b/gettext-tools/misc/add-to-archive
index cbe6e52c0392b1bc2d014481a97ea974db5f051a..01f696739fbdb03e55878f0f51547f59dc563e1a 100755 (executable)
--- a/gettext-tools/misc/add-to-archive
+++ b/gettext-tools/misc/add-to-archive
@@ -1,6 +1,6 @@
 #! /bin/sh
 #
-# Copyright (C) 2002, 2006 Free Software Foundation, Inc.
+# Copyright (C) 2002, 2006, 2009 Free Software Foundation, Inc.
 #
 # 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
@@ -18,7 +18,7 @@
 
 # Usage: add-to-archive /somewhere/gettext-0.xx.yy.tar.gz
 # Adds the infrastructure files for gettext version 0.xx.yy to the compressed
-# CVS repository in the archive.tar.gz file.
+# CVS repository in the archive.cvs.tar.gz file.
 
 if test $# != 1; then
   echo "Usage: add-to-archive /somewhere/gettext-0.xx.yy.tar.gz"
@@ -94,13 +94,13 @@ work_archive=`pwd`/"$work_dir/archive"
 cvsroot=`pwd`/autopoint-files
 mkdir "$cvsroot"
 cvs -d "$cvsroot" init
-(cd autopoint-files && tar xvfz ../archive.tar.gz)
+(cd autopoint-files && tar xvfz ../archive.cvs.tar.gz)
 cvsver=$pack-`echo "$ver" | sed -e 's/\./_/g'`
 (cd "$work_archive"
  CVSUSER=$cvsuser LD_PRELOAD=$cvsuser_hack \
  cvs -d "$cvsroot" import -m "Import $pack_ver" archive release "$cvsver"
 )
-(cd autopoint-files && tar cvfz ../archive.tar.gz --owner=root --group=root archive)
+(cd autopoint-files && tar cvfz ../archive.cvs.tar.gz --owner=root --group=root archive)
 (cd autopoint-files && du archive)
 
 # Clean up.

diff --git a/gettext-tools/misc/autopoint.in b/gettext-tools/misc/autopoint.in
index 2a5deeaa1f111b64e3d8641c67b4cd1eceab31bd..15a8f0b4cb2db07b49a53c79f460ecf74f9a37a0 100644 (file)
--- a/gettext-tools/misc/autopoint.in
+++ b/gettext-tools/misc/autopoint.in
@@ -448,7 +448,7 @@ unset CVSWRAPPERS
 # Need to pass -d "$CVSROOT", because there may be a CVS directory in the
 # current directory.
 cvs -d "$CVSROOT" init
-gzip -d -c < "$gettext_dir/archive.tar.gz" | (cd "$cvs_dir" && tar xf -)
+gzip -d -c < "$gettext_dir/archive.cvs.tar.gz" | (cd "$cvs_dir" && tar xf -)
 
 cd "$work_dir"
 cvsver=gettext-`echo "$ver" | sed -e 's/\./_/g'`