[Python-apps-commits] r7229 - in packages/slapos.core/trunk/debian (dirs rules)

[arnau at users.alioth.debian.org]

    Date: Thursday, June 23, 2011 @ 03:01:46
  Author: arnau
Revision: 7229

slapconsole must be in /usr/bin rather than /usr/sbin

Modified:
  packages/slapos.core/trunk/debian/dirs
  packages/slapos.core/trunk/debian/rules

Modified: packages/slapos.core/trunk/debian/dirs
===================================================================
--- packages/slapos.core/trunk/debian/dirs	2011-06-23 02:37:18 UTC (rev 7228)
+++ packages/slapos.core/trunk/debian/dirs	2011-06-23 03:01:46 UTC (rev 7229)
@@ -4,3 +4,4 @@
 var/lib/slapos/software/
 var/lib/slapos/instance/
 var/cache/slapos/certificates/
+usr/bin/

Modified: packages/slapos.core/trunk/debian/rules
===================================================================
--- packages/slapos.core/trunk/debian/rules	2011-06-23 02:37:18 UTC (rev 7228)
+++ packages/slapos.core/trunk/debian/rules	2011-06-23 03:01:46 UTC (rev 7229)
@@ -7,6 +7,9 @@
 	python2.6 setup.py install --root=debian/slapos-client --install-layout=deb \
 		--install-scripts=/usr/sbin/
 
+	# Only slapconsole script is not supposed to be ran by root
+	mv debian/slapos-client/usr/sbin/slapconsole debian/slapos-client/usr/bin/
+
 # Generate the upstream tarball from upstream Git (adapted from
 # http://wiki.debian.org/SandroTosi/Svn_get-orig-source for Git)
 PACKAGE := $(shell dpkg-parsechangelog  | \