[calm - Cygwin server-side packaging maintenance script] branch master, updated. 20160705-87-g712cd32

[jturney at sourceware dot org]

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=712cd32bb1f06314c74e9a76445d88a79a8a792f

commit 712cd32bb1f06314c74e9a76445d88a79a8a792f
Author: Yaakov Selkowitz <yselkowi@redhat.com>
Date:   Tue Jul 4 22:01:15 2017 +0000

    Update past_mistakes

https://sourceware.org/git/gitweb.cgi?p=cygwin-apps/calm.git;h=7bfbb508cacca80fae27678a8e8c0bde7b67cea4

commit 7bfbb508cacca80fae27678a8e8c0bde7b67cea4
Author: Jon Turney <jon.turney@dronecode.org.uk>
Date:   Sun May 7 19:24:14 2017 +0100

    Revert "Also check for skip: but install files"
    
    This reverts commit 73494ad1f27cead2e1d921b71496dc05b1a11114.


Diff:
---
 calm/package.py       |    4 ----
 calm/past_mistakes.py |    7 +++++++
 2 files changed, 7 insertions(+), 4 deletions(-)

diff --git a/calm/package.py b/calm/package.py
index 12e246a..07ef02b 100755
--- a/calm/package.py
+++ b/calm/package.py
@@ -470,10 +470,6 @@ def validate_packages(args, packages):
                 packages[p].skip = True
                 logging.info("package '%s' appears to be source-only as it has no non-empty install tarfiles and no dependencies, marking as 'skip'" % (p))
 
-        elif has_install and any(['skip' in packages[p].version_hints[vr] for vr in packages[p].version_hints]):
-            logging.error("package '%s' has 'skip:' hint but also has install tarfiles" % (p))
-            error = True
-
         # verify the versions specified for stability level exist
         levels = ['test', 'curr', 'prev']
         for l in levels:
diff --git a/calm/past_mistakes.py b/calm/past_mistakes.py
index 93bde5f..c79c0c0 100644
--- a/calm/past_mistakes.py
+++ b/calm/past_mistakes.py
@@ -107,23 +107,28 @@ self_source = [
 nonunique_versions = [
     'bzr-debuginfo',              # debuginfo from NMU needs to age out
     'cgdb-debuginfo',             # debuginfo from NMU needs to age out
+    'girepository-SpiceClientGtk2.0',  # gtk2 dropped from spice-gtk
     'gnome-panel-doc',
     'gtk2.0-engines-svg',
     'guile-doc',
     'guile-gv',                   # dropped pending guile-2
     'info',                       # something went wrong with package build?
     'libatomic_ops-devel',        # separated out from libgc
+    'khelpcenter',                # split out from kde-runtime
     'libcaca-doc',                # dropped pending fix for current doxygen
     'libfltk-doc',
     'libical_cxx-devel',
     'libquota-devel',             # no longer provided by e2fsprogs
     'libturbojpeg',               # no number means it isn't considered an old soversion
+    'mingw64-i686-spice-gtk2.0',  # gtk2 dropped from spice-gtk
+    'mingw64-x86_64-spice-gtk2.0',  # gtk2 dropped from spice-gtk
     'minizip',
     'mutter-doc',
     'ocaml-camlp4',               # ocaml-camlp4 removed from ocaml distribution after 4.01.0
     'ocaml-gv',                   # dropped pending ocaml cleanup
     'python-clang',               # split out from clang
     'python3-clang',              # split out from clang
+    'python-spiceclientgtk',      # gtk2 dropped from spice-gtk
     'sng-debuginfo',
     'socat-debuginfo',            # debuginfo for test version when curr has no debuginfo
     'sqlite3-zlib',               # sqlite3-zlib removed in 3.8.10, use sqlite3-compress instead
@@ -156,6 +161,7 @@ mtime_anomalies = [
     'gcc-tools-epoch2-autoconf',
     'glproto',
     'gv-debuginfo',
+    'info',
     'libatomic1',
     'libcilkrts5',
     'libgcc1',
@@ -180,5 +186,6 @@ mtime_anomalies = [
     'subversion-python',
     'subversion-ruby',
     'subversion-tools',
+    'texinfo-debuginfo',
     'xextproto',
 ]