[Pkg-zenoss-commits] (no subject)
bzed-guest at alioth.debian.org
bzed-guest at alioth.debian.org
Sun May 13 20:18:40 UTC 2007
Subject: r35 - in packages/zenoss/trunk/debian: . patches
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Author: bzed-guest
Date: 2007-05-13 20:18:40 +0000 (Sun, 13 May 2007)
New Revision: 35
Added:
packages/zenoss/trunk/debian/zenoss-zensocket.dirs
Removed:
packages/zenoss/trunk/debian/patches/wmi-build.dpatch
Modified:
packages/zenoss/trunk/debian/changelog
packages/zenoss/trunk/debian/control
packages/zenoss/trunk/debian/patches/00list
packages/zenoss/trunk/debian/rules
packages/zenoss/trunk/debian/zenoss-doc.install
Log:
moving wmi into a package on it's own, building zensocket
Modified: packages/zenoss/trunk/debian/changelog
===================================================================
--- packages/zenoss/trunk/debian/changelog 2007-05-13 14:52:53 UTC (rev 34)
+++ packages/zenoss/trunk/debian/changelog 2007-05-13 20:18:40 UTC (rev 35)
@@ -1,4 +1,4 @@
-zenoss (2.0~beta+r5255-1) UNRELEASED; urgency=low
+zenoss (2.0~beta+r5324-1) UNRELEASED; urgency=low
* Initial release (Closes: #361253)
Modified: packages/zenoss/trunk/debian/control
===================================================================
--- packages/zenoss/trunk/debian/control 2007-05-13 14:52:53 UTC (rev 34)
+++ packages/zenoss/trunk/debian/control 2007-05-13 20:18:40 UTC (rev 35)
@@ -4,9 +4,7 @@
Maintainer: Zenoss Packaging Team <pkg-zenoss-team at lists.alioth.debian.org>
Uploaders: Bernd Zeimetz <bernd at bzed.de>
Build-Depends: debhelper (>= 5), dpatch,
- zope-debhelper,
- python2.4, python2.4-dev, python-support (>= 0.5.3),
- mingw32, swig
+ zope-debhelper, python, python-support (>= 0.5.3),
XS-Vcs-Svn: svn://svn.debian.org/svn/pkg-zenoss/packages/zenoss/trunk/
XS-Vcs-Browser: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/
Standards-Version: 3.7.2
@@ -17,9 +15,8 @@
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),
- python-rrd,
- python-twisted-core (>= 2.4.0), python-twisted-bin, python-twisted-conch,
- python-twisted-names, python-twisted-snmp, python-twisted-web,
+ python-rrd, python-twisted (>= 2.5.0),
+ python-twisted-snmp,
python-twill (>= 0.8.5), yapps2 (>= 2.1.1),
zope-common (>= 0.5.33), zope2.9, zope-advancedquery, zope-managableindex,
zope-cmfcore1.6, zope-genericsetup, zope-pas, zope-pluginregistry,
@@ -52,14 +49,10 @@
of the architecture of the Zenoss system and describe how to
perform common managment tasks.
-Package: zenoss-wmi
+Package: zenoss-zensocket
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.
- .
- This package is a Zenoss dependency mainly, but it can be used on
- its own. It also includes a Python module providing access to the
- DCOM/WMI functions.
+Depends: ${python:Depends}, ${shlibs:Depends}, ${misc:Depends}
+Description: Allow Zenoss daemons to bind to low ports
+ zensocket is a wrapper which is used to allow some of the
+ Zenoss daemons to bind to low ports in a safe way, without
+ the need to run them with root privileges.
Modified: packages/zenoss/trunk/debian/patches/00list
===================================================================
--- packages/zenoss/trunk/debian/patches/00list 2007-05-13 14:52:53 UTC (rev 34)
+++ packages/zenoss/trunk/debian/patches/00list 2007-05-13 20:18:40 UTC (rev 35)
@@ -1,3 +1,2 @@
pdis-distutils
testgen-distutils
-wmi-build
Deleted: packages/zenoss/trunk/debian/patches/wmi-build.dpatch
===================================================================
--- packages/zenoss/trunk/debian/patches/wmi-build.dpatch 2007-05-13 14:52:53 UTC (rev 34)
+++ packages/zenoss/trunk/debian/patches/wmi-build.dpatch 2007-05-13 20:18:40 UTC (rev 35)
@@ -1,80 +0,0 @@
-#! /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 build it all times
-## DP: Also adding a .PHONY
-
- 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 15:06:04.000000000 +0200
-@@ -1,5 +1,6 @@
- all: install
-
-+build: pywmi-build pycom-build
- install: pywmi-installed pycom-installed
-
- ifeq ($(PYTHON),)
-@@ -11,11 +12,20 @@
- 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)
-+ cd Samba/source && \
- cp bin/winexe $(DESTDIR)$(ZENBIN) && \
- cp wmi/_pywmi.so $(DESTDIR)$(PYLIBDIR) && \
- cp wmi/pywmi.py $(DESTDIR)$(PYLIBDIR)
-@@ -23,18 +33,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 +61,4 @@
- -cjf "../wmi-$(DATE).tar.bz2" \
- .
-
-+.PHONY: all build pywmi-build pycom-build install pywmi-installed pycom-installed clean tarball
Modified: packages/zenoss/trunk/debian/rules
===================================================================
--- packages/zenoss/trunk/debian/rules 2007-05-13 14:52:53 UTC (rev 34)
+++ packages/zenoss/trunk/debian/rules 2007-05-13 20:18:40 UTC (rev 35)
@@ -5,6 +5,13 @@
export DH_VERBOSE=1
+CFLAGS = -Wall -g
+ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
+ CFLAGS += -O0
+else
+ CFLAGS += -O2
+endif
+
PYTHON=python2.4
@@ -27,11 +34,8 @@
build-indep: build-indep-stamp
build-arch-stamp: patch
- #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/
- ZENBIN=/usr/bin
+
+ cd inst/zensocket; gcc -pedantic -o zensocket -D__GNU_LIBRARY__ $(CFLAGS) zensocket.c
touch $@
@@ -50,7 +54,7 @@
dh_testdir
dh_testroot
- -cd wmi; make clean
+ rm -f inst/zensocket/zensocket
rm -f build-stamp-arch
clean-indep:
@@ -64,19 +68,12 @@
install-arch: build-arch
- 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/$(PYTHON) \
- --no-compile -O0
+ dh_testdir
+ dh_testroot
+ dh_clean -k -a
+ dh_installdirs -a
+ install -m 4755 inst/zensocket/zensocket $(CURDIR)/debian/zenoss-zensocket/usr/bin
- cd wmi; make pywmi-installed PYTHON=$(PYTHON) \
- ZENBIN=/usr/bin \
- DESTDIR=$(CURDIR)/debian/zenoss-wmi \
- PYLIBDIR=/usr/lib/python-support/zenoss-wmi/$(PYTHON)
- mv $(CURDIR)/debian/zenoss-wmi/usr/lib/python-support/zenoss-wmi/python2.4/pywmi.py \
- $(CURDIR)/debian/zenoss-wmi/usr/share/python-support/zenoss-wmi
-
install-indep: build-indep
dh_testdir
dh_testroot
@@ -107,7 +104,7 @@
# dh_installemacsen -a
# dh_installpam -a
# dh_installmime -a
- dh_pysupport -a
+# dh_pysupport -a
# dh_installinit -a
# dh_installcron -a
# dh_installinfo -a
@@ -255,6 +252,8 @@
rm -rf Products/PluggableAuthService/ ;\
rm -rf Products/PluginRegistry/ ;\
rm -f Products/DataCollector/plugins/setignore.sh ;\
+ rm -rf wmi ;\
+ rm -rf evtsys ;\
rm -rf zenwin ;\
rm -rf zenplugins ;\
rm -rf pynetsnmp ;\
Modified: packages/zenoss/trunk/debian/zenoss-doc.install
===================================================================
--- packages/zenoss/trunk/debian/zenoss-doc.install 2007-05-13 14:52:53 UTC (rev 34)
+++ packages/zenoss/trunk/debian/zenoss-doc.install 2007-05-13 20:18:40 UTC (rev 35)
@@ -1 +1,7 @@
-docs/* /usr/share/doc/zenoss
+inst/docs/HOWTO-APC.txt /usr/share/doc/zenoss
+inst/docs/HowToWriteAReport.txt /usr/share/doc/zenoss
+inst/docs/Syslog-HOWTO.txt /usr/share/doc/zenoss
+inst/docs/ZenPackNotes.txt /usr/share/doc/zenoss
+inst/docs/ZenPack.txt /usr/share/doc/zenoss
+inst/docs/HelloWorldZenPack /usr/share/doc/zenoss
+zendocs/ZenossAdminGuide-1.1.pdf /usr/share/doc/zenoss
Added: packages/zenoss/trunk/debian/zenoss-zensocket.dirs
===================================================================
--- packages/zenoss/trunk/debian/zenoss-zensocket.dirs (rev 0)
+++ packages/zenoss/trunk/debian/zenoss-zensocket.dirs 2007-05-13 20:18:40 UTC (rev 35)
@@ -0,0 +1 @@
+usr/bin
More information about the Pkg-zenoss-commits
mailing list