[med-svn] [mobyle] 01/01: Make sure /usr/share/mobyle/core/Tools/setsid will not remain in mobyle package for indep only builds

[Andreas Tille]

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

tille pushed a commit to branch master
in repository mobyle.

commit ab4996d28a953352c8019ab6d31cfbcdb1c7afc7
Author: Andreas Tille <tille at debian.org>
Date:   Mon Dec 18 09:24:31 2017 +0100

    Make sure /usr/share/mobyle/core/Tools/setsid will not remain in mobyle package for indep only builds
---
 debian/changelog | 8 ++++++++
 debian/rules     | 7 ++++++-
 2 files changed, 14 insertions(+), 1 deletion(-)

diff --git a/debian/changelog b/debian/changelog
index 04f72ba..8d28d66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+mobyle (1.5.5+dfsg-5) unstable; urgency=medium
+
+  * Make sure /usr/share/mobyle/core/Tools/setsid will not remain in mobyle
+    package for indep only builds.
+    Closes: #884643
+
+ -- Andreas Tille <tille at debian.org>  Mon, 18 Dec 2017 09:19:48 +0100
+
 mobyle (1.5.5+dfsg-4) unstable; urgency=medium
 
   * Remove Google Analytics beacon.
diff --git a/debian/rules b/debian/rules
index d76d212..ef796ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,7 +20,7 @@ debian/common-install-stamp:
 	touch $@
 
 override_dh_auto_install-arch: debian/common-install-stamp
-	mv debian/mobyle/usr/share/mobyle/core/Tools/setsid debian/mobyle-utils/usr/bin/mobyle-setsid
+	mv debian/mobyle/usr/share/mobyle/core/Tools/setsid debian/mobyle-utils/usr/bin/mobyle-setsid || true # do not fail if this has just happened in indep build
 
 override_dh_auto_install-indep: debian/common-install-stamp
 	find debian/mobyle/usr/share/mobyle/core -type f | xargs sed -i "s/MOBYLEHOME = '.*'/MOBYLEHOME = '\/usr\/share\/mobyle\/core'/g"
@@ -38,6 +38,11 @@ override_dh_auto_install-indep: debian/common-install-stamp
 	find debian/mobyle  -name *.html | xargs chmod 644
 	find debian/mobyle  -name *.xml | xargs chmod 644
 	mv debian/mobyle/usr/share/mobyle/htdocs/portal/html/announcement.txt debian/mobyle/etc/mobyle/
+	# make sure setsid will not remain in the install tree of mobile for indep only builds
+	if [ -e debian/mobyle/usr/share/mobyle/core/Tools/setsid ] ; then \
+	    mkdir -p debian/mobyle-utils/usr/bin/ ; \
+	    mv debian/mobyle/usr/share/mobyle/core/Tools/setsid debian/mobyle-utils/usr/bin/mobyle-setsid ; \
+	fi
 
 override_dh_fixperms:
 	dh_fixperms

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/mobyle.git