[cylc] 08/11: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Jul 19 12:33:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
mckinstry pushed a commit to branch debian/master
in repository cylc.
commit c379ccf4eff6b71c3f1316b80570eed52f9c35ba
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Tue Jul 4 08:35:19 2017 +0100
refresh patches
---
debian/patches/envvars.patch | 67 +++++++++++++++++++-----------------------
debian/patches/fixes.patch | 14 ++++-----
debian/patches/license.patch | 6 ++--
debian/patches/makefile.patch | 10 +++----
debian/patches/rm-gpanel.patch | 10 +++----
5 files changed, 51 insertions(+), 56 deletions(-)
diff --git a/debian/patches/envvars.patch b/debian/patches/envvars.patch
index cbaf1d1..952efd9 100644
--- a/debian/patches/envvars.patch
+++ b/debian/patches/envvars.patch
@@ -1,7 +1,7 @@
-Index: cylc-6.11.2/lib/cylc/cfgspec/gcylc.py
+Index: cylc-7.4.0/lib/cylc/cfgspec/gcylc.py
===================================================================
---- cylc-6.11.2.orig/lib/cylc/cfgspec/gcylc.py
-+++ cylc-6.11.2/lib/cylc/cfgspec/gcylc.py
+--- cylc-7.4.0.orig/lib/cylc/cfgspec/gcylc.py
++++ cylc-7.4.0/lib/cylc/cfgspec/gcylc.py
@@ -37,6 +37,7 @@ from cylc.task_state import (
"gcylc config file format."
@@ -10,11 +10,11 @@ Index: cylc-6.11.2/lib/cylc/cfgspec/gcylc.py
SITE_FILE = os.path.join(
os.environ['CYLC_DIR'], 'conf', 'gcylcrc', 'themes.rc')
USER_FILE = os.path.join(os.environ['HOME'], '.cylc', 'gcylc.rc')
-Index: cylc-6.11.2/lib/cylc/cfgspec/globalcfg.py
+Index: cylc-7.4.0/lib/cylc/cfgspec/globalcfg.py
===================================================================
---- cylc-6.11.2.orig/lib/cylc/cfgspec/globalcfg.py
-+++ cylc-6.11.2/lib/cylc/cfgspec/globalcfg.py
-@@ -362,7 +362,8 @@ class GlobalConfig(config):
+--- cylc-7.4.0.orig/lib/cylc/cfgspec/globalcfg.py
++++ cylc-7.4.0/lib/cylc/cfgspec/globalcfg.py
+@@ -400,7 +400,8 @@ class GlobalConfig(config):
_DEFAULT = None
CONF_BASE = "global.rc"
@@ -24,10 +24,10 @@ Index: cylc-6.11.2/lib/cylc/cfgspec/globalcfg.py
USER_CONF_DIR = os.path.join(os.environ['HOME'], '.cylc')
OLD_SITE_CONF_BASE = os.path.join("siterc", "site.rc")
OLD_USER_CONF_BASE = os.path.join("user.rc")
-Index: cylc-6.11.2/lib/cylc/gui/util.py
+Index: cylc-7.4.0/lib/cylc/gui/util.py
===================================================================
---- cylc-6.11.2.orig/lib/cylc/gui/util.py
-+++ cylc-6.11.2/lib/cylc/gui/util.py
+--- cylc-7.4.0.orig/lib/cylc/gui/util.py
++++ cylc-7.4.0/lib/cylc/gui/util.py
@@ -95,7 +95,7 @@ class EntryDialog(gtk.MessageDialog):
def get_image_dir():
"""Return the root directory for cylc images."""
@@ -37,31 +37,26 @@ Index: cylc-6.11.2/lib/cylc/gui/util.py
except KeyError:
# This should not happen (unecessary)
raise SystemExit("ERROR: $CYLC_DIR is not defined!")
-Index: cylc-6.11.2/lib/cylc/scheduler.py
+Index: cylc-7.4.0/lib/cylc/scheduler.py
===================================================================
---- cylc-6.11.2.orig/lib/cylc/scheduler.py
-+++ cylc-6.11.2/lib/cylc/scheduler.py
-@@ -1124,13 +1124,14 @@ conditions; see `cylc conditions`.
- def configure_suite_environment(self):
- """Configure suite environment."""
- # static cylc and suite-specific variables:
+--- cylc-7.4.0.orig/lib/cylc/scheduler.py
++++ cylc-7.4.0/lib/cylc/scheduler.py
+@@ -828,8 +828,9 @@ conditions; see `cylc conditions`.
+ # Write suite contact file.
+ # Preserve contact data in memory, for regular health check.
+ mgr = self.suite_srv_files_mgr
+ CYLC_DIR = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
- self.suite_env = {
- 'CYLC_UTC': str(cylc.flags.utc),
- 'CYLC_CYCLING_MODE': str(cylc.flags.cycling_mode),
- 'CYLC_MODE': 'scheduler',
- 'CYLC_DEBUG': str(cylc.flags.debug),
- 'CYLC_VERBOSE': str(cylc.flags.verbose),
-- 'CYLC_DIR_ON_SUITE_HOST': os.environ['CYLC_DIR'],
-+ 'CYLC_DIR_ON_SUITE_HOST': CYLC_DIR,
- 'CYLC_SUITE_NAME': self.suite,
- 'CYLC_SUITE_REG_NAME': self.suite, # DEPRECATED
- 'CYLC_SUITE_HOST': str(self.host),
-Index: cylc-6.11.2/lib/cylc/version.py
+ contact_data = {
+- mgr.KEY_DIR_ON_SUITE_HOST: os.environ['CYLC_DIR'],
++ mgr.KEY_DIR_ON_SUITE_HOST: CYLC_DIR,
+ mgr.KEY_NAME: self.suite,
+ mgr.KEY_HOST: self.host,
+ mgr.KEY_PROCESS: process_str,
+Index: cylc-7.4.0/lib/cylc/version.py
===================================================================
---- cylc-6.11.2.orig/lib/cylc/version.py
-+++ cylc-6.11.2/lib/cylc/version.py
-@@ -25,7 +25,7 @@ from cylc.run_get_stdout import run_get_
+--- cylc-7.4.0.orig/lib/cylc/version.py
++++ cylc-7.4.0/lib/cylc/version.py
+@@ -28,7 +28,7 @@ UNKNOWN = "UNKNOWN"
def _get_cylc_version():
"""Determine and return cylc version string."""
@@ -70,11 +65,11 @@ Index: cylc-6.11.2/lib/cylc/version.py
if os.path.exists(os.path.join(cylc_dir, ".git")):
# We're running in a cylc git repository, so dynamically determine
-Index: cylc-6.11.2/lib/cylc/cylc_xdot.py
+Index: cylc-7.4.0/lib/cylc/cylc_xdot.py
===================================================================
---- cylc-6.11.2.orig/lib/cylc/cylc_xdot.py
-+++ cylc-6.11.2/lib/cylc/cylc_xdot.py
-@@ -305,7 +305,8 @@ class MyDotWindow(CylcDotViewerCommon):
+--- cylc-7.4.0.orig/lib/cylc/cylc_xdot.py
++++ cylc-7.4.0/lib/cylc/cylc_xdot.py
+@@ -306,7 +306,8 @@ class MyDotWindow(CylcDotViewerCommon):
self.actiongroup = actiongroup
# create new stock icons for group and ungroup actions
diff --git a/debian/patches/fixes.patch b/debian/patches/fixes.patch
index 27aaa05..66773a3 100644
--- a/debian/patches/fixes.patch
+++ b/debian/patches/fixes.patch
@@ -1,17 +1,17 @@
-Index: cylc-6.11.2/lib/cylc/cylc_xdot.py
+Index: cylc-7.4.0/lib/cylc/cylc_xdot.py
===================================================================
---- cylc-6.11.2.orig/lib/cylc/cylc_xdot.py
-+++ cylc-6.11.2/lib/cylc/cylc_xdot.py
+--- cylc-7.4.0.orig/lib/cylc/cylc_xdot.py
++++ cylc-7.4.0/lib/cylc/cylc_xdot.py
@@ -1,4 +1,4 @@
-#!/usr/bin/env
+#!/usr/bin/python
# THIS FILE IS PART OF THE CYLC SUITE ENGINE.
- # Copyright (C) 2008-2016 NIWA
-Index: cylc-6.11.2/lib/cylc/cycling/iso8601.py
+ # Copyright (C) 2008-2017 NIWA
+Index: cylc-7.4.0/lib/cylc/cycling/iso8601.py
===================================================================
---- cylc-6.11.2.orig/lib/cylc/cycling/iso8601.py
-+++ cylc-6.11.2/lib/cylc/cycling/iso8601.py
+--- cylc-7.4.0.orig/lib/cylc/cycling/iso8601.py
++++ cylc-7.4.0/lib/cylc/cycling/iso8601.py
@@ -1,3 +1,4 @@
+#!/usr/bin/python
# -*- coding: utf-8 -*-
diff --git a/debian/patches/license.patch b/debian/patches/license.patch
index 0a41d33..bef1dae 100644
--- a/debian/patches/license.patch
+++ b/debian/patches/license.patch
@@ -1,7 +1,7 @@
-Index: cylc-6.11.2/bin/cylc-conditions
+Index: cylc-7.4.0/bin/cylc-conditions
===================================================================
---- cylc-6.11.2.orig/bin/cylc-conditions
-+++ cylc-6.11.2/bin/cylc-conditions
+--- cylc-7.4.0.orig/bin/cylc-conditions
++++ cylc-7.4.0/bin/cylc-conditions
@@ -38,5 +38,5 @@ fi
echo
echo "The GNU General Public License v3.0"
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index 1b7b128..b31c6c6 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -3,16 +3,16 @@ Description: Don't automatically create version file (created by Debian rules)
Last-Updated: 2017-03-31
Forwarded: not-needed
-Index: cylc-6.11.2/Makefile
+Index: cylc-7.4.0/Makefile
===================================================================
---- cylc-6.11.2.orig/Makefile
-+++ cylc-6.11.2/Makefile
+--- cylc-7.4.0.orig/Makefile
++++ cylc-7.4.0/Makefile
@@ -14,7 +14,7 @@
# You should have received a copy of the GNU General Public License
# along with this program. If not, see <http://www.gnu.org/licenses/>.
--all: version docs ordereddict
-+all: docs ordereddict
+-all: version documentation
++all: documentation
version:
admin/create-version-file
diff --git a/debian/patches/rm-gpanel.patch b/debian/patches/rm-gpanel.patch
index 2b3f2c9..51cbaad 100644
--- a/debian/patches/rm-gpanel.patch
+++ b/debian/patches/rm-gpanel.patch
@@ -1,8 +1,8 @@
-Index: cylc-6.11.2/bin/cylc
+Index: cylc-7.4.0/bin/cylc
===================================================================
---- cylc-6.11.2.orig/bin/cylc
-+++ cylc-6.11.2/bin/cylc
-@@ -193,7 +193,6 @@ categories['license'] = ['license', 'GPL
+--- cylc-7.4.0.orig/bin/cylc
++++ cylc-7.4.0/bin/cylc
+@@ -186,7 +186,6 @@ categories['license'] = ['license', 'GPL
information_commands = OrderedDict()
information_commands['gscan'] = ['gscan', 'gsummary']
@@ -10,7 +10,7 @@ Index: cylc-6.11.2/bin/cylc
information_commands['gui'] = ['gui', 'gcylc']
information_commands['list'] = ['list', 'ls']
information_commands['dump'] = ['dump']
-@@ -425,7 +424,6 @@ comsum['get-gui-config'] = 'Print gcylc
+@@ -398,7 +397,6 @@ comsum['get-suite-contact'] = 'Print the
comsum['get-suite-version'] = 'Print the cylc version of a suite daemon'
comsum['version'] = 'Print the cylc release version'
comsum['gscan'] = 'Scan GUI for monitoring multiple suites'
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cylc.git
More information about the debian-science-commits
mailing list