gunnar: server/kolabconf ChangeLog, NONE, 1.1 DEVELOPMENT, 1.4, 1.5 MANIFEST, 1.2, 1.3 Makefile.PL, 1.10, 1.11 Changes, 1.4, NONE

[cvs at kolab.org]

Author: gunnar

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

Modified Files:
	DEVELOPMENT MANIFEST Makefile.PL 
Added Files:
	ChangeLog 
Removed Files:
	Changes 
Log Message:
Change the version numbering to the scheme agreed upon.

--- NEW FILE: ChangeLog ---
2007-09-06  Gunnar Wrobel  <p at rdus.de>

	* Conf.pm:

	Allowed config variable replacement within the META section of
	the templates. This reduces our dependence on the dist_conf
	mechanism and we can use variables from kolab.globals
	instead. Now add on packages can install their own templates.

	Whitespace cleanup.

2007-08-07  Gunnar Wrobel  <p at rdus.de>

	* Conf.pm:

	Fixed kolab/issue1879 (kolabconf poor error message in buildCyrusConfig)
	https://intevation.de/roundup/kolab/issue1879

2007-08-01    Gunnar Wrobel  <p at rdus.de>

	Created the kolabconf package by moving kolabconf and the
	Conf.pm perl module into one package. The package is now a
	clean perl package.

2007-07-31    Gunnar Wrobel  <p at rdus.de>

	* Kolab-Conf/Conf.pm.in:

	Require that the configuration load call is provided with the path
	to the global Kolab configuration settings. This way we remove the
	knowledge that the kolabd package exist from the Kolab.pm script.

	In addition the reload() function was moved to the Conf.pm
	module.

2007-01-06 Joergen Fjeld <jhf at linpro.no> 
	   
	* Kolab-Conf/Conf.pm.in (build): 

	Patch applied by Martin Konold:

        - fixes order of domains see also https://intevation.de/roundup/kolab/issue1550

