[Pkg-zenoss-commits] r306 - in /trunk/packages/zenoss/debian: changelog patches/ZENHOME01-zenfunctions-pythonpath.dpatch rules-extras.mk

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

Author: bzed-guest
Date: Tue Oct  9 23:25:20 2007
New Revision: 306

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=306
Log:
several updates/changes/fixes

Modified:
    trunk/packages/zenoss/debian/changelog
    trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch
    trunk/packages/zenoss/debian/rules-extras.mk

Modified: trunk/packages/zenoss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/changelog?rev=306&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/changelog (original)
+++ trunk/packages/zenoss/debian/changelog Tue Oct  9 23:25:20 2007
@@ -1,4 +1,4 @@
-zenoss (2.0.91~unreleased+r6726-1) UNRELEASED; urgency=low
+zenoss (2.0.91~unreleased+r7078-1) UNRELEASED; urgency=low
 
   * Initial release (closes: #361253)
 

Modified: trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch?rev=306&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch (original)
+++ trunk/packages/zenoss/debian/patches/ZENHOME01-zenfunctions-pythonpath.dpatch Tue Oct  9 23:25:20 2007
@@ -6,9 +6,17 @@
 
 @DPATCH@
 diff -urNad zenoss~/bin/zenfunctions zenoss/bin/zenfunctions
---- zenoss~/bin/zenfunctions	2007-07-09 16:42:06.000000000 +0200
-+++ zenoss/bin/zenfunctions	2007-07-09 16:43:01.000000000 +0200
-@@ -18,12 +18,9 @@
+--- zenoss~/bin/zenfunctions	2007-08-16 15:45:03.000000000 +0200
++++ zenoss/bin/zenfunctions	2007-09-24 21:58:50.000000000 +0200
+@@ -9,18 +9,17 @@
+ # For complete information please visit: http://www.zenoss.com/oss/
+ #############################################################################
+ 
++ZENHOME=$(getent passwd zenoss | cut -f 6 -d :)
++
+ INSTANCE_HOME=$ZENHOME
+ export INSTANCE_HOME
+ 
  SYBASE=$ZENHOME/sybase
  export SYBASE
  

Modified: trunk/packages/zenoss/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules-extras.mk?rev=306&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules-extras.mk (original)
+++ trunk/packages/zenoss/debian/rules-extras.mk Tue Oct  9 23:25:20 2007
@@ -139,23 +139,16 @@
 	    rm -rf pynetsnmp ;\
 	    rm -rf scripts ;\
 	    rmdir test || echo "----> please fix: directory test not empty anymore!" ;\
-	    rm -rf zendocs/Admin_Guide_1.0_Screens ;\
-	    rm -rf zendocs/Admin\ Guide\ 2.0/screens ;\
-	    rm -rf zendocs/Admin\ Guide\ 2.0/diagrams ;\
-	    rm -f zendocs/ZenossAdminGuide-1* ;\
-	    rm -f zendocs/ZenossAdminGuide1* ;\
-	    rm -rf zendocs/QuickStartGuide-1.0 zendocs/ZenossQStart-1.0.pdf ;\
-	    rm -rf zendocs/Syslog-HOWTO_Screens ;\
-	    rm -rf zendocs/Selenium ;\
-	    rm -f zendocs/Zenoss_UI_Changes.xls ;\
-	    mv zendocs/ZenossDevGuide zendocs/ZenossDevGuide.doc ;\
+	    for fileordir in ZenossDevGuide ZenossQStart-1.0.pdf Zenoss_UI_Changes.xls \
+	                     Selenium Syslog-HOWTO_Screens zenjmx archive; do \
+	        rm -rf zendocs/$$fileordir ;\
+	    done ;\
 	    find . -name .svnignore -print0 | xargs -0 rm -f ;\
 	    find . -name .cvsignore -print0 | xargs -0 rm -f ;\
 	    mv inst/* . ;\
 	    rm -rf  *.sh zen2dump.py autoinstall  ZEN2UPGRADE.txt rpm fs \
-                     docs/INSTALL_* docs/BUILD_* MacOS \
+                     docs/INSTALL_* docs/BUILD_* MacOS genpatchdeps.py \
 	             GNUmakefile inst conf/sudoers docs/UPGRADE.txt ;\
-	    rmdir zendocs/zenjmx ;\
 	    mv zendocs/Admin\ Guide\ 2.0 zendocs/Admin_Guide_2.0 ;\
 	\
 	echo "fixing broken file permissions" ;\