[Pkg-zenoss-commits] r362 - in /trunk/packages/wmi/debian: changelog control patches/ patches/00dpatch.conf patches/00list patches/wmi-build.dpatch rules
bzed at users.alioth.debian.org
bzed at users.alioth.debian.org
Thu Mar 13 20:34:25 UTC 2008
Author: bzed
Date: Thu Mar 13 20:34:25 2008
New Revision: 362
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=362
Log:
* debian/patches: updating wmi-build.dpatch.
Added:
trunk/packages/wmi/debian/patches/
trunk/packages/wmi/debian/patches/00dpatch.conf
trunk/packages/wmi/debian/patches/00list
trunk/packages/wmi/debian/patches/wmi-build.dpatch (with props)
Modified:
trunk/packages/wmi/debian/changelog
trunk/packages/wmi/debian/control
trunk/packages/wmi/debian/rules
Modified: trunk/packages/wmi/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/wmi/debian/changelog?rev=362&op=diff
==============================================================================
--- trunk/packages/wmi/debian/changelog (original)
+++ trunk/packages/wmi/debian/changelog Thu Mar 13 20:34:25 2008
@@ -1,8 +1,8 @@
-wmi (1:0.1.8-1) unstable; urgency=low
+wmi (1:0.1.12-1) unstable; urgency=low
* New upstream version.
* debian/control: bumping Standards-Version, no changes needed.
- * debian/patches: removing wmi-build.dpatch, integrated upstream.
+ * debian/patches: updating wmi-build.dpatch.
* Adding manpages for winexe and wmic.
-- Bernd Zeimetz <bzed at debian.org> Thu, 14 Feb 2008 22:06:37 +0100
Modified: trunk/packages/wmi/debian/control
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/wmi/debian/control?rev=362&op=diff
==============================================================================
--- trunk/packages/wmi/debian/control (original)
+++ trunk/packages/wmi/debian/control Thu Mar 13 20:34:25 2008
@@ -4,7 +4,7 @@
Maintainer: Zenoss Packaging Team <pkg-zenoss-team at lists.alioth.debian.org>
Uploaders: Bernd Zeimetz <bzed at debian.org>, Stefano Zacchiroli <zack at debian.org>
Build-Depends: debhelper (>= 5), mingw32, swig, autoconf (>= 2.53),
- python-support (>= 0.5.3), python-all-dev
+ python-support (>= 0.5.3), python-all-dev, dpatch
Standards-Version: 3.7.3
Package: wmi-client
Added: trunk/packages/wmi/debian/patches/00dpatch.conf
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/wmi/debian/patches/00dpatch.conf?rev=362&op=file
==============================================================================
--- trunk/packages/wmi/debian/patches/00dpatch.conf (added)
+++ trunk/packages/wmi/debian/patches/00dpatch.conf Thu Mar 13 20:34:25 2008
@@ -1,0 +1,2 @@
+conf_debianonly=1
+conf_origtargzpath=../tarballs
Added: trunk/packages/wmi/debian/patches/00list
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/wmi/debian/patches/00list?rev=362&op=file
==============================================================================
--- trunk/packages/wmi/debian/patches/00list (added)
+++ trunk/packages/wmi/debian/patches/00list Thu Mar 13 20:34:25 2008
@@ -1,0 +1,1 @@
+wmi-build
Added: trunk/packages/wmi/debian/patches/wmi-build.dpatch
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/wmi/debian/patches/wmi-build.dpatch?rev=362&op=file
==============================================================================
--- trunk/packages/wmi/debian/patches/wmi-build.dpatch (added)
+++ trunk/packages/wmi/debian/patches/wmi-build.dpatch Thu Mar 13 20:34:25 2008
@@ -1,0 +1,96 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## wmi-build.dpatch by Bernd Zeimetz <bzed at debian.org>
+##
+## DP: Build support for multiple python versions... and so on.
+
+ at DPATCH@
+diff -urNad wmi~/GNUmakefile wmi/GNUmakefile
+--- wmi~/GNUmakefile 2008-02-26 21:12:35.000000000 +0100
++++ wmi/GNUmakefile 2008-03-13 21:33:33.000000000 +0100
+@@ -1,7 +1,7 @@
+ all: install
+
+-install: pywmi-installed pycom-installed
+ build: pywmi-build pycom-build
++install: pywmi-installed pycom-installed
+
+ ifeq ($(PYTHON),)
+ PYTHON=python
+@@ -17,42 +17,50 @@
+ LIBSUFFIX=dylib
+ endif
+
+-pywmi-build:
+- cd Samba/source ; \
+- ./autogen.sh ; \
+- CPPFLAGS="-I$(PYINCLUDE)" \
+- ./configure --without-readline ; \
+- $(MAKE) proto bin/wmic bin/wmis wmi/_pywmi.$(LIBSUFFIX) bin/winexe
++
++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
+ touch $@
+
+-pywmi-installed: $(DESTDIR)$(PYLIBDIR) $(DESTDIR)$(ZENBIN) pywmi-build
+- cd Samba/source ; \
+- cp bin/winexe $(DESTDIR)$(ZENBIN) ; \
+- cp bin/wmic $(DESTDIR)$(ZENBIN) ; \
+- cp wmi/_pywmi.$(LIBSUFFIX) $(DESTDIR)$(PYLIBDIR)/_pywmi.so ; \
++pywmi-installed: pywmi-build $(DESTDIR)$(PYLIBDIR) $(DESTDIR)$(ZENBIN)
++ cd Samba/source && \
++ cp bin/winexe $(DESTDIR)$(ZENBIN) && \
++ cp bin/wmic $(DESTDIR)$(ZENBIN) && \
++ cp wmi/_pywmi.$(LIBSUFFIX) $(DESTDIR)$(PYLIBDIR) && \
+ cp wmi/pywmi.py $(DESTDIR)$(PYLIBDIR)
+
+ $(DESTDIR)$(ZENBIN) $(DESTDIR)$(PYLIBDIR):
+ mkdir -p $@
+
+-clean:
+- cd pycom && rm -rf build
+- cd Samba/source && make clean
+- rm -f ./Samba/source/wmi/_pywmi.$(LIBSUFFIX)
++pycom-build: pycom-build-stamp
+
+-pycom-build:
+- cd pycom ; \
+- python setup.py build
++pycom-build-stamp:
++ cd pycom && \
++ python setup.py build
+ touch $@
+
+-
+ pycom-installed: pycom-build
+- cd pycom ; \
++ cd pycom && \
+ python setup.py install \
+ --install-lib="$(PYLIBDIR)" \
+ --install-scripts="$(ZENBIN)" \
+ --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 ./Samba/source/winexe/winexesvc/*.exe
++
++
+ tarball:
+ -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)
+@@ -60,4 +68,5 @@
+ tar -cjf ../wmi-$(VERSION).tar.bz2 wmi-$(VERSION)
+ rm -rf wmi-$(VERSION)
+
+-.PHONY: tarball pycom-installed pycom-build clean pywmi-installed pywmi-build
++.PHONY: all build pywmi-build pycom-build install pywmi-installed pycom-installed clean tarball
++
Propchange: trunk/packages/wmi/debian/patches/wmi-build.dpatch
------------------------------------------------------------------------------
svn:executable = *
Modified: trunk/packages/wmi/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/wmi/debian/rules?rev=362&op=diff
==============================================================================
--- trunk/packages/wmi/debian/rules (original)
+++ trunk/packages/wmi/debian/rules Thu Mar 13 20:34:25 2008
@@ -3,6 +3,9 @@
# Uncomment this to turn on verbose mode.
#export DH_VERBOSE=1
+
+# Include dpatch stuff.
+include /usr/share/dpatch/dpatch.make
# CFLAGS? No, don't even try to use them.
@@ -25,6 +28,8 @@
#we don't want to use the delivered binary blob, rebuild it
cd Samba/source/winexe/winexesvc; make CC=i586-mingw32msvc-gcc
+
+ make
for pyvers in $(PYVERS); do \
More information about the Pkg-zenoss-commits
mailing list