gunnar: server/php-kolab DEVELOPMENT,1.3,1.4 Makefile,1.8,1.9

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/php-kolab
In directory doto:/tmp/cvs-serv21675

Modified Files:
	DEVELOPMENT Makefile 
Log Message:
Update version numbers to the scheme agreed upon. For reasons specific to PEAR packaging the source snapshots cannot be tagged with +cvs since the version may only contain numbers and dots.

Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/php-kolab/DEVELOPMENT,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DEVELOPMENT	16 Aug 2007 12:16:51 -0000	1.3
+++ DEVELOPMENT	17 Oct 2007 07:23:20 -0000	1.4
@@ -13,41 +13,58 @@
 Version numbering
 =================
 
-php-kolab is a Kolab Server core package. Released packages should
-have the same core version as the Server release. As a part of Kolab
-Server 2.1.0 the version number should be 2.1.0.
+The package version will be set in
 
-Released source packages will look like this:
+  Makefile
 
- Kolab_*-2.1.0.tar.gz
+e.g.
 
-Released source RPMs will look like this:
+  VERSION = 2.2.beta1
+  CVS = 1
 
- php-kolab-2.1.0-20070813.src.rpm
+Release versions
+----------------
 
-A NEW VERSION HAS TO BE SET IN
+Released packages should have the same core version as the server
+release. As a part of Kolab Server 2.2.0 the version number should be
+2.2.0. Pre-release candidates receive the suffix "betaX" or "rcX"
+(e.g. 2.2.beta1).
 
-  Makefile
+Before tagging the next release the version number needs to be increased
+to the new Kolab Server version (e.g. 2.2.0) and the CVS switch needs to
+be set to 0:
 
-Once development picks up after a release, please switch the CVS
-variable in "Makefile" to "1":
+  VERSION = 2.2.0
+  CVS = 0
 
-CVS = 1
+In addition you should copy the relevant section from
+Kolab_*/ChangeLog into Kolab_*/package.xml.in.
 
-Source packages will then look like this:
+After updating VERSION and CVS you can commit these changes and tag
+the release.
 
-  Kolab_*-2.1.0.20070815.tar.gz
+Now you can create source tarballs and RPMs which will look like:
 
-Source RPMs will be named like this:
+  Kolab_*-2.2.0.tar.gz
+  php-kolab-2.2.0-20070819.src.rpm
 
- php-kolab-2.1.0.cvs-20070815.src.rpm
+Don't forget to change CVS back to 1 again and commit, so later
+CVS snapshots will be named correctly.
 
-For tagging the next release the version number needs to be increased
-to the new Kolab Server version (e.g. 2.2.0) and the CVS parameter
-needs to be switched to "0" again.
+Snapshots
+---------
 
-Once releasing a new package you should copy the relevant section from
-Kolab_*/ChangeLog into Kolab_*/package.xml.in.
+Make sure Makefile contains the following line:
+
+  CVS = 1
+
+The release number will then receive the suffix "+cvs" and the current
+date will be appended.
+
+Source tarballs and RPMs will then look like this:
+
+  Kolab_*-2.2.0.20070819.tar.gz
+  php-kolab-2.2.0+cvs-20070819.src.rpm
 
 Change log
 ==========

Index: Makefile
===================================================================
RCS file: /kolabrepository/server/php-kolab/Makefile,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Makefile	16 Aug 2007 12:16:51 -0000	1.8
+++ Makefile	17 Oct 2007 07:23:20 -0000	1.9
@@ -2,7 +2,7 @@
 RELEASE = $(shell date '+%Y%m%d')
 DATE = $(shell date '+%Y-%m-%d')
 
-VERSION = 2.1.0
+VERSION = 2.2.beta1
 CVS = 1
 
 ifeq "x$(CVS)" "x0"
@@ -10,7 +10,7 @@
   SPEC_VERSION = $(VERSION)
 else
   SOURCE_TAG = $(VERSION).$(RELEASE)
-  SPEC_VERSION = $(VERSION).cvs
+  SPEC_VERSION = $(VERSION)+cvs
 endif
 
 MODULES = Kolab_Freebusy \