[Pkg-zenoss-commits] r11 - in packages/zenoss/trunk/debian: . patches

[Bernd Zeimetz]

Author: bzed-guest
Date: 2007-05-06 20:36:17 +0000 (Sun, 06 May 2007)
New Revision: 11

Added:
   packages/zenoss/trunk/debian/patches/00dpatch.conf
Modified:
   packages/zenoss/trunk/debian/control
   packages/zenoss/trunk/debian/patches/wmi-build.dpatch
   packages/zenoss/trunk/debian/rules
Log:
several build changes, adding dpatch.confg


Modified: packages/zenoss/trunk/debian/control
===================================================================
--- packages/zenoss/trunk/debian/control	2007-05-04 15:24:13 UTC (rev 10)
+++ packages/zenoss/trunk/debian/control	2007-05-06 20:36:17 UTC (rev 11)
@@ -21,7 +21,7 @@
  python-twisted-core (>= 2.4.0), python-twisted-bin, python-twisted-conch,
  python-twisted-names, python-twisted-snmp, python-twisted-web,
  python-twill (>= 0.8.5), yapps2 (>= 2.1.1),
- zope2.9, zope-advancedquery, zope-managableindex,
+ zope-common (>= 0.5.33), zope2.9, zope-advancedquery, zope-managableindex,
  zope-cmfcore1.6, zope-genericsetup, zope-pas, zope-pluginregistry
 Recommends: mysql-server-5.0 (>= 5.0.22), sendpage-server, klogd, zenoss-plugins
 Description: infrastucture monitoring and managment system

Added: packages/zenoss/trunk/debian/patches/00dpatch.conf
===================================================================
--- packages/zenoss/trunk/debian/patches/00dpatch.conf	2007-05-04 15:24:13 UTC (rev 10)
+++ packages/zenoss/trunk/debian/patches/00dpatch.conf	2007-05-06 20:36:17 UTC (rev 11)
@@ -0,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs

Modified: packages/zenoss/trunk/debian/patches/wmi-build.dpatch
===================================================================
--- packages/zenoss/trunk/debian/patches/wmi-build.dpatch	2007-05-04 15:24:13 UTC (rev 10)
+++ packages/zenoss/trunk/debian/patches/wmi-build.dpatch	2007-05-06 20:36:17 UTC (rev 11)
@@ -3,7 +3,8 @@
 ##
 ## DP: adding a more Debian-like style to the GNUmakefile,
 ## DP: allowing us to install it several times without
-## DP: having to built it all times
+## DP: having to build it all times
+## DP: Also adding a .PHONY
 
 @DPATCH@
 diff -urNad zenoss~/wmi/GNUmakefile zenoss/wmi/GNUmakefile

Modified: packages/zenoss/trunk/debian/rules
===================================================================
--- packages/zenoss/trunk/debian/rules	2007-05-04 15:24:13 UTC (rev 10)
+++ packages/zenoss/trunk/debian/rules	2007-05-06 20:36:17 UTC (rev 11)
@@ -71,10 +71,13 @@
 				--install-purelib=/usr/share/python-support/zenoss-wmi \
 				--install-platlib=/usr/lib/python-support/zenoss-wmi/$(PYTHON) \
 				--no-compile -O0
+
 	cd wmi; make pywmi-installed PYTHON=$(PYTHON) \
                                      ZENBIN=/usr/bin \
 	                             DESTDIR=$(CURDIR)/debian/zenoss-wmi \
 	                             PYLIBDIR=/usr/lib/python-support/zenoss-wmi/$(PYTHON)
+	mv $(CURDIR)/debian/zenoss-wmi/usr/lib/python-support/zenoss-wmi/python2.4/pywmi.py \
+	   $(CURDIR)/debian/zenoss-wmi/usr/share/python-support/zenoss-wmi
 
 install-indep: build-indep
 	dh_testdir