[Pkg-zenoss-commits] r152 - in /packages/zenoss/trunk/debian: patches/00list patches/08_zensocket-location.dpatch rules

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

Author: bzed-guest
Date: Mon Jun 18 18:22:36 2007
New Revision: 152

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=152
Log:
adding a patch to link to the proer zensocket location

Added:
    packages/zenoss/trunk/debian/patches/08_zensocket-location.dpatch   (with props)
Modified:
    packages/zenoss/trunk/debian/patches/00list
    packages/zenoss/trunk/debian/rules

Modified: packages/zenoss/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/00list?rev=152&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/00list (original)
+++ packages/zenoss/trunk/debian/patches/00list Mon Jun 18 18:22:36 2007
@@ -5,3 +5,4 @@
 05_remove-ZENHOME-os.getent
 06_remove-ZENHOME-rest
 07_zenfunctions-pythonpath
+08_zensocket-location

Added: packages/zenoss/trunk/debian/patches/08_zensocket-location.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/08_zensocket-location.dpatch?rev=152&op=file
==============================================================================
--- packages/zenoss/trunk/debian/patches/08_zensocket-location.dpatch (added)
+++ packages/zenoss/trunk/debian/patches/08_zensocket-location.dpatch Mon Jun 18 18:22:36 2007
@@ -1,0 +1,66 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 08_zensocket-location.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: updating tools to reflect our location of the zensocket file
+
+ at DPATCH@
+diff -urNad zenoss~/bin/zendisc zenoss/bin/zendisc
+--- zenoss~/bin/zendisc	2007-06-18 16:49:06.000000000 +0100
++++ zenoss/bin/zendisc	2007-06-18 17:07:02.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ 
+-SUDO="$(getent passwd zenoss | cut -d : -f 6)/bin/zensocket --ping -- "
++SUDO="/usr/lib/zenoss/bin/zensocket --ping -- "
+ PRGHOME=$(getent passwd zenoss | cut -d : -f 6)/Products/DataCollector
+ PRGNAME=zendisc.py
+ CFGFILE=$CFGDIR/zendisc.conf
+diff -urNad zenoss~/bin/zenmail zenoss/bin/zenmail
+--- zenoss~/bin/zenmail	2007-06-18 16:49:06.000000000 +0100
++++ zenoss/bin/zenmail	2007-06-18 19:07:59.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ 
+-SUDO="zensocket --listen=25 -- $(getent passwd zenoss | cut -d : -f 6)/bin/python "
++SUDO="/usr/lib/zenoss/bin/zensocket --listen=25 -- /usr/bin/python2.4 "
+ PRGHOME=$(getent passwd zenoss | cut -d : -f 6)/Products/ZenEvents
+ PRGNAME=zenmail.py
+ CFGFILE=$CFGDIR/zenmail.conf
+diff -urNad zenoss~/bin/zenping zenoss/bin/zenping
+--- zenoss~/bin/zenping	2007-06-18 16:49:06.000000000 +0100
++++ zenoss/bin/zenping	2007-06-18 19:08:02.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ 
+-SUDO="$(getent passwd zenoss | cut -d : -f 6)/bin/zensocket --ping -- "
++SUDO="/usr/lib/zenoss/bin/zensocket --ping -- "
+ PRGHOME=$(getent passwd zenoss | cut -d : -f 6)/Products/ZenStatus
+ PRGNAME=zenping.py
+ CFGFILE=$CFGDIR/zenping.conf
+diff -urNad zenoss~/bin/zensyslog zenoss/bin/zensyslog
+--- zenoss~/bin/zensyslog	2007-06-18 16:49:06.000000000 +0100
++++ zenoss/bin/zensyslog	2007-06-18 17:06:44.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ 
+-SUDO="$(getent passwd zenoss | cut -d : -f 6)/bin/zensocket --listen=514 -- "
++SUDO="/usr/lib/zenoss/bin/zensocket --listen=514 -- "
+ PRGHOME=$(getent passwd zenoss | cut -d : -f 6)/Products/ZenEvents
+ PRGNAME=zensyslog.py
+ CFGFILE=$CFGDIR/zensyslog.conf
+diff -urNad zenoss~/bin/zentrap zenoss/bin/zentrap
+--- zenoss~/bin/zentrap	2007-06-18 16:49:06.000000000 +0100
++++ zenoss/bin/zentrap	2007-06-18 17:06:53.000000000 +0100
+@@ -12,7 +12,7 @@
+ 
+ . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
+ 
+-SUDO="$(getent passwd zenoss | cut -d : -f 6)/bin/zensocket --listen=162 -- "
++SUDO="/usr/lib/zenoss/bin/zensocket --listen=162 -- "
+ PRGHOME=$(getent passwd zenoss | cut -d : -f 6)/Products/ZenEvents
+ PRGNAME=zentrap.py
+ CFGFILE=$CFGDIR/zentrap.conf

Propchange: packages/zenoss/trunk/debian/patches/08_zensocket-location.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Modified: packages/zenoss/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/rules?rev=152&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/rules (original)
+++ packages/zenoss/trunk/debian/rules Mon Jun 18 18:22:36 2007
@@ -79,7 +79,6 @@
 		--no-compile
 	dh_install -i -Nzenoss
 	cp -pr /usr/lib/$(ZOPE)/skel $(CURDIR)/debian/zenoss/usr/lib/zenoss
-	ln -s /usr/lib/zenoss/bin/zensocket $(CURDIR)/debian/zenoss/usr/lib/zenoss/skel/bin/zensocket
 	rm -f $(CURDIR)/debian/zenoss/usr/lib/zenoss/skel/import/*.zexp
 	dh_install -pzenoss -Xzope.conf.in -Xsudoers -Xmy.cnf -Xsnmpd.conf \
 		-Xfreetds.conf -XLICENSE.txt -XCOPYRIGHT.txt -Xlicense.txt