[cylc] 03/07: * Refresh patches - rm-gpanel.patch now upstream
Alastair McKinstry
mckinstry at moszumanska.debian.org
Wed Sep 20 15:23:22 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 795c23c7d64f719a3db304480a65978ac0ff639a
Author: Alastair McKinstry <mckinstry at debian.org>
Date: Sat Sep 9 15:44:29 2017 +0100
* Refresh patches
- rm-gpanel.patch now upstream
---
debian/changelog | 2 ++
debian/patches/envvars.patch | 42 +++++++++++++++++++++---------------------
debian/patches/fixes.patch | 16 +++-------------
debian/patches/license.patch | 10 +++++-----
debian/patches/makefile.patch | 6 +++---
debian/patches/rm-gpanel.patch | 20 --------------------
debian/patches/series | 1 -
7 files changed, 34 insertions(+), 63 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 500c1fa..0c54bf9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
cylc (7.5.0-1) UNRELEASED; urgency=medium
* New upstream release
+ * Refresh patches
+ - rm-gpanel.patch now upstream
-- Alastair McKinstry <mckinstry at debian.org> Sat, 09 Sep 2017 15:30:35 +0100
diff --git a/debian/patches/envvars.patch b/debian/patches/envvars.patch
index 952efd9..8020ab4 100644
--- a/debian/patches/envvars.patch
+++ b/debian/patches/envvars.patch
@@ -1,7 +1,7 @@
-Index: cylc-7.4.0/lib/cylc/cfgspec/gcylc.py
+Index: cylc-7.5.0/lib/cylc/cfgspec/gcylc.py
===================================================================
---- cylc-7.4.0.orig/lib/cylc/cfgspec/gcylc.py
-+++ cylc-7.4.0/lib/cylc/cfgspec/gcylc.py
+--- cylc-7.5.0.orig/lib/cylc/cfgspec/gcylc.py
++++ cylc-7.5.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-7.4.0/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-7.4.0/lib/cylc/cfgspec/globalcfg.py
+Index: cylc-7.5.0/lib/cylc/cfgspec/globalcfg.py
===================================================================
---- 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):
+--- cylc-7.5.0.orig/lib/cylc/cfgspec/globalcfg.py
++++ cylc-7.5.0/lib/cylc/cfgspec/globalcfg.py
+@@ -399,7 +399,8 @@ class GlobalConfig(config):
_DEFAULT = None
CONF_BASE = "global.rc"
@@ -24,10 +24,10 @@ Index: cylc-7.4.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-7.4.0/lib/cylc/gui/util.py
+Index: cylc-7.5.0/lib/cylc/gui/util.py
===================================================================
---- cylc-7.4.0.orig/lib/cylc/gui/util.py
-+++ cylc-7.4.0/lib/cylc/gui/util.py
+--- cylc-7.5.0.orig/lib/cylc/gui/util.py
++++ cylc-7.5.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,11 +37,11 @@ Index: cylc-7.4.0/lib/cylc/gui/util.py
except KeyError:
# This should not happen (unecessary)
raise SystemExit("ERROR: $CYLC_DIR is not defined!")
-Index: cylc-7.4.0/lib/cylc/scheduler.py
+Index: cylc-7.5.0/lib/cylc/scheduler.py
===================================================================
---- 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`.
+--- cylc-7.5.0.orig/lib/cylc/scheduler.py
++++ cylc-7.5.0/lib/cylc/scheduler.py
+@@ -835,8 +835,9 @@ conditions; see `cylc conditions`.
# Write suite contact file.
# Preserve contact data in memory, for regular health check.
mgr = self.suite_srv_files_mgr
@@ -52,10 +52,10 @@ Index: cylc-7.4.0/lib/cylc/scheduler.py
mgr.KEY_NAME: self.suite,
mgr.KEY_HOST: self.host,
mgr.KEY_PROCESS: process_str,
-Index: cylc-7.4.0/lib/cylc/version.py
+Index: cylc-7.5.0/lib/cylc/version.py
===================================================================
---- cylc-7.4.0.orig/lib/cylc/version.py
-+++ cylc-7.4.0/lib/cylc/version.py
+--- cylc-7.5.0.orig/lib/cylc/version.py
++++ cylc-7.5.0/lib/cylc/version.py
@@ -28,7 +28,7 @@ UNKNOWN = "UNKNOWN"
def _get_cylc_version():
"""Determine and return cylc version string."""
@@ -65,11 +65,11 @@ Index: cylc-7.4.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-7.4.0/lib/cylc/cylc_xdot.py
+Index: cylc-7.5.0/lib/cylc/cylc_xdot.py
===================================================================
---- 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):
+--- cylc-7.5.0.orig/lib/cylc/cylc_xdot.py
++++ cylc-7.5.0/lib/cylc/cylc_xdot.py
+@@ -312,7 +312,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 66773a3..e24f2e8 100644
--- a/debian/patches/fixes.patch
+++ b/debian/patches/fixes.patch
@@ -1,17 +1,7 @@
-Index: cylc-7.4.0/lib/cylc/cylc_xdot.py
+Index: cylc-7.5.0/lib/cylc/cycling/iso8601.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-2017 NIWA
-Index: cylc-7.4.0/lib/cylc/cycling/iso8601.py
-===================================================================
---- cylc-7.4.0.orig/lib/cylc/cycling/iso8601.py
-+++ cylc-7.4.0/lib/cylc/cycling/iso8601.py
+--- cylc-7.5.0.orig/lib/cylc/cycling/iso8601.py
++++ cylc-7.5.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 bef1dae..0089acc 100644
--- a/debian/patches/license.patch
+++ b/debian/patches/license.patch
@@ -1,11 +1,11 @@
-Index: cylc-7.4.0/bin/cylc-conditions
+Index: cylc-7.5.0/bin/cylc-conditions
===================================================================
---- cylc-7.4.0.orig/bin/cylc-conditions
-+++ cylc-7.4.0/bin/cylc-conditions
+--- cylc-7.5.0.orig/bin/cylc-conditions
++++ cylc-7.5.0/bin/cylc-conditions
@@ -38,5 +38,5 @@ fi
echo
echo "The GNU General Public License v3.0"
echo
--cat $CYLC_DIR/COPYING.md
-+cat /usr/share/common-licenses/GPL-3
+-cat $CYLC_DIR/COPYING
++cat /usr/share/commons-licenses/GPL-3
echo
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
index b31c6c6..f3cdaf5 100644
--- a/debian/patches/makefile.patch
+++ b/debian/patches/makefile.patch
@@ -3,10 +3,10 @@ Description: Don't automatically create version file (created by Debian rules)
Last-Updated: 2017-03-31
Forwarded: not-needed
-Index: cylc-7.4.0/Makefile
+Index: cylc-7.5.0/Makefile
===================================================================
---- cylc-7.4.0.orig/Makefile
-+++ cylc-7.4.0/Makefile
+--- cylc-7.5.0.orig/Makefile
++++ cylc-7.5.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/>.
diff --git a/debian/patches/rm-gpanel.patch b/debian/patches/rm-gpanel.patch
deleted file mode 100644
index 51cbaad..0000000
--- a/debian/patches/rm-gpanel.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Index: cylc-7.4.0/bin/cylc
-===================================================================
---- 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']
--information_commands['gpanel'] = ['gpanel']
- information_commands['gui'] = ['gui', 'gcylc']
- information_commands['list'] = ['list', 'ls']
- information_commands['dump'] = ['dump']
-@@ -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'
--comsum['gpanel'] = 'Internal interface for GNOME 2 panel applet'
- # control
- comsum['gui'] = '(a.k.a. gcylc) cylc GUI for suite control etc.'
- comsum['run'] = 'Start a suite at a given cycle point'
diff --git a/debian/patches/series b/debian/patches/series
index 043d881..2a6ea2a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,4 +2,3 @@ fixes.patch
envvars.patch
license.patch
makefile.patch
-rm-gpanel.patch
--
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