[Pkg-zenoss-commits] r163 - /packages/zenoss/trunk/debian/patches/zensocket-location.dpatch

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

Author: bzed-guest
Date: Tue Jun 19 13:10:29 2007
New Revision: 163

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=163
Log:
zensocket-location.dpatch update

Modified:
    packages/zenoss/trunk/debian/patches/zensocket-location.dpatch

Modified: packages/zenoss/trunk/debian/patches/zensocket-location.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/patches/zensocket-location.dpatch?rev=163&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/patches/zensocket-location.dpatch (original)
+++ packages/zenoss/trunk/debian/patches/zensocket-location.dpatch Tue Jun 19 13:10:29 2007
@@ -5,8 +5,8 @@
 
 @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
+--- zenoss~/bin/zendisc	2007-06-19 14:08:50.000000000 +0100
++++ zenoss/bin/zendisc	2007-06-19 14:08:54.000000000 +0100
 @@ -12,7 +12,7 @@
  
  . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
@@ -16,21 +16,9 @@
  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
+--- zenoss~/bin/zenping	2007-06-19 14:08:50.000000000 +0100
++++ zenoss/bin/zenping	2007-06-19 14:08:54.000000000 +0100
 @@ -12,7 +12,7 @@
  
  . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
@@ -41,8 +29,8 @@
  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
+--- zenoss~/bin/zensyslog	2007-06-19 14:08:50.000000000 +0100
++++ zenoss/bin/zensyslog	2007-06-19 14:08:54.000000000 +0100
 @@ -12,7 +12,7 @@
  
  . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions
@@ -53,8 +41,8 @@
  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
+--- zenoss~/bin/zentrap	2007-06-19 14:08:50.000000000 +0100
++++ zenoss/bin/zentrap	2007-06-19 14:08:54.000000000 +0100
 @@ -12,7 +12,7 @@
  
  . $(getent passwd zenoss | cut -d : -f 6)/bin/zenfunctions