[cylc] 03/11: * Don't automatically create version file (which overwrites VERSION created in ./rules and causes FTBFS on underscores * Don't include gpanel in cylc subcommands list

[Alastair McKinstry]

This is an automated email from the git hooks/post-receive script.

mckinstry pushed a commit to branch debian/master
in repository cylc.

commit 267e02fa9b578562321779925c6bcf23738cd712
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Mar 31 17:04:23 2017 +0100

    * Don't automatically create version file (which overwrites VERSION created
      in ./rules and causes FTBFS on underscores
    * Don't include gpanel in cylc subcommands list
---
 debian/changelog               |  8 ++++++++
 debian/patches/makefile.patch  | 18 ++++++++++++++++++
 debian/patches/rm-gpanel.patch | 20 ++++++++++++++++++++
 debian/patches/series          |  2 ++
 debian/rules                   |  2 +-
 5 files changed, 49 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 5ce8c46..8a20433 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+cylc (6.11.2-7) unstable; urgency=medium
+
+  * Don't automatically create version file (which overwrites VERSION created
+    in ./rules and causes FTBFS on underscores
+  * Don't include gpanel in cylc subcommands list
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Fri, 31 Mar 2017 17:00:45 +0100
+
 cylc (6.11.2-6) unstable; urgency=medium
 
   * Patch to fix FTBFS when version includes an underscore.
diff --git a/debian/patches/makefile.patch b/debian/patches/makefile.patch
new file mode 100644
index 0000000..1b7b128
--- /dev/null
+++ b/debian/patches/makefile.patch
@@ -0,0 +1,18 @@
+Author: Alastair McKinstry <mmckinstry at debian.org>
+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
+===================================================================
+--- cylc-6.11.2.orig/Makefile
++++ cylc-6.11.2/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
+ 
+ version:
+ 	admin/create-version-file
diff --git a/debian/patches/rm-gpanel.patch b/debian/patches/rm-gpanel.patch
new file mode 100644
index 0000000..2b3f2c9
--- /dev/null
+++ b/debian/patches/rm-gpanel.patch
@@ -0,0 +1,20 @@
+Index: cylc-6.11.2/bin/cylc
+===================================================================
+--- cylc-6.11.2.orig/bin/cylc
++++ cylc-6.11.2/bin/cylc
+@@ -193,7 +193,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']
+@@ -425,7 +424,6 @@ comsum['get-gui-config'] = 'Print gcylc
+ 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 a641927..043d881 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,5 @@
 fixes.patch
 envvars.patch
 license.patch
+makefile.patch
+rm-gpanel.patch
diff --git a/debian/rules b/debian/rules
index 1e74c2b..2952a21 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,10 +7,10 @@
 VERSION = $(shell dpkg-parsechangelog --show-field Version)
 
 override_dh_auto_build:
+	echo $(VERSION) > VERSION
 	PATH=$(PATH):$(CURDIR)/bin && $(MAKE)
 
 override_dh_auto_install:
-	echo $(VERSION) > VERSION
 	# Don't support gpanel. Requires gnome2's gnomeapplet.
 	rm -rf  bin/cylc-gpanel conf/gpanel
 	mkdir -p debian/tmp/usr/bin

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/cylc.git