[Python-apps-commits] r7857 - in packages/openerp6/trunk (debian debian/rules)

[xnox-guest at users.alioth.debian.org]

    Date: Friday, November 25, 2011 @ 23:28:16
  Author: xnox-guest
Revision: 7857

Updates to server

Modified:
  packages/openerp6/trunk/debian/	(properties)
  packages/openerp6/trunk/debian/rules

Modified: packages/openerp6/trunk/debian/rules
===================================================================
--- packages/openerp6/trunk/debian/rules	2011-11-25 22:13:09 UTC (rev 7856)
+++ packages/openerp6/trunk/debian/rules	2011-11-25 23:28:16 UTC (rev 7857)
@@ -5,32 +5,34 @@
 
 DH_VERBOSE:=1
 
+SERVER:=$(DEB_SOURCE)-server
+
 %:
 	dh $@ --with python2
 
 override_dh_auto_install:
-	dh_auto_install -- --install-lib /usr/share/$(DEB_SOURCE)
+	dh_auto_install -- --install-lib /usr/share/$(SERVER)
 
 override_dh_installdirs:
-	dh_installdirs /var/lib/$(DEB_SOURCE)/filestore /var/lib/$(DEB_SOURCE)/backup /var/log/$(DEB_SOURCE)
+	dh_installdirs /var/lib/$(SERVER)/filestore /var/lib/$(SERVER)/backup /var/log/$(SERVER)
 
 override_dh_install:
-	cp debian/local/config debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE)/$(DEB_SOURCE).conf.tpl
-	cp -r pixmaps debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE)
+	cp debian/local/config debian/$(SERVER)/usr/share/$(SERVER)/$(SERVER).conf.tpl
+	cp -r pixmaps debian/$(SERVER)/usr/share/$(SERVER)
 	dh_install
 
 override_dh_installchangelogs:
 	dh_installchangelogs doc/Changelog
 
 override_dh_link:
-	dh_link -- /var/lib/$(DEB_SOURCE)/filestore /usr/share/$(DEB_SOURCE)/$(DEB_SOURCE)/filestore \
-                   /var/lib/$(DEB_SOURCE)/backup /usr/share/$(DEB_SOURCE)/$(DEB_SOURCE)/backup
+	dh_link -- /var/lib/$(SERVER)/filestore /usr/share/$(SERVER)/$(SERVER)/filestore \
+                   /var/lib/$(SERVER)/backup /usr/share/$(SERVER)/$(SERVER)/backup
 
 
 override_dh_fixperms:
 	dh_fixperms
-	find debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE)/$(DEB_SOURCE)/addons -type f -print0 | xargs -0 chmod 0644
-	chmod 755 debian/$(DEB_SOURCE)/usr/share/$(DEB_SOURCE)/$(DEB_SOURCE)/openerp-server.py
+	find debian/$(SERVER)/usr/share/$(SERVER)/$(SERVER)/addons -type f -print0 | xargs -0 chmod 0644
+	chmod 755 debian/$(SERVER)/usr/share/$(SERVER)/$(SERVER)/openerp-server.py
 
 # You can specify local checkout, e.g.
 # export UPSTREAM_BRANCH=~/src/openerp/6.0/server
@@ -61,7 +63,7 @@
 generate-config:
 	HOME=./debian/local ./bin/openerp-server.py \
 		-s --stop-after-init \
-		--logfile=/var/log/$(DEB_SOURCE)/$(DEB_SOURCE).log
+		--logfile=/var/log/$(SERVER)/$(SERVER).log
 	sed -f ./debian/local/config.sed ./debian/local/.openerp_serverrc > debian/local/config
 	rm ./debian/local/.openerp_serverrc