[Pkg-zenoss-commits] r6 - in packages/zenoss/trunk/debian: . patches
Bernd Zeimetz
bzed-guest at alioth.debian.org
Fri May 4 12:31:39 UTC 2007
Author: bzed-guest
Date: 2007-05-04 12:31:39 +0000 (Fri, 04 May 2007)
New Revision: 6
Added:
packages/zenoss/trunk/debian/patches/wmi-build.dpatch
Modified:
packages/zenoss/trunk/debian/control
packages/zenoss/trunk/debian/patches/00list
packages/zenoss/trunk/debian/rules
Log:
adding wmi
Modified: packages/zenoss/trunk/debian/control
===================================================================
--- packages/zenoss/trunk/debian/control 2007-05-04 10:00:29 UTC (rev 5)
+++ packages/zenoss/trunk/debian/control 2007-05-04 12:31:39 UTC (rev 6)
@@ -3,14 +3,17 @@
Priority: optional
Maintainer: Zenoss Packaging Team <pkg-zenoss-team at lists.alioth.debian.org>
Uploaders: Bernd Zeimetz <bernd at bzed.de>
-Build-Depends: debhelper (>= 5), python-support (>= 0.5.3), python, dpatch, zope-debhelper
+Build-Depends: debhelper (>= 5), dpatch,
+ zope-debhelper,
+ python2.4, python2.4-dev, python-support (>= 0.5.3),
+ mingw32
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-zenoss/packages/zenoss/trunk/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-zenoss/packageszenoss/trunk/
Standards-Version: 3.7.2
Package: zenoss
Architecture: all
-Depends: ${python:Depends}, ${misc:Depends}, ${shlibs:Depends},
+Depends: ${python:Depends}, ${misc:Depends},
python-elementtree (>= 1.2.6), python-epydoc (>= 2.1),
python-mysqldb (>= 1.2.0),
python-pydot (>= 0.9.10), python-pysnmp-se, python-simplejson (>= 1.4),
@@ -56,3 +59,11 @@
CPU, memory, disk, io, or process activity and reports it
in name-value pair format. These name-value pairs can be
graphed in the Zenoss web application.
+
+Package: zenoss-wmi
+Architecture: any
+Depends: ${python:Depends}, ${shlibs:Depends}
+Description: DCOM/WMI client implementation for Linux
+ This implementation of DCOM/WMI client is based on Samba4 sources.
+ It uses RPC/DCOM mechanism to interact with WMI services on Windows
+ 2000/XP/2003 machines.
Modified: packages/zenoss/trunk/debian/patches/00list
===================================================================
--- packages/zenoss/trunk/debian/patches/00list 2007-05-04 10:00:29 UTC (rev 5)
+++ packages/zenoss/trunk/debian/patches/00list 2007-05-04 12:31:39 UTC (rev 6)
@@ -1,2 +1,3 @@
pdis-distutils
testgen-distutils
+wmi-build
Added: packages/zenoss/trunk/debian/patches/wmi-build.dpatch
===================================================================
--- packages/zenoss/trunk/debian/patches/wmi-build.dpatch 2007-05-04 10:00:29 UTC (rev 5)
+++ packages/zenoss/trunk/debian/patches/wmi-build.dpatch 2007-05-04 12:31:39 UTC (rev 6)
@@ -0,0 +1,78 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## wmi-build.dpatch by Bernd Zeimetz <bernd at bzed.de>
+##
+## DP: adding a more Debian-like style to the GNUmakefile,
+## DP: allowing us to install it several times without
+## DP: having to built it all times
+
+ at 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 13:50:02.000000000 +0200
+@@ -1,5 +1,6 @@
+ all: install
+
++build: pywmi-build pycom-build
+ install: pywmi-installed pycom-installed
+
+ ifeq ($(PYTHON),)
+@@ -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 $@
++
++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
++ touch $@
++
++pywmi-installed: pywmi-build $(DESTDIR)$(PYLIBDIR) $(DESTDIR)$(ZENBIN)
+ cp bin/winexe $(DESTDIR)$(ZENBIN) && \
+ cp wmi/_pywmi.so $(DESTDIR)$(PYLIBDIR) && \
+ cp wmi/pywmi.py $(DESTDIR)$(PYLIBDIR)
+@@ -23,18 +32,27 @@
+ $(DESTDIR)$(ZENBIN) $(DESTDIR)$(PYLIBDIR):
+ mkdir -p $@
+
+-clean:
+- cd pycom && rm -rf build
+- cd Samba/source && make clean
+- rm -f ./Samba/source/wmi/_pywmi.so
++pycom-build: pycom-build-stamp
++pycom-build-stamp:
++ cd pycom && \
++ python setup.py build
++ touch $@
+
+-pycom-installed:
++pycom-installed: pycom-build
+ cd pycom && \
+ python setup.py install \
+ --install-lib="$(PYLIBDIR)" \
+ --install-scripts="$(ZENBIN)" \
+ --root="$(DESTDIR)"
+
++clean:
++ cd pycom && python setup.py clean
++ cd pycom && rm -rf build
++ find pycom -name \*.pyc -exec rm -f {} \;
++ cd Samba/source && make clean
++ rm -f ./Samba/source/wmi/_pywmi.so
++ rm -f pycom-build-stamp pywmi-build-stamp
++
+ tarball: clean
+ tar --exclude=".svn" \
+ --exclude='*~' \
+@@ -42,3 +60,4 @@
+ -cjf "../wmi-$(DATE).tar.bz2" \
+ .
+
++.PHONY: all build pywmi-build pycom-build install pywmi-installed pycom-installed clean tarball
Property changes on: packages/zenoss/trunk/debian/patches/wmi-build.dpatch
___________________________________________________________________
Name: svn:executable
+ *
Modified: packages/zenoss/trunk/debian/rules
===================================================================
--- packages/zenoss/trunk/debian/rules 2007-05-04 10:00:29 UTC (rev 5)
+++ packages/zenoss/trunk/debian/rules 2007-05-04 12:31:39 UTC (rev 6)
@@ -4,6 +4,10 @@
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
+
+PYTHON=python2.4
+
+
# Define the Zenoss' version we're packaging
VERSION := $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,~.*,,g')
@@ -16,73 +20,140 @@
include /usr/share/dpatch/dpatch.make
-#Architecture
-build: build-stamp
-build-stamp: patch
+build: build-indep build-arch
+build-arch: build-arch-stamp
+build-indep: build-indep-stamp
+
+build-arch-stamp: patch
+ cd wmi/Samba/source/winexe/winexesvc; make CC=i586-mingw32msvc-gcc
+ cd wmi; make build PYTHON=$(PYTHON) \
+ PYLIBDIR=/usr/lib/
+ ZENBIN=/usr/bin
+ touch $@
+
+
+build-indep-stamp: patch
dh_testdir
- dh_testroot
- cd PDIS-XPath-0.3; python setup.py build
- cd testgen; python setup.py build
+ cd PDIS-XPath-0.3; $(PYTHON) setup.py build
+ cd testgen; $(PYTHON) setup.py build
+ cd zenplugins; $(PYTHON) setup.py build
touch $@
-clean: clean1 unpatch
-clean1:
+
+clean: clean-arch clean-indep unpatch
+ dh_clean
+
+clean-arch:
dh_testdir
dh_testroot
- cd PDIS-XPath-0.3; python setup.py clean -a
- cd testgen; python setup.py clean -a
- find testgen PDIS-XPath-0.3 -name \*.pyc -exec rm -f {} \;
- dh_clean
- rm -f build-stamp
-install: build
+ cd wmi; make clean
+ rm -f build-stamp-arch
+
+clean-indep:
dh_testdir
dh_testroot
+
+ cd PDIS-XPath-0.3; $(PYTHON) setup.py clean -a
+ cd testgen; $(PYTHON) setup.py clean -a
+ cd zenplugins; $(PYTHON) setup.py clean -a
+ find testgen PDIS-XPath-0.3 zenplugins -name \*.pyc -exec rm -f {} \;
+ rm -f build-stamp-indep
+
+
+install-arch: build-arch
+ cd wmi; make pywmi-installed PYTHON=$(PYTHON) \
+ ZENBIN=/usr/bin \
+ DESTDIR=$(CURDIR)/debian/zenoss-wmi \
+ PYLIBDIR=/usr/lib/python-support/zenoss-wmi
+ cd wmi/pycom; $(PYTHON) setup.py install \
+ --root=$(CURDIR)/debian/zenoss-wmi \
+ --install-purelib=/usr/share/python-support/zenoss=wmi \
+ --install-platlib=/usr/lib/python-support/zenoss=wmi \
+ --no-compile -O0
+
+install-indep: build-indep
+ dh_testdir
+ dh_testroot
dh_clean -k -i
dh_installdirs -i
- cd PDIS-XPath-0.3; python setup.py install \
+ cd PDIS-XPath-0.3; $(PYTHON) setup.py install \
--root=$(CURDIR)/debian/zenoss \
--install-purelib=/usr/share/python-support/zenoss \
--no-compile
- cd testgen; python setup.py install --root $(CURDIR)/debian/zenoss \
+ cd testgen; $(PYTHON) setup.py install --root $(CURDIR)/debian/zenoss \
--install-purelib=/usr/share/python-support/zenoss \
- --no-compile
+ --no-compile
+ cd zenplugins; $(PYTHON) setup.py install --root $(CURDIR)/debian/zenoss-plugins \
+ --install-purelib=/usr/share/python-support/zenoss-plugins \
+ --no-compile --single-version-externally-managed
dh_install -i -XLICENSE.txt -XCOPYRIGHT.txt -Xlicense.txt
- cp debian/zenoss.lintian-overrides $(CURDIR)/debian/zenoss/usr/share/lintian/overrides/zenoss
+ install -m 644 debian/zenoss.lintian-overrides $(CURDIR)/debian/zenoss/usr/share/lintian/overrides/zenoss
-binary-indep:
+
+
+binary-arch: build-arch install-arch
dh_testdir
dh_testroot
- dh_installchangelogs
- dh_installdocs
-# dh_installexamples
-# dh_installmenu
-# dh_installdebconf
-# dh_installlogrotate
-# dh_installemacsen
-# dh_installpam
-# dh_installmime
- dh_pysupport
- dh_installzope
+ dh_installchangelogs -a
+ dh_installdocs -a
+# dh_installexamples -a
+# dh_installmenu -a
+# dh_installdebconf -a
+# dh_installlogrotate -a
+# dh_installemacsen -a
+# dh_installpam -a
+# dh_installmime -a
+ dh_pysupport -a
+# dh_installinit -a
+# dh_installcron -a
+# dh_installinfo -a
+# dh_installman -a
+ dh_link -a
+ dh_strip -a
+ dh_compress -a
+ dh_fixperms -a
+# dh_perl -a
+ #dh_makeshlibs -a
+ dh_installdeb -a
+ dh_shlibdeps -a
+ dh_gencontrol -a
+ dh_md5sums -a
+ dh_builddeb -a
+
+binary-indep: build install
+ dh_testdir
+ dh_testroot
+ dh_installchangelogs -i
+ dh_installdocs -i
+# dh_installexamples -i
+# dh_installmenu -i
+# dh_installdebconf -i
+# dh_installlogrotate -i
+# dh_installemacsen -i
+# dh_installpam -i
+# dh_installmime -i
+ dh_pysupport -i
+ dh_installzope -i
dh_installzopeinstance -pzenoss zenoss
# dh_installinit
# dh_installcron
# dh_installinfo
# dh_installman
dh_link -pzenoss-doc /usr/share/doc/zenoss /usr/share/doc/zenoss-doc/doc
- dh_link
+ dh_link -i
# dh_strip
- dh_compress
- dh_fixperms
+ dh_compress -i
+ dh_fixperms -i
# dh_perl
# dh_makeshlibs
- dh_installdeb
-# dh_shlibdeps
- dh_gencontrol
- dh_md5sums
- dh_builddeb
+ dh_installdeb -i
+# dh_shlibdeps -i
+ dh_gencontrol -i
+ dh_md5sums -i
+ dh_builddeb -i
##############################################################################
# targets which are not used while building the package
@@ -201,8 +272,8 @@
##############################################################################
-binary-arch: build install
binary: binary-arch binary-indep
-.PHONY: build clean binary-indep binary-arch binary install\
- clean1 patch unpatch get-orig-source
+.PHONY: build build-indep build-arch clean clean-indep clean-arch \
+ binary-indep binary-arch binary install \
+ patch unpatch get-orig-source update-dzhandles
More information about the Pkg-zenoss-commits
mailing list