[Pkg-zenoss-commits] r36 - in /packages/wmi/trunk/debian: patches/00dpatch.conf patches/wmi-build.dpatch rules source.lintian-overrides

bzed-guest at users.alioth.debian.org bzed-guest at users.alioth.debian.org
Sun May 13 21:38:25 UTC 2007 

Author: bzed-guest
Date: Sun May 13 21:38:24 2007
New Revision: 36

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=36
Log:
wmi builds now

Added:
    packages/wmi/trunk/debian/patches/00dpatch.conf
    packages/wmi/trunk/debian/source.lintian-overrides
Modified:
    packages/wmi/trunk/debian/patches/wmi-build.dpatch
    packages/wmi/trunk/debian/rules

Added: packages/wmi/trunk/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/patches/00dpatch.conf?rev=36&op=file
==============================================================================
--- packages/wmi/trunk/debian/patches/00dpatch.conf (added)
+++ packages/wmi/trunk/debian/patches/00dpatch.conf Sun May 13 21:38:24 2007
@@ -1,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs

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=36&op=diff
==============================================================================
--- packages/wmi/trunk/debian/patches/wmi-build.dpatch (original)
+++ packages/wmi/trunk/debian/patches/wmi-build.dpatch Sun May 13 21:38:24 2007
@@ -7,9 +7,9 @@
 ## DP: Also adding a .PHONY
 
 @DPATCH@
-diff -urNad zenoss~/wmi/GNUmakefile zenoss/wmi/GNUmakefile
---- zenoss~/wmi/GNUmakefile	2007-05-02 20:03:57.000000000 +0200
-+++ zenoss/wmi/GNUmakefile	2007-05-04 15:06:04.000000000 +0200
+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
 @@ -1,5 +1,6 @@
  all: install
  
@@ -17,12 +17,11 @@
  install: pywmi-installed pycom-installed
  
  ifeq ($(PYTHON),)
-@@ -11,11 +12,20 @@
+@@ -11,11 +12,19 @@
  PYINCLUDE=	$(shell $(PYTHON) pyinclude.py)
  DATE=$(shell date +%Y%m%d)
  
 -pywmi-installed: $(DESTDIR)$(PYLIBDIR) $(DESTDIR)$(ZENBIN)
-+
 +$(DESTDIR)$(ZENBIN) $(DESTDIR)$(PYLIBDIR):
 +	mkdir -p $@
 +
@@ -40,7 +39,7 @@
  	cp bin/winexe $(DESTDIR)$(ZENBIN) &&				\
  	cp wmi/_pywmi.so $(DESTDIR)$(PYLIBDIR) &&			\
  	cp wmi/pywmi.py $(DESTDIR)$(PYLIBDIR)
-@@ -23,18 +33,27 @@
+@@ -23,18 +32,27 @@
  $(DESTDIR)$(ZENBIN) $(DESTDIR)$(PYLIBDIR):
  	mkdir -p $@
  
@@ -66,14 +65,14 @@
 +	cd pycom && python setup.py clean
 +	cd pycom && rm -rf build
 +	find pycom -name \*.pyc -exec rm -f {} \;
-+	-cd Samba/source && make clean
++	-cd Samba/source && make distclean
 +	rm -f ./Samba/source/wmi/_pywmi.so
 +	rm -f pycom-build-stamp pywmi-build-stamp
 +
  tarball: clean
  	 tar --exclude=".svn" 				\
  	     --exclude='*~'  				\
-@@ -42,3 +61,4 @@
+@@ -42,3 +60,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=36&op=diff
==============================================================================
--- packages/wmi/trunk/debian/rules (original)
+++ packages/wmi/trunk/debian/rules Sun May 13 21:38:24 2007
@@ -8,25 +8,37 @@
 include /usr/share/dpatch/dpatch.make
 
 
-CFLAGS = -Wall -g
+# CFLAGS? No, don't even try to use them.
+# configure breaks as soon as there's anything
+# in CFLAGS. Needs to be fixed when Samba4 is
+# stable.
 
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-	CFLAGS += -O0
-else
-	CFLAGS += -O2
-endif
+
+PYVERS=$(shell pyversions -s)
 
 build: build-stamp
 
 build-stamp: patch
 	dh_testdir
 
+	mkdir -p $(CURDIR)/debian/tmp/usr/bin
+
 	#we don't want to use the delivered binary blob, rebuild it
-	cd wmi/Samba/source/winexe/winexesvc; make CC=i586-mingw32msvc-gcc
-	cd wmi; make build PYTHON=$(PYTHON) \
-	                   PYLIBDIR=/usr/lib/ \
-	                   CFLAGS="$(CFLAGS)" \
-	                   ZENBIN=/usr/bin
+	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 \
+	               PYLIBDIR=/usr/lib/ \
+	               ZENBIN=/usr/bin && \
+	    \
+            make pywmi-installed PYTHON=$$pyvers \
+                                 ZENBIN=/usr/bin \
+                                 DESTDIR=$(CURDIR)/debian/tmp \
+                                 PYLIBDIR=/usr/lib/python-support/wmi-client/$$pyvers && \
+	    make clean ;\
+	done
+
+	cd pycom; python setup.py build
 
 	touch $@
 
@@ -36,28 +48,32 @@
 	dh_testroot
 	rm -f build-stamp
 
-	-cd wmi; make clean
+	-make clean
 
 	dh_clean 
 
 install: build
 	dh_testdir
 	dh_testroot
-	dh_clean -k 
 	dh_installdirs
 
-	cd wmi/pycom; $(PYTHON) setup.py install \
+	#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) \
 	                        --no-compile -O0
 
-	cd wmi; make pywmi-installed PYTHON=$(PYTHON) \
-	                             ZENBIN=/usr/bin \
-	                             DESTDIR=$(CURDIR)/debian/wmi-client \
-	                             PYLIBDIR=/usr/lib/python-support/wmi-client/$(PYTHON)
-	mv $(CURDIR)/debian/wmi-client/usr/lib/python-support/zenoss-wmi/python2.4/pywmi.py \
-	   $(CURDIR)/debian/wmi-client/usr/share/python-support/zenoss-wmi
+	#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
+
+	#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/*'
 
 
 # Build architecture-independent files here.
@@ -68,19 +84,18 @@
 binary-arch: build install
 	dh_testdir
 	dh_testroot
-	dh_installchangelogs -a
-	dh_installdocs -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_installdeb -a
-	dh_shlibdeps -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
-
-
+	dh_installchangelogs
+	dh_installdocs
+	dh_pysupport
+	dh_link
+	dh_strip
+	dh_compress
+	dh_fixperms
+	dh_installdeb
+	dh_shlibdeps
+	dh_gencontrol
+	dh_md5sums
+	dh_builddeb
 
 binary: binary-indep binary-arch
 .PHONY: build clean binary-indep binary-arch binary install configure patch unpatch clean1

Added: packages/wmi/trunk/debian/source.lintian-overrides
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/wmi/trunk/debian/source.lintian-overrides?rev=36&op=file
==============================================================================
--- packages/wmi/trunk/debian/source.lintian-overrides (added)
+++ packages/wmi/trunk/debian/source.lintian-overrides Sun May 13 21:38:24 2007
@@ -1,0 +1,3 @@
+#makes no sense to repackage source because of those 2 files
+wmi source: configure-generated-file-in-source Samba/source/config.log
+wmi source: configure-generated-file-in-source Samba/source/config.status

More information about the Pkg-zenoss-commits mailing list