[setup - the official Cygwin setup program] branch master, updated. release_2.900-4-gf58c79c4

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=f58c79c482fe91691c334f4bcdb954ca29959a5e

commit f58c79c482fe91691c334f4bcdb954ca29959a5e
Author: Jon Turney <[email protected]>
Date:   Sun Feb 2 22:16:07 2020 +0000

    Remove EXCLUDE_ constants
    
    Should have been removed when 'EXCLUDE_PACKAGE' was removed from grammar
    in c9797bed, or even when code using those constants was removed in
    bb849dbd.

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=ab4c5befc0eaf4c1551b62680c4d67d6a65ce574

commit ab4c5befc0eaf4c1551b62680c4d67d6a65ce574
Author: Jon Turney <[email protected]>
Date:   Mon Feb 3 19:36:07 2020 +0000

    Remove some lingering cvsids

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=6cb428fe12e73b91eaf2faed61371c544eebdb77

commit 6cb428fe12e73b91eaf2faed61371c544eebdb77
Author: Jon Turney <[email protected]>
Date:   Mon Feb 3 12:54:34 2020 +0000

    Remove .cvsignore

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/setup.git;h=d7557e8ddf9f3ceb5b826eca70bdb9df357d7cbc

commit d7557e8ddf9f3ceb5b826eca70bdb9df357d7cbc
Author: Jon Turney <[email protected]>
Date:   Tue Feb 4 12:13:13 2020 +0000

    Update displayed copyright to 2020


Diff:
---
 .cvsignore                     | 10 ----------
 ini.h                          |  7 -------
 libgetopt++/.cvsignore         |  5 -----
 libgetopt++/include/.cvsignore |  1 -
 res.rc                         |  2 +-
 tests/.cvsignore               |  1 -
 tests/Makefile.am              |  2 --
 tests/UserSettingTest.cc       |  5 -----
 tests/UserSettingsTest.cc      |  5 -----
 9 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/.cvsignore b/.cvsignore
deleted file mode 100644
index 26d91782..00000000
--- a/.cvsignore
+++ /dev/null
@@ -1,10 +0,0 @@
-aclocal.m4
-autom4te.cache
-cfgaux
-configure
-configure.lineno
-Makefile.in
-GNUmakefile
-make.out
-.git
-tags
diff --git a/ini.h b/ini.h
index 41ba8ec6..07e1a46d 100644
--- a/ini.h
+++ b/ini.h
@@ -42,13 +42,6 @@ void ini_init (io_stream *, IniDBBuilderPackage *, IniParseFeedback &);
    packages (the chosen "install" field).  install.cc installs
    selected packages. */
 
-typedef enum
-{
-  EXCLUDE_NONE = 0,
-  EXCLUDE_BY_SETUP,
-  EXCLUDE_NOT_FOUND
-} excludes;
-
 /* The following three vars are used to facilitate error handling between the
    parser/lexer and its callers, namely ini.cc:do_remote_ini() and
    IniParseFindVisitor::visitFile().  */
diff --git a/libgetopt++/.cvsignore b/libgetopt++/.cvsignore
deleted file mode 100644
index ddc7ac92..00000000
--- a/libgetopt++/.cvsignore
+++ /dev/null
@@ -1,5 +0,0 @@
-Makefile.in
-aclocal.m4
-autom4te.cache
-cfgaux
-configure
diff --git a/libgetopt++/include/.cvsignore b/libgetopt++/include/.cvsignore
deleted file mode 100644
index d0f5b077..00000000
--- a/libgetopt++/include/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-autoconf.h.in
diff --git a/res.rc b/res.rc
index 654a9e7e..e26f7171 100644
--- a/res.rc
+++ b/res.rc
@@ -264,7 +264,7 @@ BEGIN
                     "necessary.",IDC_SPLASH_TEXT,115,25,195,90
     ICON            IDI_CYGWIN,IDC_SPLASH_ICON,4,6,0,0,SS_ICON | SS_REALSIZEIMAGE
     LTEXT           "Version (unknown)",IDC_VERSION,115,127,195,10
-    LTEXT           "Copyright 2000-2019",IDC_SPLASH_COPYR,115,140,195,8
+    LTEXT           "Copyright 2000-2020",IDC_SPLASH_COPYR,115,140,195,8
     LTEXT           "https://cygwin.com/",IDC_SPLASH_URL,115,152,90,8
 END
 
diff --git a/tests/.cvsignore b/tests/.cvsignore
deleted file mode 100644
index 70845e08..00000000
--- a/tests/.cvsignore
+++ /dev/null
@@ -1 +0,0 @@
-Makefile.in
diff --git a/tests/Makefile.am b/tests/Makefile.am
index fad62459..695e853e 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -1,7 +1,5 @@
 ## Process this file with automake to produce Makefile.in
 #
-# $Id$
-#
 # Copyright (c) 2002, Robert Collins
 #
 #     This program is free software; you can redistribute it and/or modify
diff --git a/tests/UserSettingTest.cc b/tests/UserSettingTest.cc
index 7890468b..1a0b2c31 100644
--- a/tests/UserSettingTest.cc
+++ b/tests/UserSettingTest.cc
@@ -13,11 +13,6 @@
  *
  */
 
-#if 0
-static const char *cvsid =
-  "\n%%% $Id$\n";
-#endif
-
 #include "site.h"
 #include "win32.h"
 #include <stdio.h>
diff --git a/tests/UserSettingsTest.cc b/tests/UserSettingsTest.cc
index 08e6952a..e78c3991 100644
--- a/tests/UserSettingsTest.cc
+++ b/tests/UserSettingsTest.cc
@@ -13,11 +13,6 @@
  *
  */
 
-#if 0
-static const char *cvsid =
-  "\n%%% $Id$\n";
-#endif
-
 #include "site.h"
 #include "win32.h"
 #include <stdio.h>