[Pkg-zenoss-commits] r99 - in /packages/zenoss/trunk/debian: rules zenoss-zensocket.install zenoss.install
zack at users.alioth.debian.org
zack at users.alioth.debian.org
Fri Jun 15 12:24:46 UTC 2007
Author: zack
Date: Fri Jun 15 12:24:46 2007
New Revision: 99
URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=99
Log:
- delegated some more installation tasks to dh_install
- cosmetic changed in debian/rules
Added:
packages/zenoss/trunk/debian/zenoss-zensocket.install
Modified:
packages/zenoss/trunk/debian/rules
packages/zenoss/trunk/debian/zenoss.install
Modified: packages/zenoss/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/rules?rev=99&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/rules (original)
+++ packages/zenoss/trunk/debian/rules Fri Jun 15 12:24:46 2007
@@ -1,9 +1,8 @@
#!/usr/bin/make -f
-# -*- makefile -*-
+include /usr/share/dpatch/dpatch.make
# Uncomment this to turn on verbose mode.
export DH_VERBOSE=1
-
CFLAGS = -Wall -g
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
@@ -12,10 +11,9 @@
CFLAGS += -O2
endif
-
# we're using python2.4 and zope2.9
-PYTHON=python2.4
-ZOPE=zope2.9
+PYTHON = python2.4
+ZOPE = zope2.9
# Define the Zenoss' version we're packaging
VERSION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,~.*,,g;s,+r.*,,g')
@@ -27,47 +25,34 @@
#ZENOSS_SVN = http://dev.zenoss.com/svn/tags/zenoss-$(VERSION)
ZENOSS_SVN = http://dev.zenoss.com/svn/trunk
-
-
-
-# Include dpatch stuff.
-include /usr/share/dpatch/dpatch.make
-
-
build: build-indep build-arch
build-arch: build-arch-stamp
build-indep: build-indep-stamp
build-arch-stamp: patch
-
- cd inst/zensocket; gcc -pedantic -o zensocket -D__GNU_LIBRARY__ $(CFLAGS) zensocket.c
+ cd inst/zensocket ; \
+ gcc -pedantic -o zensocket -D__GNU_LIBRARY__ $(CFLAGS) zensocket.c
touch $@
-
build-indep-stamp: patch
dh_testdir
-
cd PDIS-XPath-0.3; $(PYTHON) setup.py build
cd testgen; $(PYTHON) setup.py build
touch $@
-
clean: clean-arch clean-indep unpatch
dh_clean
clean-arch:
dh_testdir
dh_testroot
-
rm -f build-stamp-arch
rm -f inst/zensocket/zensocket
clean-indep:
dh_testdir
dh_testroot
-
rm -f build-stamp-indep
-
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 {} \;
@@ -78,31 +63,25 @@
dh_testroot
dh_clean -k -a
dh_installdirs -a
- install -m 4755 inst/zensocket/zensocket $(CURDIR)/debian/zenoss-zensocket/usr/bin
+ dh_install -a
install-indep: build-indep
dh_testdir
dh_testroot
dh_clean -k -i
dh_installdirs -i
-
cd PDIS-XPath-0.3; $(PYTHON) setup.py install \
- --root=$(CURDIR)/debian/zenoss \
- --install-purelib=/usr/share/python-support/zenoss \
- --no-compile
+ --root=$(CURDIR)/debian/zenoss \
+ --install-purelib=/usr/share/python-support/zenoss \
+ --no-compile
cd testgen; $(PYTHON) setup.py install --root $(CURDIR)/debian/zenoss \
- --install-purelib=/usr/share/python-support/zenoss \
- --no-compile
+ --install-purelib=/usr/share/python-support/zenoss \
+ --no-compile
dh_install -i -Nzenoss
-
cp -pr /usr/lib/$(ZOPE)/skel $(CURDIR)/debian/zenoss/usr/lib/zenoss
rm -f $(CURDIR)/debian/zenoss/usr/lib/zenoss/skel/import/*.zexp
dh_install -pzenoss -Xzope.conf.in -Xsudoers -Xmy.cnf -Xsnmpd.conf \
- -Xfreetds.conf -XLICENSE.txt -XCOPYRIGHT.txt -Xlicense.txt
-
- install -m 644 debian/zenoss.lintian-overrides $(CURDIR)/debian/zenoss/usr/share/lintian/overrides/zenoss
-
-
+ -Xfreetds.conf -XLICENSE.txt -XCOPYRIGHT.txt -Xlicense.txt
binary-arch: build-arch install-arch
dh_testdir
@@ -258,12 +237,10 @@
echo "tarball: $$packbase/$$tarball" ;\
echo "done."
-
-
##############################################################################
binary: binary-arch binary-indep
-.PHONY: build build-indep build-arch clean clean-indep clean-arch \
- binary-indep binary-arch binary install \
- patch unpatch get-orig-source update-dzhandles
+.PHONY: build build-indep build-arch clean clean-indep clean-arch
+.PHONY: binary-indep binary-arch binary install
+.PHONY: patch unpatch get-orig-source update-dzhandles
Added: packages/zenoss/trunk/debian/zenoss-zensocket.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss-zensocket.install?rev=99&op=file
==============================================================================
--- packages/zenoss/trunk/debian/zenoss-zensocket.install (added)
+++ packages/zenoss/trunk/debian/zenoss-zensocket.install Fri Jun 15 12:24:46 2007
@@ -1,0 +1,1 @@
+inst/zensocket/zensocket /usr/bin
Modified: packages/zenoss/trunk/debian/zenoss.install
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss.install?rev=99&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/zenoss.install (original)
+++ packages/zenoss/trunk/debian/zenoss.install Fri Jun 15 12:24:46 2007
@@ -1,3 +1,4 @@
-Products/* /usr/share/zope/Products/
-inst/conf/* /usr/lib/zenoss/skel/conf
-bin/* /usr/lib/zenoss/skel/bin
+Products/* /usr/share/zope/Products/
+inst/conf/* /usr/lib/zenoss/skel/conf
+bin/* /usr/lib/zenoss/skel/bin
+debian/zenoss.lintian-overrides /usr/share/lintian/overrides/zenoss
More information about the Pkg-zenoss-commits
mailing list