gunnar: server/kolabconf DEVELOPMENT,1.3,1.4 Makefile.PL,1.7,1.8

[cvs at kolab.org]

Author: gunnar

Update of /kolabrepository/server/kolabconf
In directory doto:/tmp/cvs-serv4349

Modified Files:
	DEVELOPMENT Makefile.PL 
Log Message:
Adapt the version numbering to the latest scheme proposed.

Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/kolabconf/DEVELOPMENT,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -d -r1.3 -r1.4
--- DEVELOPMENT	2 Aug 2007 06:43:09 -0000	1.3
+++ DEVELOPMENT	15 Aug 2007 16:41:00 -0000	1.4
@@ -14,27 +14,53 @@
 Version numbering
 =================
 
-kolabconf is a Kolab Server core package. It should have the same
-version as the Server release. As a part of Kolab Server 2.1 the
-version number should be 2.1.
+kolabconf 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.
 
-Once development picks up after a release, the version number should
-be switched to $(OLD_VERSION).99 e.g. 2.1.99. There'll be no changes
-of the version during development as there are no source packages
-being released.
+Released source packages will look like this:
 
-For the next release the version number will be increased to the new
-Kolab Server version e.g. 2.2 and a new source packge will be
-provided.
+ kolabconf-2.1.0.tar.gz
 
-A NEW VERSION HAS TO BE SET IN BOTH
+Released source RPMs will look like this:
 
-  bin/kolabconf
+ kolabconf-2.1.0-20070819.src.rpm
 
-AND
+A NEW VERSION HAS TO BE SET IN
 
-  kolabconf.spec
+  Makefile.PL
 
-For testing purposes the "dist" target will produce source RPM
-packages that have the release number from the kolabconf.spec file
-attached. You need to update the kolabxonf.spec manually.
\ No newline at end of file
+Once development picks up after a release, please set
+
+my $KOLAB_CVS = 1;
+
+in Makefile.PL.
+
+The version number will then receive the suffix ".cvs" and the current
+date will be appended. 
+
+Source packages will then look like this:
+
+ kolabconf-2.1.0.cvs-20070810.tar.gz
+
+Source RPMs will be named similar:
+
+ kolabconf-2.1.0.cvs-20070810.src.rpm
+
+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 switch needs to
+be reversed:
+
+my $KOLAB_CVS = 0;
+
+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
+============
+
+The developers of this package are listed in "AUTHORS". Please keep
+this file up-to-date if you change the source code of this package.

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -d -r1.7 -r1.8
--- Makefile.PL	13 Aug 2007 07:28:44 -0000	1.7
+++ Makefile.PL	15 Aug 2007 16:41:00 -0000	1.8
@@ -17,7 +17,7 @@
 my $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 
 if ($KOLAB_CVS) {
-    $KOLAB_VERSION = $KOLAB_BASE_VERSION . "_cvs";
+    $KOLAB_VERSION = $KOLAB_BASE_VERSION . ".cvs";
     $VERSION = $KOLAB_VERSION . "-" . $KOLAB_RELEASE;
 } else {
     $KOLAB_VERSION = $KOLAB_BASE_VERSION;