[cylc] 06/07: Fix for FTBFS on arch-only builds.

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 4a30fc535fe7f899c44e1271b63c03d7ca809d97
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Sep 11 10:23:58 2017 +0100

    Fix for FTBFS on arch-only builds.
---
 debian/changelog | 6 ++++++
 debian/rules     | 9 ++++++---
 2 files changed, 12 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index af344c8..5229312 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+cylc (7.5.0-2) unstable; urgency=medium
+
+  * Fix for FTBFS on arch-only builds. 
+
+ -- Alastair McKinstry <mckinstry at debian.org>  Mon, 11 Sep 2017 10:23:36 +0100
+
 cylc (7.5.0-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/rules b/debian/rules
index 2eae572..808df5f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -25,9 +25,12 @@ override_dh_auto_install:
 	install -d -m 0755 $(CURDIR)/debian/cylc-el/usr/share/emacs/site-lisp/cylc
 	install    -m 0644 conf/cylc-mode.el \
                            $(CURDIR)/debian/cylc-el/usr/share/emacs/site-lisp/cylc/cylc-mode.el
+	# Do this part if full build (not just arch-dependent)
+	[ -d $(CURDIR)/debian/cylc ] && (  \
 	install  -m 0755 debian/cylc.py  \
-			$(CURDIR)/debian/cylc/usr/share/cylc/bin/cylc
-	install -m 0644 images/icon.png $(CURDIR)/debian/cylc/usr/share/pixmaps/cylc.png
+			$(CURDIR)/debian/cylc/usr/share/cylc/bin/cylc  ; \
+	install -m 0644 images/icon.png $(CURDIR)/debian/cylc/usr/share/pixmaps/cylc.png ; \
+		)
 
 override_dh_fixperms:
 	# Delete after install. Use packages instead.
@@ -35,7 +38,7 @@ override_dh_fixperms:
 		rm -rf debian/python-cylc/usr/lib/python2.7/dist-packages/$$p ; \
 		done
 	dh_fixperms
-	
+
 override_dh_auto_clean:
 	$(MAKE) clean || echo "Clean already."
 	find . -name '*.pyc' -delete

-- 
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