[cylc] 05/23: refresh patches
Alastair McKinstry
mckinstry at moszumanska.debian.org
Sun Mar 26 12:04:06 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 1fb602954a9f6ff962abcc2792042a94771b1959
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Nov 5 06:09:40 2016 +0000
refresh patches
---
debian/patches/envvars.patch | 135 +++++++++++++++----------------------------
debian/patches/fixes.patch | 38 +++---------
debian/patches/license.patch | 8 +--
3 files changed, 60 insertions(+), 121 deletions(-)
diff --git a/debian/patches/envvars.patch b/debian/patches/envvars.patch
index 7666536..cbaf1d1 100644
--- a/debian/patches/envvars.patch
+++ b/debian/patches/envvars.patch
@@ -1,47 +1,20 @@
-Index: cylc-6.1.0/lib/cylc/cfgspec/gcylc.py
+Index: cylc-6.11.2/lib/cylc/cfgspec/gcylc.py
===================================================================
---- cylc-6.1.0.orig/lib/cylc/cfgspec/gcylc.py
-+++ cylc-6.1.0/lib/cylc/cfgspec/gcylc.py
-@@ -28,7 +28,8 @@ from cylc.task_state import task_state
+--- cylc-6.11.2.orig/lib/cylc/cfgspec/gcylc.py
++++ cylc-6.11.2/lib/cylc/cfgspec/gcylc.py
+@@ -37,6 +37,7 @@ from cylc.task_state import (
"gcylc config file format."
--SITE_FILE = os.path.join( os.environ['CYLC_DIR'], 'conf', 'gcylcrc', 'themes.rc' )
+CYLC_DIR = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
-+SITE_FILE = os.path.join( CYLC_DIR, 'conf', 'gcylcrc', 'themes.rc' )
- USER_FILE = os.path.join( os.environ['HOME'], '.cylc', 'gcylc.rc' )
-
- SPEC = {
-Index: cylc-6.1.0/lib/cylc/cfgspec/globalcfg.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
===================================================================
---- cylc-6.1.0.orig/lib/cylc/cfgspec/globalcfg.py
-+++ cylc-6.1.0/lib/cylc/cfgspec/globalcfg.py
-@@ -30,7 +30,8 @@ import cylc.flags
-
- "Cylc site and user configuration file spec."
-
--SITE_FILE = os.path.join( os.environ['CYLC_DIR'], 'conf', 'siterc', 'site.rc' )
-+CYLC_DIR = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
-+SITE_FILE = os.path.join( CYLC_DIR, 'conf', 'siterc', 'site.rc' )
- USER_FILE = os.path.join( os.environ['HOME'], '.cylc', 'user.rc' )
-
- SPEC = {
-@@ -57,10 +58,10 @@ SPEC = {
-
- 'documentation' : {
- 'files' : {
-- 'html index' : vdr( vtype='string', default="$CYLC_DIR/doc/index.html" ),
-- 'pdf user guide' : vdr( vtype='string', default="$CYLC_DIR/doc/pdf/cug-pdf.pdf" ),
-- 'multi-page html user guide' : vdr( vtype='string', default="$CYLC_DIR/doc/html/multi/cug-html.html" ),
-- 'single-page html user guide' : vdr( vtype='string', default="$CYLC_DIR/doc/html/single/cug-html.html" ),
-+ 'html index' : vdr( vtype='string', default="%s/doc/index.html" % CYLC_DIR ),
-+ 'pdf user guide' : vdr( vtype='string', default="%s/doc/pdf/cug-pdf.pdf" % CYLC_DIR),
-+ 'multi-page html user guide' : vdr( vtype='string', default="%s/doc/html/multi/cug-html.html" % CYLC_DIR ),
-+ 'single-page html user guide' : vdr( vtype='string', default="%s/doc/html/single/cug-html.html" % CYLC_DIR ),
- },
- 'urls' : {
- 'internet homepage' : vdr( vtype='string', default="http://cylc.github.com/cylc/" ),
-@@ -174,7 +175,8 @@ class GlobalConfig( config ):
+--- 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):
_DEFAULT = None
CONF_BASE = "global.rc"
@@ -51,25 +24,11 @@ Index: cylc-6.1.0/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.1.0/lib/cylc/cylc_xdot.py
+Index: cylc-6.11.2/lib/cylc/gui/util.py
===================================================================
---- cylc-6.1.0.orig/lib/cylc/cylc_xdot.py
-+++ cylc-6.1.0/lib/cylc/cylc_xdot.py
-@@ -283,7 +283,8 @@ class MyDotWindow( CylcDotViewerCommon )
- self.actiongroup = actiongroup
-
- # create new stock icons for group and ungroup actions
-- imagedir = os.environ[ 'CYLC_DIR' ] + '/images/icons'
-+ cylcdir = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
-+ imagedir = cylcdir + '/images/icons'
- factory = gtk.IconFactory()
- for i in [ 'group', 'ungroup' ]:
- pixbuf = gtk.gdk.pixbuf_new_from_file( imagedir + '/' + i + '.png' )
-Index: cylc-6.1.0/lib/cylc/gui/util.py
-===================================================================
---- cylc-6.1.0.orig/lib/cylc/gui/util.py
-+++ cylc-6.1.0/lib/cylc/gui/util.py
-@@ -93,7 +93,7 @@ class EntryDialog(gtk.MessageDialog):
+--- cylc-6.11.2.orig/lib/cylc/gui/util.py
++++ cylc-6.11.2/lib/cylc/gui/util.py
+@@ -95,7 +95,7 @@ class EntryDialog(gtk.MessageDialog):
def get_image_dir():
"""Return the root directory for cylc images."""
try:
@@ -78,30 +37,30 @@ Index: cylc-6.1.0/lib/cylc/gui/util.py
except KeyError:
# This should not happen (unecessary)
raise SystemExit("ERROR: $CYLC_DIR is not defined!")
-Index: cylc-6.1.0/lib/cylc/scheduler.py
+Index: cylc-6.11.2/lib/cylc/scheduler.py
===================================================================
---- cylc-6.1.0.orig/lib/cylc/scheduler.py
-+++ cylc-6.1.0/lib/cylc/scheduler.py
-@@ -686,13 +686,14 @@ class scheduler(object):
-
- def configure_suite_environment( self ):
+--- 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_DIR = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
self.suite_env = {
- 'CYLC_UTC' : str(flags.utc),
- 'CYLC_CYCLING_MODE' : str(flags.cycling_mode),
- 'CYLC_MODE' : 'scheduler',
- 'CYLC_DEBUG' : str( flags.debug ),
- 'CYLC_VERBOSE' : str( 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.1.0/lib/cylc/version.py
+ '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
===================================================================
---- cylc-6.1.0.orig/lib/cylc/version.py
-+++ cylc-6.1.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_
def _get_cylc_version():
"""Determine and return cylc version string."""
@@ -111,17 +70,17 @@ Index: cylc-6.1.0/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.1.0/lib/parsec/Jinja2Support.py
+Index: cylc-6.11.2/lib/cylc/cylc_xdot.py
===================================================================
---- cylc-6.1.0.orig/lib/parsec/Jinja2Support.py
-+++ cylc-6.1.0/lib/parsec/Jinja2Support.py
-@@ -72,7 +72,8 @@ def Jinja2Process( flines, dir, inputs=[
- #| #!/usr/bin/env python
- #| def foo( value, length, fillchar ):
- #| return str(value).rjust( int(length), str(fillchar) )
-- fdirs = [os.path.join( os.environ['CYLC_DIR'], 'lib', 'Jinja2Filters' ),
-+ CYLC_DIR = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
-+ fdirs = [os.path.join( CYLC_DIR, 'lib', 'Jinja2Filters' ),
- os.path.join( dir, 'Jinja2Filters' ),
- os.path.join( os.path.join( os.environ['HOME'], '.cylc', 'Jinja2Filters' ))]
- usedfdirs = []
+--- 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):
+ self.actiongroup = actiongroup
+
+ # create new stock icons for group and ungroup actions
+- imagedir = os.environ['CYLC_DIR'] + '/images/icons'
++ cylcdir = os.environ['CYLC_DIR'] if 'CYLC_DIR' in os.environ else '/usr/share/cylc'
++ imagedir = cylcdir + '/images/icons'
+ factory = gtk.IconFactory()
+ for i in ['group', 'ungroup']:
+ pixbuf = gtk.gdk.pixbuf_new_from_file(imagedir + '/' + i + '.png')
diff --git a/debian/patches/fixes.patch b/debian/patches/fixes.patch
index ab9e589..27aaa05 100644
--- a/debian/patches/fixes.patch
+++ b/debian/patches/fixes.patch
@@ -1,39 +1,19 @@
-Index: cylc-6.1.0/lib/cylc/cylc_xdot.py
+Index: cylc-6.11.2/lib/cylc/cylc_xdot.py
===================================================================
---- cylc-6.1.0.orig/lib/cylc/cylc_xdot.py
-+++ cylc-6.1.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
@@ -1,4 +1,4 @@
-#!/usr/bin/env
+#!/usr/bin/python
- #C: THIS FILE IS PART OF THE CYLC SUITE ENGINE.
- #C: Copyright (C) 2008-2014 Hilary Oliver, NIWA
-Index: cylc-6.1.0/lib/cylc/port_scan.py
+ # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
+ # Copyright (C) 2008-2016 NIWA
+Index: cylc-6.11.2/lib/cylc/cycling/iso8601.py
===================================================================
---- cylc-6.1.0.orig/lib/cylc/port_scan.py
-+++ cylc-6.1.0/lib/cylc/port_scan.py
-@@ -1,4 +1,4 @@
--#!/usr/bin/pyro
-+#!/usr/bin/python
-
- #C: THIS FILE IS PART OF THE CYLC SUITE ENGINE.
- #C: Copyright (C) 2008-2014 Hilary Oliver, NIWA
-Index: cylc-6.1.0/examples/detaching/bin/model-wrapper.sh
-===================================================================
---- cylc-6.1.0.orig/examples/detaching/bin/model-wrapper.sh
-+++ cylc-6.1.0/examples/detaching/bin/model-wrapper.sh
-@@ -1,4 +1,4 @@
--#/bin/bash
-+#!/bin/bash
-
- set -eu
-
-Index: cylc-6.1.0/lib/cylc/cycling/iso8601.py
-===================================================================
---- cylc-6.1.0.orig/lib/cylc/cycling/iso8601.py
-+++ cylc-6.1.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
@@ -1,3 +1,4 @@
+#!/usr/bin/python
# -*- coding: utf-8 -*-
- #C: THIS FILE IS PART OF THE CYLC SUITE ENGINE.
+ # THIS FILE IS PART OF THE CYLC SUITE ENGINE.
diff --git a/debian/patches/license.patch b/debian/patches/license.patch
index baad7df..0a41d33 100644
--- a/debian/patches/license.patch
+++ b/debian/patches/license.patch
@@ -1,11 +1,11 @@
-Index: cylc-6.1.0/bin/cylc-conditions
+Index: cylc-6.11.2/bin/cylc-conditions
===================================================================
---- cylc-6.1.0.orig/bin/cylc-conditions
-+++ cylc-6.1.0/bin/cylc-conditions
+--- cylc-6.11.2.orig/bin/cylc-conditions
++++ cylc-6.11.2/bin/cylc-conditions
@@ -38,5 +38,5 @@ fi
echo
echo "The GNU General Public License v3.0"
echo
--cat $CYLC_DIR/COPYING
+-cat $CYLC_DIR/COPYING.md
+cat /usr/share/common-licenses/GPL-3
echo
--
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