[Pkg-zenoss-commits] r219 - in /packages/zenoss/trunk/debian: rules rules-extras.mk zenoss-revisions

[bzed-guest at users.alioth.debian.org]

Author: bzed-guest
Date: Sun Jul  8 21:47:36 2007
New Revision: 219

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=219
Log:
on the way to 2.0.2

Added:
    packages/zenoss/trunk/debian/zenoss-revisions
Modified:
    packages/zenoss/trunk/debian/rules
    packages/zenoss/trunk/debian/rules-extras.mk

Modified: packages/zenoss/trunk/debian/rules
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/rules?rev=219&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/rules (original)
+++ packages/zenoss/trunk/debian/rules Sun Jul  8 21:47:36 2007
@@ -26,7 +26,7 @@
 	Products/ZenEvents/db/zenprocs.sql	\
 	$(NULL)
 
-build: build-indep build-arch
+build: check-dzhandles build-indep build-arch
 build-arch: build-arch-stamp
 build-indep: build-indep-stamp
 

Modified: packages/zenoss/trunk/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/rules-extras.mk?rev=219&op=diff
==============================================================================
--- packages/zenoss/trunk/debian/rules-extras.mk (original)
+++ packages/zenoss/trunk/debian/rules-extras.mk Sun Jul  8 21:47:36 2007
@@ -1,11 +1,35 @@
+#!/usr/bin/make -f
+
+#home, sweet home
+ZENOSS_SVN = http://dev.zenoss.com/svn/trunk
+
 
 # Define the Zenoss' version we're packaging
-VERSION = $(shell dpkg-parsechangelog  | grep '^Version' | sed 's,.* ,,g;s,~.*,,g;s,+r.*,,g')
-EXTRAVERSION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,^$(VERSION),,g;;s,+r.*,,g')
-REVISION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.*+r,,g;s,-.*,,g')
+VERSION = $(shell dpkg-parsechangelog  | grep '^Version' | sed 's,.* ,,g;s,~.*,,g;s,+r.*,,g;s,-.*,,g')
+EXTRAVERSION = $(shell dpkg-parsechangelog | grep '^Version' | sed 's,.* ,,g;s,^$(VERSION),,g;;s,+r.*,,g;s,-.*,,g')
+REVISION = $(shell dpkg-parsechangelog | grep '^Version' | grep '+r' | sed 's,.*+r,,g;s,-.*,,g')
 
-ZENOSS_SVN = http://dev.zenoss.com/svn/trunk
+#if we're building a release there's no revision number in the changelog.
+#we get the revision from debian/zenoss-revisions instead.
+#also we set the directory/filename for our orig.tar.gz here.
+ifeq "$(REVISION)" ""
+REVISION = $(shell grep '^$(VERSION)' $(CURDIR)/debian/zenoss-revisions | \
+                   awk '{print $$2}')
+tarball = zenoss_$(VERSION)$(EXTRAVERSION).orig.tar.gz
+origdirname = zenoss-$(VERSION)$(EXTRAVERSION).orig
+else
+tarball = zenoss_$(VERSION)$(EXTRAVERSION)+r$$revision.orig.tar.gz
+origdirname = zenoss-$(VERSION)$(EXTRAVERSION)+r$$revision.orig
+endif
 
+
+
+
+
+#we can't check for missing Products if we're not within a
+#build directory, for example created by svn-buildpackage --svn-export
+
+ifneq "$(shell [ -d Products ] && echo 1)" ""
 ZENPRODUCTS = $(shell find Products/ -mindepth 1 -maxdepth 1 -type d | \
                            grep -v \.svn | sed 's,Products/,,g')
 
@@ -25,6 +49,10 @@
 	   echo 'Please fix those files before building!' ;\
 	   exit 1 ;\
 	fi 
+
+endif
+
+
 
 
 # set to 0 if you do not want to keep upstream's svn
@@ -60,13 +88,13 @@
 	    fi ;\
 	\
 	echo "checking destinations for .orig dir and .orig.tar.gz" ;\
-	    tarball="zenoss_$(VERSION)$(EXTRAVERSION)+r$$revision.orig.tar.gz" ;\
+	    tarball="$(tarball)" ;\
 	    if [ -e $$packbase/$$tarball ]; then \
 	        echo "$$tarball exists in $$packbase" ;\
 	        echo "please remove it before trying to create a new one" ;\
 	        exit 1 ;\
 	    fi ;\
-	    origdirname="zenoss-$(VERSION)$(EXTRAVERSION)+r$$revision.orig" ;\
+	    origdirname="$(origdirname)" ;\
 	    packdir="$$packbase/$$origdirname" ;\
 	    if [ -d $$packdir ]; then \
 	        echo "$$packdir exists, please remove first" ;\

Added: packages/zenoss/trunk/debian/zenoss-revisions
URL: http://svn.debian.org/wsvn/pkg-zenoss/packages/zenoss/trunk/debian/zenoss-revisions?rev=219&op=file
==============================================================================
--- packages/zenoss/trunk/debian/zenoss-revisions (added)
+++ packages/zenoss/trunk/debian/zenoss-revisions Sun Jul  8 21:47:36 2007
@@ -1,0 +1,7 @@
+# this file contains a list of released versions
+# and their matching revision in upstream's svn,
+# so we don't have to pull from their tagged version
+# + we're a bit more flexible.
+
+#vers.	revision
+2.0.2	5878