[cylc] 19/33: Remove gpanel support. fix etc link

[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 1d71530fd629d578b245e732c21538f0cc3df316
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Fri Nov 14 16:59:37 2014 +0000

    Remove gpanel support. fix etc link
---
 debian/bash_completion.d/cylc | 4 +++-
 debian/python-cylc.links      | 2 +-
 debian/rules                  | 2 ++
 3 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/debian/bash_completion.d/cylc b/debian/bash_completion.d/cylc
index 70e9d32..c4470b6 100644
--- a/debian/bash_completion.d/cylc
+++ b/debian/bash_completion.d/cylc
@@ -1,11 +1,13 @@
 # Initial cut of bash completion. Could be smarter.
+
+# Note: remove gpanel. Won't work due to gnomeapplet support missing.
 complete -W "\
 5to6  all db database preparation help information discovery control utility \
 broadast cat-log cat-state check-software check-triggering check-versions \
 conditions copy  cycle-point datetime cycletime depend diff compare documentation browse \
 dump edit email-suite email-task failed task-failed get-directory get-gui-config \
 get-site-config get-global-config get-suite-config get-config \
-gpanel graph gsummary gui hold import-examples insert \
+graph gsummary gui hold import-examples insert \
 job-kill job-poll job-submit kill list ls message task-message \
 monitor nudge ping poll print purge random rnd refresh register release unhold \
 reload remove reregister rename reset restart run \
diff --git a/debian/python-cylc.links b/debian/python-cylc.links
index 66158f9..244f00f 100644
--- a/debian/python-cylc.links
+++ b/debian/python-cylc.links
@@ -1 +1 @@
-/usr/share/cylc/conf /etc/cylc
+/etc/cylc /usr/share/cylc/conf
diff --git a/debian/rules b/debian/rules
index cb9c0fa..5461756 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,6 +8,8 @@ override_dh_auto_build:
 	PATH=$(PATH):$(CURDIR)/bin && $(MAKE)
 
 override_dh_auto_install:
+	# Don't support gpanel. Requires gnome2's gnomeapplet.
+	rm bin/cylc-gpanel conf/gpanel
 	mkdir -p debian/tmp/usr/bin
 	sed -e 's%/home/admin/cylc%/usr/share%' <  \
 	 	admin/cylc-wrapper	> debian/tmp/usr/bin/cylc

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