thomas: server/perl-kolab DEVELOPMENT,1.9,1.10

[cvs at kolab.org]

Author: thomas

Update of /kolabrepository/server/perl-kolab
In directory doto:/tmp/cvs-serv20918

Modified Files:
	DEVELOPMENT 
Log Message:
Improved paragraph about version numbering


Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/perl-kolab/DEVELOPMENT,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -d -r1.9 -r1.10
--- DEVELOPMENT	15 Oct 2007 15:38:24 -0000	1.9
+++ DEVELOPMENT	15 Oct 2007 16:21:07 -0000	1.10
@@ -13,64 +13,67 @@
 perl-kolab-*.src.rpm package that is suited for installation on an
 OpenPKG system.
 
+
 Version numbering
 =================
 
-A NEW VERSION HAS TO BE SET IN
+The package version will be set in
 
   lib/Kolab.pm
 
 e.g.
 
-our $KOLAB_BASE_VERSION = "2.2.beta1";
+  our $KOLAB_BASE_VERSION = "2.2.beta1";
+  my $KOLAB_CVS = 1;
 
 Release versions
 ----------------
 
-For tagging the next release the version number needs to be increased
+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).
+
+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:
 
-my $KOLAB_CVS = 0;
-
-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. Pre-release candidates receive the suffix "betaX" or "rcX"
-(e.g. 2.2.beta1).
+  our $KOLAB_BASE_VERSION = "2.2.0";
+  my $KOLAB_CVS = 0;
 
-Source packages will then look like this:
+After updating $KOLAB_BASE_VERSION and $KOLAB_CVS you can commit these
+changes and tag the release.
 
- perl-kolab-2.1.0.tar.gz
+Now you can create source tarballs and RPMs which will look like:
 
-Released source RPMs will look like this:
+  perl-kolab-2.2.0.tar.gz
+  perl-kolab-2.2.0-20070819.src.rpm
 
- perl-kolab-2.1.0-20070819.src.rpm
+Don't forget to change $KOLAB_CVS back to 1 again and commit, so later
+CVS snapshots will be named correctly.
 
 Snapshots
 ---------
 
-After tagging and releasing, please set
-
-my $KOLAB_CVS = 1;
+Make sure lib/Kolab.pm contains the following line:
 
-in lib/Kolab.pm.
+  my $KOLAB_CVS = 1;
 
 The release number will then receive the suffix "+cvs" and the current
-date will be appended. 
-
-Source packages will then look like this:
+date will be appended.
 
- perl-kolab-2.1.0+cvs20070810.tar.gz
+Source tarballs and RPMs will then look like this:
 
-Source RPMs will be named similar:
+  perl-kolab-2.2.0+cvs20070810.tar.gz
+  perl-kolab-2.2.0+cvs-20070810.src.rpm
 
- perl-kolab-2.1.0+cvs-20070810.src.rpm
 
 Change log
 ==========
 
 The change log for the package is provided in "Changes". Please keep
 this file up-to-date if you change the source code of this package.
+
 
 Contributors
 ============