Finalize moving to /usr/share/rocci-server (Debian expects it and apache requires...

diff --git a/rocci-server/debian/rocci-server.dirs b/rocci-server/debian/rocci-server.dirs
index 4b63a12..d815a93 100644 (file)
--- a/rocci-server/debian/rocci-server.dirs
+++ b/rocci-server/debian/rocci-server.dirs
@@ -1,2 +1,2 @@
-usr/lib/rocci-server
+usr/share/rocci-server
 var/log/rocci-server

diff --git a/rocci-server/debian/rocci-server.install b/rocci-server/debian/rocci-server.install
index 03916c5..997098a 100644 (file)
--- a/rocci-server/debian/rocci-server.install
+++ b/rocci-server/debian/rocci-server.install
@@ -1,18 +1,18 @@
-.bundle        usr/lib/rocci-server
-app    usr/lib/rocci-server
-bin    usr/lib/rocci-server
-config usr/lib/rocci-server
-db     usr/lib/rocci-server
-etc    usr/lib/rocci-server
-lib    usr/lib/rocci-server
-public usr/lib/rocci-server
-spec   usr/lib/rocci-server
-test   usr/lib/rocci-server
-Capfile        usr/lib/rocci-server
-Rakefile       usr/lib/rocci-server
-Gemfile        usr/lib/rocci-server
-Gemfile.lock   usr/lib/rocci-server
-Guardfile      usr/lib/rocci-server
-config.ru      usr/lib/rocci-server
+.bundle        usr/share/rocci-server
+app    usr/share/rocci-server
+bin    usr/share/rocci-server
+config usr/share/rocci-server
+db     usr/share/rocci-server
+etc    usr/share/rocci-server
+lib    usr/share/rocci-server
+public usr/share/rocci-server
+spec   usr/share/rocci-server
+test   usr/share/rocci-server
+Capfile        usr/share/rocci-server
+Rakefile       usr/share/rocci-server
+Gemfile        usr/share/rocci-server
+Gemfile.lock   usr/share/rocci-server
+Guardfile      usr/share/rocci-server
+config.ru      usr/share/rocci-server
 
-debian/occi-ssl.conf   usr/lib/doc/rocci-server/examples/etc/apache2/sites-available
+debian/occi-ssl.conf   usr/share/doc/rocci-server/examples/etc/apache2/sites-available

diff --git a/rocci-server/debian/rocci-server.links b/rocci-server/debian/rocci-server.links
index b700ea3..53d2222 100644 (file)
--- a/rocci-server/debian/rocci-server.links
+++ b/rocci-server/debian/rocci-server.links
@@ -1,2 +1,2 @@
 # no FHS support, just point to proper place
-usr/lib/rocci-server/etc       etc/rocci-server
+usr/share/rocci-server/etc     etc/rocci-server