[Pkg-zenoss-commits] r58 - in /packages/wmi/trunk/debian: control rules

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

Author: bzed-guest
Date: Thu May 17 18:36:34 2007
New Revision: 58

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=58
Log:
splitting the .deb into python-wmi and wmi-client, makes more sense instead of shipping it in one file

Modified:
    packages/wmi/trunk/debian/control
    packages/wmi/trunk/debian/rules

Modified: packages/wmi/trunk/debian/control
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/control?rev=58&op=diff
==============================================================================
--- packages/wmi/trunk/debian/control (original)
+++ packages/wmi/trunk/debian/control Thu May 17 18:36:34 2007
@@ -3,11 +3,22 @@
 Priority: optional
 Maintainer: Zenoss Packaging Team <pkg-zenoss-team at lists.alioth.debian.org>
 Uploaders: Bernd Zeimetz <bernd at bzed.de>
-Build-Depends: debhelper (>= 5), dpatch, mingw32, swig,
+Build-Depends: debhelper (>= 5), dpatch, mingw32, swig, autoconf (>= 2.53),
  python-support (>= 0.5.3), python-all-dev
 Standards-Version: 3.7.2
 
 Package: wmi-client
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: DCOM/WMI client implementation for Linux
+ This DCOM/WMI client implementation is based on Samba4
+ sources. It uses RPC/DCOM mechanisms to interact with WMI
+ services on Windows 2000/XP/2003 machines.
+ .
+ This package contains the command line client to perform
+ remote command execution on windows systems.
+
+Package: python-wmi
 Architecture: any
 Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
 Description: DCOM/WMI client implementation for Linux
@@ -15,6 +26,4 @@
  sources. It uses RPC/DCOM mechanisms to interact with WMI
  services on Windows 2000/XP/2003 machines.
  .
- This package is a Zenoss dependency mainly, but it can be
- used on its own. It also includes a Python module providing
- access to the DCOM/WMI functions.
+ This package contains the python bindings to wmi.

Modified: packages/wmi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/rules?rev=58&op=diff
==============================================================================
--- packages/wmi/trunk/debian/rules (original)
+++ packages/wmi/trunk/debian/rules Thu May 17 18:36:34 2007
@@ -31,7 +31,7 @@
 
 
 	for pyvers in $(PYVERS); do \
-	    mkdir -p mkdir -p $(CURDIR)/debian/tmp/usr/lib/python-support/wmi-client/$$pyvers ;\
+	    mkdir -p mkdir -p $(CURDIR)/debian/tmp/usr/lib/python-support/python-wmi/$$pyvers ;\
 	    make pywmi-build PYTHON=$$pyvers \
 	               PYLIBDIR=/usr/lib/ \
 	               ZENBIN=/usr/bin && \
@@ -39,7 +39,7 @@
             make pywmi-installed PYTHON=$$pyvers \
                                  ZENBIN=/usr/bin \
                                  DESTDIR=$(CURDIR)/debian/tmp \
-                                 PYLIBDIR=/usr/lib/python-support/wmi-client/$$pyvers && \
+                                 PYLIBDIR=/usr/lib/python-support/python-wmi/$$pyvers && \
 	    make clean ;\
 	done
 
@@ -67,21 +67,21 @@
 
 	#install pycom
 	cd pycom; python setup.py install \
-	                        --root=$(CURDIR)/debian/wmi-client \
-	                        --install-purelib=/usr/share/python-support/wmi-client \
-	                        --install-platlib=/usr/lib/python-support/wmi-client/$(PYTHON) \
+	                        --root=$(CURDIR)/debian/python-wmi \
+	                        --install-purelib=/usr/share/python-support/python-wmi \
+	                        --install-platlib=/usr/lib/python-support/python-wmi/$(PYTHON) \
 	                        --no-compile -O0
 
 	#upstreams way to install the files is kind of buggy, pywmi.py is not
 	#architecture dependent, fix this.
-	mkdir -p $(CURDIR)/debian/tmp/usr/share/python-support/wmi-client
-	mv $(CURDIR)/debian/tmp/usr/lib/python-support/wmi-client/python2.4/pywmi.py \
-	   $(CURDIR)/debian/tmp/usr/share/python-support/wmi-client
-	rm -f $(CURDIR)/debian/tmp/usr/lib/python-support/wmi-client/*/pywmi.py
+	mkdir -p $(CURDIR)/debian/tmp/usr/share/python-support/python-wmi
+	mv $(CURDIR)/debian/tmp/usr/lib/python-support/python-wmi/python2.4/pywmi.py \
+	   $(CURDIR)/debian/tmp/usr/share/python-support/python-wmi
+	rm -f $(CURDIR)/debian/tmp/usr/lib/python-support/python-wmi/*/pywmi.py
 
 	#install the py bindings from the tmp dir
-	dh_install --autodest 'debian/tmp/usr/lib/python-support/wmi-client/*/*'
-	dh_install --autodest 'debian/tmp/usr/bin/*'
+	dh_install -ppython-wmi --autodest 'debian/tmp/usr/lib/python-support/python-wmi/*/*'
+	dh_install -pwmi-client --autodest 'debian/tmp/usr/bin/*'
 
 
 # Build architecture-independent files here.