[Pkg-zenoss-commits] r83 - in /packages/wmi/trunk/debian: changelog patches/00list patches/pycom-version.dpatch python-wmi.install rules wmi-client.install

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

Author: bzed-guest
Date: Mon May 21 10:09:23 2007
New Revision: 83

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=83
Log:
install fixes, adding version to pycom

Added:
    packages/wmi/trunk/debian/patches/pycom-version.dpatch   (with props)
    packages/wmi/trunk/debian/python-wmi.install
    packages/wmi/trunk/debian/wmi-client.install
Modified:
    packages/wmi/trunk/debian/changelog
    packages/wmi/trunk/debian/patches/00list
    packages/wmi/trunk/debian/rules

Modified: packages/wmi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/changelog?rev=83&op=diff
==============================================================================
--- packages/wmi/trunk/debian/changelog (original)
+++ packages/wmi/trunk/debian/changelog Mon May 21 10:09:23 2007
@@ -1,3 +1,12 @@
+wmi (20070517-2) UNRELEASED; urgency=low
+
+  * adding patch to pycom's setup.py to find the appropriate version
+    number, otherwise it would use 0.0.0 as version in the egg-info
+  * using *.install files instead of --autodest to install files,
+    also installing a directory which was missing before
+
+ -- Bernd Zeimetz <bernd at bzed.de>  Mon, 21 May 2007 12:01:38 +0200
+
 wmi (20070517-1) experimental; urgency=low
 
   * Initial release (Closes: #424727)

Modified: packages/wmi/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/patches/00list?rev=83&op=diff
==============================================================================
--- packages/wmi/trunk/debian/patches/00list (original)
+++ packages/wmi/trunk/debian/patches/00list Mon May 21 10:09:23 2007
@@ -1,1 +1,2 @@
 wmi-build
+pycom-version

Added: packages/wmi/trunk/debian/patches/pycom-version.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/patches/pycom-version.dpatch?rev=83&op=file
==============================================================================
--- packages/wmi/trunk/debian/patches/pycom-version.dpatch (added)
+++ packages/wmi/trunk/debian/patches/pycom-version.dpatch Mon May 21 10:09:23 2007
@@ -1,0 +1,28 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## pycom-version.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: version needed, otherwise the egg-info will have 0.0.0 as version
+
+ at DPATCH@
+diff -urNad wmi~/pycom/setup.py wmi/pycom/setup.py
+--- wmi~/pycom/setup.py	2007-05-06 18:12:55.000000000 +0200
++++ wmi/pycom/setup.py	2007-05-21 11:19:44.000000000 +0200
+@@ -12,9 +12,17 @@
+ ###########################################################################
+ from distutils.core import setup
+ 
++#bad, bad hack. should be fixed by upstream, and I'm to lazy to do it proper now.
++import os
++vin, vout = os.popen4('bash -c "cd ..; dpkg-parsechangelog  | grep \'^Version\' | sed \'s,.* ,,g;s,-.*,,g\'"')
++VERSION = vout.read().strip()
++map(file.close, (vin, vout))
++
++
+ setup(name='pycom',
+       description='bindings to DCOM for python using Samba',
+       author='Andrzej Hajda',
+       author_email='andrzej.hajda at wp.pl',
+-      packages = ['.', 'win32com'])
++      packages = ['.', 'win32com'],
++      version=VERSION)
+ 

Propchange: packages/wmi/trunk/debian/patches/pycom-version.dpatch
------------------------------------------------------------------------------
    svn:executable = *

Added: packages/wmi/trunk/debian/python-wmi.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/python-wmi.install?rev=83&op=file
==============================================================================
--- packages/wmi/trunk/debian/python-wmi.install (added)
+++ packages/wmi/trunk/debian/python-wmi.install Mon May 21 10:09:23 2007
@@ -1,0 +1,2 @@
+usr/lib/python-support/python-wmi
+usr/share/python-support/python-wmi

Modified: packages/wmi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/rules?rev=83&op=diff
==============================================================================
--- packages/wmi/trunk/debian/rules (original)
+++ packages/wmi/trunk/debian/rules Mon May 21 10:09:23 2007
@@ -79,10 +79,7 @@
 	   $(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 -ppython-wmi --autodest 'debian/tmp/usr/lib/python-support/python-wmi/*/*'
-	dh_install -pwmi-client --autodest 'debian/tmp/usr/bin/*'
-
+	dh_install --sourcedir=debian/tmp
 
 # Build architecture-independent files here.
 binary-indep: build install

Added: packages/wmi/trunk/debian/wmi-client.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/wmi-client.install?rev=83&op=file
==============================================================================
--- packages/wmi/trunk/debian/wmi-client.install (added)
+++ packages/wmi/trunk/debian/wmi-client.install Mon May 21 10:09:23 2007
@@ -1,0 +1,1 @@
+usr/bin