[Pkg-zenoss-commits] r208 - in /packages/wmi/trunk/debian: changelog patches/00list patches/pycom-version.dpatch patches/wmi-build.dpatch

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

Author: bzed-guest
Date: Thu Jul  5 15:55:50 2007
New Revision: 208

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=208
Log:
new upstream version

Removed:
    packages/wmi/trunk/debian/patches/pycom-version.dpatch
Modified:
    packages/wmi/trunk/debian/changelog
    packages/wmi/trunk/debian/patches/00list
    packages/wmi/trunk/debian/patches/wmi-build.dpatch

Modified: packages/wmi/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/changelog?rev=208&op=diff
==============================================================================
--- packages/wmi/trunk/debian/changelog (original)
+++ packages/wmi/trunk/debian/changelog Thu Jul  5 15:55:50 2007
@@ -1,3 +1,9 @@
+wmi (1:0.1.3-1) UNRELEASED; urgency=low
+
+  * new upstream version 
+
+ -- Bernd Zeimetz <bernd at bzed.de>  Thu, 05 Jul 2007 17:20:36 +0200
+
 wmi (20070517-2) unstable; urgency=low
 
   * debian/patches/

Modified: packages/wmi/trunk/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/patches/00list?rev=208&op=diff
==============================================================================
--- packages/wmi/trunk/debian/patches/00list (original)
+++ packages/wmi/trunk/debian/patches/00list Thu Jul  5 15:55:50 2007
@@ -1,2 +1,1 @@
 wmi-build
-pycom-version

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=208&op=diff
==============================================================================
--- packages/wmi/trunk/debian/patches/wmi-build.dpatch (original)
+++ packages/wmi/trunk/debian/patches/wmi-build.dpatch Thu Jul  5 15:55:50 2007
@@ -8,8 +8,8 @@
 
 @DPATCH@
 diff -urNad wmi~/GNUmakefile wmi/GNUmakefile
---- wmi~/GNUmakefile	2007-05-16 21:15:34.000000000 +0200
-+++ wmi/GNUmakefile	2007-05-16 22:19:34.000000000 +0200
+--- wmi~/GNUmakefile	2007-06-22 15:12:53.000000000 +0200
++++ wmi/GNUmakefile	2007-07-05 17:53:49.000000000 +0200
 @@ -1,5 +1,6 @@
  all: install
  
@@ -17,39 +17,38 @@
  install: pywmi-installed pycom-installed
  
  ifeq ($(PYTHON),)
-@@ -11,11 +12,19 @@
- PYINCLUDE=	$(shell $(PYTHON) pyinclude.py)
- DATE=$(shell date +%Y%m%d)
+@@ -16,11 +17,18 @@
+ LIBSUFFIX=dylib
+ endif
  
 -pywmi-installed: $(DESTDIR)$(PYLIBDIR) $(DESTDIR)$(ZENBIN)
-+$(DESTDIR)$(ZENBIN) $(DESTDIR)$(PYLIBDIR):
-+	mkdir -p $@
 +
 +pywmi-build: pywmi-build-stamp
++
 +pywmi-build-stamp:
  	cd Samba/source &&						\
  	./autogen.sh &&							\
  	CPPFLAGS="-I$(PYINCLUDE)" ./configure --without-readline &&	\
--	$(MAKE) proto bin/wmic bin/wmis wmi/_pywmi.so bin/winexe &&	\
-+	$(MAKE) proto bin/wmic bin/wmis wmi/_pywmi.so bin/winexe
+-	$(MAKE) proto bin/wmic bin/wmis wmi/_pywmi.$(LIBSUFFIX) bin/winexe &&	\
++	$(MAKE) proto bin/wmic bin/wmis wmi/_pywmi.so bin/winexe \
 +	touch $@
 +
 +pywmi-installed: pywmi-build $(DESTDIR)$(PYLIBDIR) $(DESTDIR)$(ZENBIN)
-+	cd Samba/source &&						\
++	cd Samba/source && 						\
  	cp bin/winexe $(DESTDIR)$(ZENBIN) &&				\
- 	cp wmi/_pywmi.so $(DESTDIR)$(PYLIBDIR) &&			\
- 	cp wmi/pywmi.py $(DESTDIR)$(PYLIBDIR)
-@@ -23,21 +32,35 @@
+ 	cp bin/wmic $(DESTDIR)$(ZENBIN) &&				\
+ 	cp wmi/_pywmi.$(LIBSUFFIX) $(DESTDIR)$(PYLIBDIR) &&			\
+@@ -29,21 +37,36 @@
  $(DESTDIR)$(ZENBIN) $(DESTDIR)$(PYLIBDIR):
  	mkdir -p $@
  
 -clean:
 -	cd pycom && rm -rf build
 -	cd Samba/source && make clean
--	rm -f ./Samba/source/wmi/_pywmi.so
+-	rm -f ./Samba/source/wmi/_pywmi.$(LIBSUFFIX)
++pycom-build: pycom-build-stamp
  
 -pycom-installed:
-+pycom-build: pycom-build-stamp
 +pycom-build-stamp:
 +	cd pycom &&                                     \
 +	python setup.py build
@@ -73,10 +72,11 @@
 +
 +
  tarball:
- 	-svn rm -m 'cleanup' http://dev.zenoss.org/svn/tags/wmi-$(DATE)
- 	svn cp -m "tagging wmi-$(DATE)" http://dev.zenoss.org/svn/trunk/wmi http://dev.zenoss.org/svn/tags/wmi-$(DATE)
- 	svn export http://dev.zenoss.org/svn/tags/wmi-$(DATE)
- 	tar -cjf ../wmi-$(DATE).tar.bz2 wmi-$(DATE)
- 	rm -rf wmi-$(DATE)
+ 	-svn rm -m 'cleanup' http://dev.zenoss.org/svn/tags/wmi-$(VERSION)
+ 	svn cp -m "tagging wmi-$(VERSION)" http://dev.zenoss.org/svn/trunk/wmi http://dev.zenoss.org/svn/tags/wmi-$(VERSION)
+ 	svn export http://dev.zenoss.org/svn/tags/wmi-$(VERSION)
+ 	tar -cjf ../wmi-$(VERSION).tar.bz2 wmi-$(VERSION)
+ 	rm -rf wmi-$(VERSION)
 +
 +.PHONY: all build pywmi-build pycom-build install pywmi-installed pycom-installed clean tarball
++