[Pkg-zenoss-commits] r10 - packages/zenoss/trunk/debian

[Bernd Zeimetz]

Author: bzed-guest
Date: 2007-05-04 15:24:13 +0000 (Fri, 04 May 2007)
New Revision: 10

Modified:
   packages/zenoss/trunk/debian/README.Debian-source
   packages/zenoss/trunk/debian/changelog
   packages/zenoss/trunk/debian/rules
Log:
better versioning. thanks to zack for the idea


Modified: packages/zenoss/trunk/debian/README.Debian-source
===================================================================
--- packages/zenoss/trunk/debian/README.Debian-source	2007-05-04 14:56:57 UTC (rev 9)
+++ packages/zenoss/trunk/debian/README.Debian-source	2007-05-04 15:24:13 UTC (rev 10)
@@ -18,10 +18,14 @@
   debian/rules get-orig-source
 which will drop the orig.tar.gz in ../tarballs. In case this directory does
 not exist, the tarball will be left in the source directory.
+
 By default, this will keep a checkout of upstream's svn. If you don't want
 that, either edit debian/rules or run
    debian/rules get-orig-source KEEP_UPSTREAM=0
 
+In case you want to fetch the latest upstream revision from svn instead of
+the revision from debian/changelog:
+   debian/rules get-orig-source REVISION=""
 
 Please note that the repackaging was not done because of licensing/
 copyright issues. Zenoss, it's documentation and all dependencies

Modified: packages/zenoss/trunk/debian/changelog
===================================================================
--- packages/zenoss/trunk/debian/changelog	2007-05-04 14:56:57 UTC (rev 9)
+++ packages/zenoss/trunk/debian/changelog	2007-05-04 15:24:13 UTC (rev 10)
@@ -1,4 +1,4 @@
-zenoss (2.0~r5145-1) UNRELEASED; urgency=low
+zenoss (2.0~alpha+r5149-1) UNRELEASED; urgency=low
 
   * Initial release (Closes: #361253)
 

Modified: packages/zenoss/trunk/debian/rules
===================================================================
--- packages/zenoss/trunk/debian/rules	2007-05-04 14:56:57 UTC (rev 9)
+++ packages/zenoss/trunk/debian/rules	2007-05-04 15:24:13 UTC (rev 10)
@@ -9,12 +9,14 @@
 
 
 # Define the Zenoss' version we're packaging
-VERSION := $(shell dpkg-parsechangelog  | grep '^Version' | sed 's,.* ,,g;s,~.*,,g')
+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')
 
 #there's no 2.0 tag yet, need to change that later.
 #we're packaging trunk for now
-#ZENOSS_SVN := http://dev.zenoss.com/svn/tags/zenoss-$(VERSION)
-ZENOSS_SVN := http://dev.zenoss.com/svn/trunk
+#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
@@ -211,13 +213,13 @@
 	    fi ;\
 	\
 	echo "checking destinations for .orig dir and .orig.tar.gz" ;\
-	    tarball="zenoss_$(VERSION)~r$$revision.orig.tar.gz" ;\
+	    tarball="zenoss_$(VERSION)$(EXTRAVERSION)+r$$revision.orig.tar.gz" ;\
 	    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)~r$$revision.orig" ;\
+	    origdirname="zenoss-$(VERSION)$(EXTRAVERSION)+r$$revision.orig" ;\
 	    packdir="$$packbase/$$origdirname" ;\
 	    if [ -d $$packdir ]; then \
 	        echo "$$packdir exists, please remove first" ;\