[Pkg-zenoss-commits] r299 - in /trunk/packages/zenoss/debian: rules rules-extras.mk zenoss.dirs zenoss.dzinstance zenoss.install

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

Author: bzed-guest
Date: Mon Sep 24 19:03:42 2007
New Revision: 299

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=299
Log:
a zope skeleton is arch. independent -> /usr/share.

Modified:
    trunk/packages/zenoss/debian/rules
    trunk/packages/zenoss/debian/rules-extras.mk
    trunk/packages/zenoss/debian/zenoss.dirs
    trunk/packages/zenoss/debian/zenoss.dzinstance
    trunk/packages/zenoss/debian/zenoss.install

Modified: trunk/packages/zenoss/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules?rev=299&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules (original)
+++ trunk/packages/zenoss/debian/rules Mon Sep 24 19:03:42 2007
@@ -100,8 +100,8 @@
 		--install-purelib=/usr/share/python-support/zenoss \
 		--no-compile
 	dh_install -i -Nzenoss
-	cp -pr /usr/lib/$(ZOPE)/skel $(CURDIR)/debian/zenoss/usr/lib/zenoss
-	rm -f $(CURDIR)/debian/zenoss/usr/lib/zenoss/skel/import/*.zexp
+	cp -pr /usr/lib/$(ZOPE)/skel $(CURDIR)/debian/zenoss/usr/share/zenoss
+	rm -f $(CURDIR)/debian/zenoss/usr/share/zenoss/skel/import/*.zexp
 
 	dh_install -pzenoss -Xzope.conf.in -Xsudoers -Xmy.cnf -Xsnmpd.conf \
 		-Xfreetds.conf -XLICENSE.txt -XCOPYRIGHT.txt -Xlicense.txt \
@@ -110,11 +110,11 @@
 
 	#we want to have a persistant disk cache:
 	sed -i 's,#client zeo1,client zeo1,' \
-		$(CURDIR)/debian/zenoss/usr/lib/zenoss/skel/etc/zope.conf.in
+		$(CURDIR)/debian/zenoss/usr/share/zenoss/skel/etc/zope.conf.in
 
 	#we should use pysnmp-se within the zope apps, too:
 	sed -i '2 iPYSNMP_API_VERSION="v3"; export PYSNMP_API_VERSION' \
-               $(CURDIR)/debian/zenoss/usr/lib/zenoss/skel/bin/zopectl.in
+               $(CURDIR)/debian/zenoss/usr/share/zenoss/skel/bin/zopectl.in
 
 
 	sed -i '1 s,#!/usr/bin/python.*,,g' $(CURDIR)/debian/zenoss/usr/share/zope/Products/ZenUITests/tests/selenium/*.py

Modified: trunk/packages/zenoss/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules-extras.mk?rev=299&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules-extras.mk (original)
+++ trunk/packages/zenoss/debian/rules-extras.mk Mon Sep 24 19:03:42 2007
@@ -165,7 +165,7 @@
 	              Products/ZenRRD/zenperfsnmp.py \
 	              Products/ZenRRD/zenrender.py \
 	              Products/ZenReports/ReportMail.py ;\
-	    chmod 644 Products/ZenWidgets/skins/zenui/flex/XMLItemView.mxml ;\
+	    chmod 644 Products/ZenWidgets/skins/zenui/flex/*.mxml ;\
 	echo "packaging the orig.tar.gz and cleaning up" ;\
 	    cd $$packdir/.. ;\
 	    tar cf - $$origdirname | gzip --best - > $$tarball ;\

Modified: trunk/packages/zenoss/debian/zenoss.dirs
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dirs?rev=299&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dirs (original)
+++ trunk/packages/zenoss/debian/zenoss.dirs Mon Sep 24 19:03:42 2007
@@ -1,5 +1,5 @@
-usr/lib/zenoss/skel/perf
-usr/lib/zenoss/skel/share
+usr/share/zenoss/skel/perf
+usr/share/zenoss/skel/share
 usr/lib/zenoss
 usr/share/dbconfig-common/data/zenoss/install-dbadmin
 var/cache/zenoss

Modified: trunk/packages/zenoss/debian/zenoss.dzinstance
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.dzinstance?rev=299&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.dzinstance (original)
+++ trunk/packages/zenoss/debian/zenoss.dzinstance Mon Sep 24 19:03:42 2007
@@ -5,6 +5,6 @@
 Addon-Technique: tree-linked
 Restart-Policy: end
 Products: ZenModel, DataCollector, ZenRelations, ZenRRD, ZenEvents, ZenStatus, ZenTestCase, ZenReports, ZenWidgets, ZenTestRunner, ZenUITests, ZenUtils
-Skeleton: /usr/lib/zenoss/skel
+Skeleton: /usr/share/zenoss/skel
 Zope-Database: ZEO
 Zope-User: zenoss:zenoss

Modified: trunk/packages/zenoss/debian/zenoss.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/zenoss.install?rev=299&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/zenoss.install (original)
+++ trunk/packages/zenoss/debian/zenoss.install Mon Sep 24 19:03:42 2007
@@ -1,6 +1,6 @@
 Products/*		usr/share/zope/Products/
-conf/*			usr/lib/zenoss/skel/etc/
-bin/*			usr/lib/zenoss/skel/bin/
-debian/.bashrc		usr/lib/zenoss/skel/
-debian/.bash_profile	usr/lib/zenoss/skel/
+conf/*			usr/share/zenoss/skel/etc/
+bin/*			usr/share/zenoss/skel/bin/
+debian/.bashrc		usr/share/zenoss/skel/
+debian/.bash_profile	usr/share/zenoss/skel/
 debian/sql.install/*	usr/share/dbconfig-common/data/zenoss/