>From 75a97abf4590be750b1924d4a7e70cb744dab069 Mon Sep 17 00:00:00 2001
From: Bruno Haible <address@hidden>
Date: Sat, 9 Sep 2017 00:32:50 +0200
Subject: [PATCH 07/16] gnulib-tool.py: follow gnulib-tool changes, part 3

Follow gnulib-tool change from 2012-08-26
"gnulib-tool: Remove no-op option --no-changelog."
* gnulib-tool.py: Remove parsing of --no-changelog option.
* pygnulib/constants.py: Remove FILES dictionary.
* pygnulib/*: Update.
---
 gnulib-tool.py              | 6 ------
 pygnulib/GLConfig.py        | 1 -
 pygnulib/GLEmiter.py        | 1 -
 pygnulib/GLError.py         | 1 -
 pygnulib/GLFileSystem.py    | 1 -
 pygnulib/GLImport.py        | 1 -
 pygnulib/GLInfo.py          | 2 --
 pygnulib/GLMakefileTable.py | 1 -
 pygnulib/GLModuleSystem.py  | 1 -
 pygnulib/GLTestDir.py       | 1 -
 pygnulib/constants.py       | 6 +-----
 11 files changed, 1 insertion(+), 21 deletions(-)

diff --git a/gnulib-tool.py b/gnulib-tool.py
index 806f4d7..24bfd92 100755
--- a/gnulib-tool.py
+++ b/gnulib-tool.py
@@ -44,7 +44,6 @@ APP = constants.APP
 DIRS = constants.DIRS
 ENCS = constants.ENCS
 UTILS = constants.UTILS
-FILES = constants.FILES
 MODES = constants.MODES
 TESTS = constants.TESTS
 compiler = constants.compiler
@@ -213,11 +212,6 @@ def main():
                         dest='mode_xmaintainer',
                         default=None,
                         nargs='*')
-    # no-changelog
-    parser.add_argument('--no-changelog',
-                        dest='changelog',
-                        default=None,
-                        action='store_false')
     # destdir
     parser.add_argument('-d', '--dir',
                         dest='destdir',
diff --git a/pygnulib/GLConfig.py b/pygnulib/GLConfig.py
index 4d96fcb..1e1a090 100644
--- a/pygnulib/GLConfig.py
+++ b/pygnulib/GLConfig.py
@@ -32,7 +32,6 @@ APP = constants.APP
 DIRS = constants.DIRS
 ENCS = constants.ENCS
 UTILS = constants.UTILS
-FILES = constants.FILES
 MODES = constants.MODES
 TESTS = constants.TESTS
 compiler = constants.compiler
diff --git a/pygnulib/GLEmiter.py b/pygnulib/GLEmiter.py
index 6df6eca..b6f8991 100644
--- a/pygnulib/GLEmiter.py
+++ b/pygnulib/GLEmiter.py
@@ -38,7 +38,6 @@ APP = constants.APP
 DIRS = constants.DIRS
 ENCS = constants.ENCS
 UTILS = constants.UTILS
-FILES = constants.FILES
 MODES = constants.MODES
 TESTS = constants.TESTS
 compiler = constants.compiler
diff --git a/pygnulib/GLError.py b/pygnulib/GLError.py
index 04e2e73..9c249a3 100644
--- a/pygnulib/GLError.py
+++ b/pygnulib/GLError.py
@@ -29,7 +29,6 @@ APP = constants.APP
 DIRS = constants.DIRS
 ENCS = constants.ENCS
 UTILS = constants.UTILS
-FILES = constants.FILES
 MODES = constants.MODES
 TESTS = constants.TESTS
 compiler = constants.compiler
diff --git a/pygnulib/GLFileSystem.py b/pygnulib/GLFileSystem.py
index 9821fd6..7db09e1 100644
--- a/pygnulib/GLFileSystem.py
+++ b/pygnulib/GLFileSystem.py
@@ -33,7 +33,6 @@ APP = constants.APP
 DIRS = constants.DIRS
 ENCS = constants.ENCS
 UTILS = constants.UTILS
-FILES = constants.FILES
 MODES = constants.MODES
 TESTS = constants.TESTS
 compiler = constants.compiler
diff --git a/pygnulib/GLImport.py b/pygnulib/GLImport.py
index c7b5142..7522eae 100644
--- a/pygnulib/GLImport.py
+++ b/pygnulib/GLImport.py
@@ -41,7 +41,6 @@ APP = constants.APP
 DIRS = constants.DIRS
 ENCS = constants.ENCS
 UTILS = constants.UTILS
-FILES = constants.FILES
 MODES = constants.MODES
 TESTS = constants.TESTS
 compiler = constants.compiler
diff --git a/pygnulib/GLInfo.py b/pygnulib/GLInfo.py
index c0bae0e..baec6af 100644
--- a/pygnulib/GLInfo.py
+++ b/pygnulib/GLInfo.py
@@ -30,7 +30,6 @@ APP = constants.APP
 DIRS = constants.DIRS
 ENCS = constants.ENCS
 UTILS = constants.UTILS
-FILES = constants.FILES
 MODES = constants.MODES
 TESTS = constants.TESTS
 compiler = constants.compiler
@@ -270,7 +269,6 @@ Options for --import, --add/remove-import:
       --vc-files            Update version control related files.
       --no-vc-files         Don't update version control related files
                             (.gitignore and/or .cvsignore).
-      --no-changelog        Don't update or create ChangeLog files.
 
 Options for --create-[mega]testdir, --[mega]test:
 
diff --git a/pygnulib/GLMakefileTable.py b/pygnulib/GLMakefileTable.py
index 2ecc268..74e6fe7 100644
--- a/pygnulib/GLMakefileTable.py
+++ b/pygnulib/GLMakefileTable.py
@@ -33,7 +33,6 @@ APP = constants.APP
 DIRS = constants.DIRS
 ENCS = constants.ENCS
 UTILS = constants.UTILS
-FILES = constants.FILES
 MODES = constants.MODES
 TESTS = constants.TESTS
 compiler = constants.compiler
diff --git a/pygnulib/GLModuleSystem.py b/pygnulib/GLModuleSystem.py
index 09ce5f6..2a2c8cd 100644
--- a/pygnulib/GLModuleSystem.py
+++ b/pygnulib/GLModuleSystem.py
@@ -33,7 +33,6 @@ APP = constants.APP
 DIRS = constants.DIRS
 ENCS = constants.ENCS
 UTILS = constants.UTILS
-FILES = constants.FILES
 MODES = constants.MODES
 TESTS = constants.TESTS
 compiler = constants.compiler
diff --git a/pygnulib/GLTestDir.py b/pygnulib/GLTestDir.py
index 562e170..2937b5d 100644
--- a/pygnulib/GLTestDir.py
+++ b/pygnulib/GLTestDir.py
@@ -41,7 +41,6 @@ APP = constants.APP
 DIRS = constants.DIRS
 ENCS = constants.ENCS
 UTILS = constants.UTILS
-FILES = constants.FILES
 MODES = constants.MODES
 TESTS = constants.TESTS
 compiler = constants.compiler
diff --git a/pygnulib/constants.py b/pygnulib/constants.py
index ec2ca62..6cb1ec9 100644
--- a/pygnulib/constants.py
+++ b/pygnulib/constants.py
@@ -59,7 +59,6 @@ APP = dict()  # Application
 DIRS = dict()  # Directories
 UTILS = dict()  # Utilities
 ENCS = dict()  # Encodings
-FILES = dict()  # Files
 MODES = dict()  # Modes
 TESTS = dict()  # Tests
 NL = '''
@@ -105,9 +104,6 @@ DIRS['tests'] = os.path.join(DIRS['root'], 'tests')
 DIRS['git'] = os.path.join(DIRS['root'], '.git')
 DIRS['cvs'] = os.path.join(DIRS['root'], 'CVS')
 
-# Set FILES dictionary
-FILES['changelog'] = os.path.join(DIRS['root'], 'ChangeLog')
-
 # Set MODES dictionary
 MODES = \
     {
@@ -449,4 +445,4 @@ def nlcount(text):
     print(before, after)
 
 
-__all__ += ['APP', 'DIRS', 'FILES', 'MODES', 'UTILS']
+__all__ += ['APP', 'DIRS', 'MODES', 'UTILS']
-- 
2.7.4