2006-12-04  Gunnar Wrobel  <wrobel at pardus.de>

	* Kolab-Conf/Conf.pm.in (build): Only print "No configuration
	variable corresponding to `$1' exists" in case we are NOT skipping
	the section.

2006-03-20 Marcus Hüwe <suse-tux at gmx.de>
	Patch commited by Richard Bos
	* Kolab-Conf/Conf.pm.in: introduce a new variable phpinit_dir for the
          directory that holds the php.ini file to be used.

2006-01-15 Richard Bos <richard at radoeka.nl>
	* Kolab-Conf/Conf.pm.in: use the new variable sasl_authdconffile
	  instead of @sasl_confdir@/saslauthd.conf

2006-01-07 Richard Bos <richard at radoeka.nl>
	* Kolab-Conf/Conf.pm.in: do not crash when the file to be checked
	  does not exists.
	  Give a hint _which_ config file can not be moved

2005-12-17 Marcus Hüwe <suse-tux at gmx.de>
	Patch committed by Richard Bos
	* bootstrap: added
	* ChangeLog: added
	* Kolab/Kolab.pm,
	  Kolab-Conf/Conf.pm,
	  Kolab-DirServ/DirServ.pm,
	  Kolab-LDAP/LDAP.pm,
	  Kolab-LDAP-Backend-slurpd/slurpd.pm,
	  Kolab-Mailer/Mailer.pm: are working now with the updated
	  kolabd/kolabd/dist_conf file
	* Kolab/Makefile.am,
	  Kolab-Mailer/Makefile.am,
	  Kolab-Conf/Makefile.am,
	  Kolab-LDAP/Makefile.am,
	  Kolab-Util/Makefile.am,
	  Kolab-Cyrus/Makefile.am,
	  Kolab-LDAP-Backend/Makefile.am,
	  Kolab-LDAP-Backend-ad/Makefile.am,
	  Kolab-LDAP-Backend-slurpd/Makefile.am,
	  Kolab-DirServ/Makefile.am,
	  Kolab-LDAP-Backend-dirservd/Makefile.am,
	  Makefile.am: are removed
	* Kolab/Makefile.PL,
	  Kolab-Mailer/Makefile.PL,
	  Kolab-Conf/Makefile.PL,
	  Kolab-LDAP/Makefile.PL,
	  Kolab-Util/Makefile.PL,
	  Kolab-Cyrus/Makefile.PL,
	  Kolab-LDAP-Backend/Makefile.PL,
	  Kolab-LDAP-Backend-ad/Makefile.PL,
	  Kolab-LDAP-Backend-slurpd/Makefile.PL,
	  Kolab-DirServ/Makefile.PL,
	  Kolab-LDAP-Backend-dirservd/Makefile.PL: are removed
	

Index: DEVELOPMENT
===================================================================
RCS file: /kolabrepository/server/kolabconf/DEVELOPMENT,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- DEVELOPMENT	15 Aug 2007 16:41:00 -0000	1.4
+++ DEVELOPMENT	17 Oct 2007 07:12:15 -0000	1.5
@@ -1,8 +1,9 @@
 Development notes
 =================
 
-The kolabconf package is a standard perl package meant to be handled
-with the Makefile.PL script.
+The kolabconf package is a standard perl package and a Kolab Server
+core component. It ismeant to be handled with the Makefile.PL script.
+You will receive a standard "Makefile" by running "perl Makefile.PL".
 
 The Kolab Server packages were usually not released as source
 packages. This should be changed with this new package layout. The
@@ -14,49 +15,61 @@
 Version numbering
 =================
 
-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.
+The package version will be set in
 
-Released source packages will look like this:
+  Makefile.PL
 
- kolabconf-2.1.0.tar.gz
+e.g.
 
-Released source RPMs will look like this:
+my $KOLAB_BASE_VERSION = "2.2.beta1";
+my $KOLAB_CVS = 1;
 
- kolabconf-2.1.0-20070819.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.PL
+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 set
+  my $KOLAB_BASE_VERSION = "2.2.0";
+  my $KOLAB_CVS = 0;
 
-my $KOLAB_CVS = 1;
+After updating $KOLAB_BASE_VERSION and $KOLAB_CVS you can commit these
+changes and tag the release.
 
-in Makefile.PL.
+Now you can create source tarballs and RPMs which will look like:
 
-The version number will then receive the suffix ".cvs" and the current
-date will be appended. 
+  kolabconf-2.2.0.tar.gz
+  kolabconf-2.2.0-20070819.src.rpm
 
-Source packages will then look like this:
+Don't forget to change $KOLAB_CVS back to 1 again and commit, so later
+CVS snapshots will be named correctly.
 
- kolabconf-2.1.0.cvs-20070810.tar.gz
+Snapshots
+---------
 
-Source RPMs will be named similar:
+Make sure lib/Kolab.pm contains the following line:
 
- kolabconf-2.1.0.cvs-20070810.src.rpm
+  my $KOLAB_CVS = 1;
 
-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:
+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:
+
+  kolabconf-2.2.0+cvs20070810.tar.gz
+  kolabconf-2.2.0+cvs-20070810.src.rpm
 
-my $KOLAB_CVS = 0;
 
 Change log
 ==========
 
-The change log for the package is provided in "Changes". Please keep
+The change log for the package is provided in "ChangeLog". Please keep
 this file up-to-date if you change the source code of this package.
 
 Contributors

Index: MANIFEST
===================================================================
RCS file: /kolabrepository/server/kolabconf/MANIFEST,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- MANIFEST	1 Aug 2007 12:34:31 -0000	1.2
+++ MANIFEST	17 Oct 2007 07:12:15 -0000	1.3
@@ -1,8 +1,8 @@
 AUTHORS
 bin/kolabconf.in
-Changes
+ChangeLog
 INSTALL
 lib/Kolab/Conf.pm
 Makefile.PL
 MANIFEST
-README
\ No newline at end of file
+README

Index: Makefile.PL
===================================================================
RCS file: /kolabrepository/server/kolabconf/Makefile.PL,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -d -r1.10 -r1.11
--- Makefile.PL	4 Sep 2007 10:23:15 -0000	1.10
+++ Makefile.PL	17 Oct 2007 07:12:15 -0000	1.11
@@ -9,7 +9,7 @@
 my $KOLAB_VERSION;
 
 # The Kolab version number for the perl-kolab package
-my $KOLAB_BASE_VERSION = "2.1.0";
+my $KOLAB_BASE_VERSION = "2.2.beta1";
 
 # Are current releases cvs based or is this a real release?
 my $KOLAB_CVS = 1;
@@ -17,8 +17,8 @@
 my $KOLAB_RELEASE = sprintf "%0004d%02d%02d", ((gmtime)[5] + 1900), ((gmtime)[4] + 1), (gmtime)[3];
 
 if ($KOLAB_CVS) {
-    $KOLAB_VERSION = $KOLAB_BASE_VERSION . ".cvs";
-    $VERSION = $KOLAB_VERSION . "-" . $KOLAB_RELEASE;
+    $KOLAB_VERSION = $KOLAB_BASE_VERSION . "+cvs";
+    $VERSION = $KOLAB_VERSION . $KOLAB_RELEASE;
 } else {
     $KOLAB_VERSION = $KOLAB_BASE_VERSION;
     $VERSION = $KOLAB_VERSION;

--- Changes DELETED ---