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

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

Author: bzed-guest
Date: Mon Sep 24 17:54:59 2007
New Revision: 296

URL: http://svn.debian.org/wsvn/pkg-zenoss/?sc=1&rev=296
Log:
few updates to be able to build daily tarballs again, that was kinda broken

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

Modified: trunk/packages/zenoss/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/changelog?rev=296&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/changelog (original)
+++ trunk/packages/zenoss/debian/changelog Mon Sep 24 17:54:59 2007
@@ -1,4 +1,4 @@
-zenoss (2.0.90-1) UNRELEASED; urgency=low
+zenoss (2.0.91~unreleased+r6726-1) UNRELEASED; urgency=low
 
   * Initial release (closes: #361253)
 

Modified: trunk/packages/zenoss/debian/rules-extras.mk
URL: http://svn.debian.org/wsvn/pkg-zenoss/trunk/packages/zenoss/debian/rules-extras.mk?rev=296&op=diff
==============================================================================
--- trunk/packages/zenoss/debian/rules-extras.mk (original)
+++ trunk/packages/zenoss/debian/rules-extras.mk Mon Sep 24 17:54:59 2007
@@ -8,14 +8,10 @@
 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')
+REVISION_RELEASE = $(shell grep '^$(VERSION)' $(CURDIR)/debian/zenoss-revisions | \
+                   awk '{print $$2}')
 
-
-#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}')
+ifneq "$(REVISION_RELEASE)" ""
 tarball = zenoss_$(VERSION)$(EXTRAVERSION).orig.tar.gz
 origdirname = zenoss-$(VERSION)$(EXTRAVERSION).orig
 else