[Pkg-zenoss-commits] r50 - in /packages/wmi/trunk/debian: changelog patches/wmi-build.dpatch rules

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

Author: bzed-guest
Date: Wed May 16 20:12:38 2007
New Revision: 50

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=50
Log:
several build fixes, new version

Modified:
    packages/wmi/trunk/debian/changelog
    packages/wmi/trunk/debian/patches/wmi-build.dpatch
    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=50&op=diff
==============================================================================
--- packages/wmi/trunk/debian/changelog (original)
+++ packages/wmi/trunk/debian/changelog Wed May 16 20:12:38 2007
@@ -1,4 +1,4 @@
-wmi (20070502-1) unstable; urgency=low
+wmi (20070516-1) unstable; urgency=low
 
   * Initial release (Closes: #nnnn)  <nnnn is the bug number of your ITP>
 

Modified: packages/wmi/trunk/debian/patches/wmi-build.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/patches/wmi-build.dpatch?rev=50&op=diff
==============================================================================
--- packages/wmi/trunk/debian/patches/wmi-build.dpatch (original)
+++ packages/wmi/trunk/debian/patches/wmi-build.dpatch Wed May 16 20:12:38 2007
@@ -9,7 +9,7 @@
 @DPATCH@
 diff -urNad wmi~/GNUmakefile wmi/GNUmakefile
 --- wmi~/GNUmakefile	2007-05-02 20:03:35.000000000 +0200
-+++ wmi/GNUmakefile	2007-05-13 21:31:50.000000000 +0200
++++ wmi/GNUmakefile	2007-05-16 14:22:54.000000000 +0200
 @@ -1,5 +1,6 @@
  all: install
  
@@ -39,7 +39,7 @@
  	cp bin/winexe $(DESTDIR)$(ZENBIN) &&				\
  	cp wmi/_pywmi.so $(DESTDIR)$(PYLIBDIR) &&			\
  	cp wmi/pywmi.py $(DESTDIR)$(PYLIBDIR)
-@@ -23,18 +32,27 @@
+@@ -23,18 +32,28 @@
  $(DESTDIR)$(ZENBIN) $(DESTDIR)$(PYLIBDIR):
  	mkdir -p $@
  
@@ -62,17 +62,18 @@
  		    --root="$(DESTDIR)"
  
 +clean:
++	rm -f pycom-build-stamp pywmi-build-stamp
 +	cd pycom && python setup.py clean
 +	cd pycom && rm -rf build
 +	find pycom -name \*.pyc -exec rm -f {} \;
 +	-cd Samba/source && make distclean
 +	rm -f ./Samba/source/wmi/_pywmi.so
-+	rm -f pycom-build-stamp pywmi-build-stamp
++	rm -f ./Samba/source/winexe/winexesvc/*.exe
 +
  tarball: clean
  	 tar --exclude=".svn" 				\
  	     --exclude='*~'  				\
-@@ -42,3 +60,4 @@
+@@ -42,3 +61,4 @@
               -cjf "../wmi-$(DATE).tar.bz2" 		\
  	     .
  

Modified: packages/wmi/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/rules?rev=50&op=diff
==============================================================================
--- packages/wmi/trunk/debian/rules (original)
+++ packages/wmi/trunk/debian/rules Wed May 16 20:12:38 2007
@@ -23,8 +23,13 @@
 
 	mkdir -p $(CURDIR)/debian/tmp/usr/bin
 
+	#save the original winexesvc_exe.c
+	mv Samba/source/winexe/winexesvc/winexesvc_exe.c winexesvc_exe.c_orig
+
 	#we don't want to use the delivered binary blob, rebuild it
 	cd Samba/source/winexe/winexesvc; make CC=i586-mingw32msvc-gcc
+
+
 	for pyvers in $(PYVERS); do \
 	    mkdir -p mkdir -p $(CURDIR)/debian/tmp/usr/lib/python-support/wmi-client/$$pyvers ;\
 	    make pywmi-build PYTHON=$$pyvers \
@@ -47,6 +52,9 @@
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp
+
+	#restoring original winexesvc_exe.c_orig if we need to do so
+	-mv winexesvc_exe.c_orig Samba/source/winexe/winexesvc/winexesvc_exe.c
 
 	-make clean