From: František Dvořák <valtri@civ.zcu.cz>
Date: Wed, 12 Mar 2014 17:28:33 +0000 (+0100)
Subject: It's noarch package now.
X-Git-Url: http://scientific.zcu.cz/git/?a=commitdiff_plain;h=623bae88eab723707c69d132659d59f256a45b70;p=rOCCI-packaging.git

It's noarch package now.
---

diff --git a/rocci-server/debian/control b/rocci-server/debian/control
index ca40cf2..a1eeb79 100644
--- a/rocci-server/debian/control
+++ b/rocci-server/debian/control
@@ -9,7 +9,7 @@ Vcs-Git: git://github.com/EGI-FCTF/rOCCI-server.git
 XS-Ruby-Versions: ruby1.9.1
 
 Package: rocci-server
-Architecture: any
+Architecture: all
 XB-Ruby-Versions: ${ruby:Versions}
 Pre-Depends: ${misc:Pre-Depends}, adduser
 # keystones: openssl-cms-1-9-3/openssl-cms-2-0-0
diff --git a/rocci-server/debian/rocci-server.preinst b/rocci-server/debian/rocci-server.preinst
index 7724d44..2d197a5 100644
--- a/rocci-server/debian/rocci-server.preinst
+++ b/rocci-server/debian/rocci-server.preinst
@@ -2,6 +2,6 @@
 set -e
 
 getent group rocci >/dev/null || addgroup --system rocci
-getent passwd rocci >/dev/null || adduser --system --group --home /usr/lib/rocci-server rocci
+getent passwd rocci >/dev/null || adduser --system --group --home /usr/share/rocci-server rocci
 
 #DEBHELPER#
diff --git a/rocci-server/debian/rules b/rocci-server/debian/rules
index 90f407c..d968cef 100755
--- a/rocci-server/debian/rules
+++ b/rocci-server/debian/rules
@@ -5,7 +5,7 @@ p_name=rocci-server
 
 binary:
 	sed examples/etc/apache2/sites-available/occi-ssl \
-		-e 's,\(DocumentRoot\|Directory\).*\(/public\),\1 /usr/lib/rocci-server\2,i' \
+		-e 's,\(DocumentRoot\|Directory\).*\(/public\),\1 /usr/share/rocci-server\2,i' \
 		-e 's,^\(\s*\)#\s*\(PassengerUser\).*,\1\2 rocci,i' \
 		-e 's,^\(\s*\)#\s*\(PassengerGroup\).*,\1\2 rocci,i' \
 		-e 's,^\(\s*\)#\s*\(SetEnv\s*ROCCI_SERVER_LOG_DIR\).*,\1\2 /var/log/rocci-server,i' \
@@ -13,10 +13,6 @@ binary:
 		> debian/occi-ssl
 	dh $@
 
-#build:
-#	bundle install --deployment --without 'test development'
-#	dh $@
-
 override_dh_installdocs:
 	dh_installdocs --link-doc=$(p_name)