[pkg-kolab] r1064 - in kolab-webadmin: . branches branches/2.2.1 branches/2.2.1/debian
mparent-guest at alioth.debian.org
mparent-guest at alioth.debian.org
Tue Dec 16 23:00:19 UTC 2008
Author: mparent-guest
Date: 2008-12-16 23:00:19 +0000 (Tue, 16 Dec 2008)
New Revision: 1064
Added:
kolab-webadmin/branches/
kolab-webadmin/branches/2.2.1/
kolab-webadmin/branches/2.2.1/debian/changelog
kolab-webadmin/branches/2.2.1/debian/watch
Removed:
kolab-webadmin/branches/2.2.1/debian/changelog
kolab-webadmin/branches/2.2.1/debian/watch
Modified:
kolab-webadmin/branches/2.2.1/debian/svn-deblayout
Log:
Create 2.2.1 branch
Copied: kolab-webadmin/branches/2.2.1 (from rev 1060, kolab-webadmin/trunk)
Property changes on: kolab-webadmin/branches/2.2.1
___________________________________________________________________
Name: svn:mergeinfo
+
Deleted: kolab-webadmin/branches/2.2.1/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog 2008-12-16 22:29:49 UTC (rev 1060)
+++ kolab-webadmin/branches/2.2.1/debian/changelog 2008-12-16 23:00:19 UTC (rev 1064)
@@ -1,136 +0,0 @@
-kolab-webadmin (2.2.0-20080709-1) unstable; urgency=low
-
- * New upstream version: 2.2.0
- * updated common/dist_conf.dpatch
- - smarty has now the good path
- - kolab-webadmin url is now /admin
- - added spamassassin_confdir (not used) as requested by Sascha Wilde on
- http://kolab.org/pipermail/kolab-devel/2008-June/009079.html
- - removed: integrated upstream
- * updated 10-fix-requires.dpatch
- * 60-no_extra_doc partially dropped
- * Bump Standards-Version to 3.8.0 (updated Vcs-Browser and Vcs-Svn fields)
- * switch from dpatch to quilt
-
- -- Mathieu Parent <math.parent at gmail.com> Sun, 02 Nov 2008 13:06:31 +0200
-
-kolab-webadmin (2.1.0-20070510-3) unstable; urgency=low
-
- * Internal Subversion repository reorganization to keep common patches in
- common location, in particular patches/common/dist_conf.dpatch
- * Moved /usr/share/kolab-webadmin/ to /usr/share/kolab/ for better
- consistency with upstream
- * Updated standards version
- * Added Homepage control field
- * Changed control fields XS-Vcs-* to Vcs-*
- * Updated apache.conf; revised include paths (closes: #437862)
- * Fixed watch file
-
- -- Peter Eisentraut <petere at debian.org> Sat, 26 Apr 2008 12:18:58 +0200
-
-kolab-webadmin (2.1.0-20070510-2) unstable; urgency=low
-
- * Added php5 as dependency alternative (closes: #424837)
- * Don't ignore errors from make distclean, as per lintian check
-
- -- Peter Eisentraut <petere at debian.org> Tue, 17 Jul 2007 10:46:34 +0200
-
-kolab-webadmin (2.1.0-20070510-1) unstable; urgency=low
-
- * New upstream release
- - Formerly missing .tpl files are now included
- - Updated session_vars.php template from kolabd-2.1.0-20070510
- * Updated copyright file
- * Cleaned up rules
- * Fixed watch file
-
- -- Peter Eisentraut <petere at debian.org> Mon, 18 Jun 2007 21:47:38 +0200
-
-kolab-webadmin (0.4.0-20060810-5) unstable; urgency=low
-
- * Changed 40-kolab_prefix.dpatch to patch config.php.in instead of
- config.php (closes: #424460)
- * Added XS-X-Vcs-Browser field
-
- -- Peter Eisentraut <petere at debian.org> Tue, 29 May 2007 14:18:23 +0200
-
-kolab-webadmin (0.4.0-20060810-4) unstable; urgency=medium
-
- * Install the apache.conf file into the kolab directory to make sure
- we can enable it by default if the package is installed
- * Adjust the description in README.Debian to the new path of the
- apache.conf file for kolab-webadmin
- * Change my maintainer address
-
- -- Steffen Joeris <white at debian.org> Wed, 3 Jan 2007 13:02:25 +0100
-
-kolab-webadmin (0.4.0-20060810-3) unstable; urgency=medium
-
- * Added DirectoryIndex index.php
- * Turned off PHP's E_WARNING
- * Small clarification in default session_vars.php
-
- -- Peter Eisentraut <petere at debian.org> Sat, 4 Nov 2006 11:39:44 +0100
-
-kolab-webadmin (0.4.0-20060810-2) unstable; urgency=medium
-
- * Restricted permissions on configuration files containing passwords
- * Added XS-X-Vcs-Svn field
- * Added Apache configuration file (closes: #376661)
- * Put PHP include path into Apache configuration (closes: #392354);
- obsoletes large parts of 10-fix-require.dpatch
- * Put web templates under /var/cache, per FHS
- * Remove templates directory on package removal
-
- -- Peter Eisentraut <petere at debian.org> Fri, 27 Oct 2006 15:00:27 +0200
-
-kolab-webadmin (0.4.0-20060810-1) unstable; urgency=low
-
- * New upstream release
- * Improved package description
- * Updated standards version
- * Fixed Build-Depends vs. Build-Depends-Indep
- * Removed unused autotools-dev dealings
- * Added watch file
- * Changed priority to extra for policy conformance
-
- -- Peter Eisentraut <petere at debian.org> Fri, 15 Sep 2006 15:26:36 +0200
-
-kolab-webadmin (0.4.0-5) unstable; urgency=low
-
- * Look for res_pub.pem in correct directory (closes: #361000)
- * Use /usr/share/dpatch/dpatch-run in dpatches
-
- -- Peter Eisentraut <petere at debian.org> Fri, 7 Apr 2006 18:51:22 +0200
-
-kolab-webadmin (0.4.0-4) unstable; urgency=low
-
- [ Steffen Joeris ]
-
- * added php-net-sieve to depends to make sure all features are
- available (Closes: #357514)
-
- -- Steffen Joeris <steffen.joeris at skolelinux.de> Fri, 17 Mar 2006 23:29:20 +0100
-
-kolab-webadmin (0.4.0-3) experimental; urgency=low
-
- * add missing .tpl files
- * add 30-admin_distributionlist_list.patch
-
- -- Noèl Köthe <noel at debian.org> Thu, 16 Mar 2006 13:44:47 +0100
-
-kolab-webadmin (0.4.0-2) experimental; urgency=low
-
- * correct debian/copyright information
- (missing php/admin/include/Sieve.php copyright)
-
- -- Steffen Joeris <steffen.joeris at skolelinux.de> Mon, 20 Feb 2006 10:16:41 +0100
-
-kolab-webadmin (0.4.0-1) experimental; urgency=low
-
- * Initial release
- part of the Kolab Groupware. See ITP #180634 or Kolab on alioth
- https://alioth.debian.org/projects/pkg-kolab/
-
- -- Steffen Joeris <steffen.joeris at skolelinux.de> Mon, 13 Feb 2006 15:36:36 +0100
-
Copied: kolab-webadmin/branches/2.2.1/debian/changelog (from rev 1063, kolab-webadmin/trunk/debian/changelog)
===================================================================
--- kolab-webadmin/branches/2.2.1/debian/changelog (rev 0)
+++ kolab-webadmin/branches/2.2.1/debian/changelog 2008-12-16 23:00:19 UTC (rev 1064)
@@ -0,0 +1,142 @@
+kolab-webadmin (2.2.0-20080709-2) UNRELEASED; urgency=low
+
+ * updated debian/watch
+
+ -- Mathieu Parent <math.parent at gmail.com> Tue, 16 Dec 2008 23:54:32 +0100
+
+kolab-webadmin (2.2.0-20080709-1) unstable; urgency=low
+
+ * New upstream version: 2.2.0
+ * updated common/dist_conf.dpatch
+ - smarty has now the good path
+ - kolab-webadmin url is now /admin
+ - added spamassassin_confdir (not used) as requested by Sascha Wilde on
+ http://kolab.org/pipermail/kolab-devel/2008-June/009079.html
+ - removed: integrated upstream
+ * updated 10-fix-requires.dpatch
+ * 60-no_extra_doc partially dropped
+ * Bump Standards-Version to 3.8.0 (updated Vcs-Browser and Vcs-Svn fields)
+ * switch from dpatch to quilt
+
+ -- Mathieu Parent <math.parent at gmail.com> Sun, 02 Nov 2008 13:06:31 +0200
+
+kolab-webadmin (2.1.0-20070510-3) unstable; urgency=low
+
+ * Internal Subversion repository reorganization to keep common patches in
+ common location, in particular patches/common/dist_conf.dpatch
+ * Moved /usr/share/kolab-webadmin/ to /usr/share/kolab/ for better
+ consistency with upstream
+ * Updated standards version
+ * Added Homepage control field
+ * Changed control fields XS-Vcs-* to Vcs-*
+ * Updated apache.conf; revised include paths (closes: #437862)
+ * Fixed watch file
+
+ -- Peter Eisentraut <petere at debian.org> Sat, 26 Apr 2008 12:18:58 +0200
+
+kolab-webadmin (2.1.0-20070510-2) unstable; urgency=low
+
+ * Added php5 as dependency alternative (closes: #424837)
+ * Don't ignore errors from make distclean, as per lintian check
+
+ -- Peter Eisentraut <petere at debian.org> Tue, 17 Jul 2007 10:46:34 +0200
+
+kolab-webadmin (2.1.0-20070510-1) unstable; urgency=low
+
+ * New upstream release
+ - Formerly missing .tpl files are now included
+ - Updated session_vars.php template from kolabd-2.1.0-20070510
+ * Updated copyright file
+ * Cleaned up rules
+ * Fixed watch file
+
+ -- Peter Eisentraut <petere at debian.org> Mon, 18 Jun 2007 21:47:38 +0200
+
+kolab-webadmin (0.4.0-20060810-5) unstable; urgency=low
+
+ * Changed 40-kolab_prefix.dpatch to patch config.php.in instead of
+ config.php (closes: #424460)
+ * Added XS-X-Vcs-Browser field
+
+ -- Peter Eisentraut <petere at debian.org> Tue, 29 May 2007 14:18:23 +0200
+
+kolab-webadmin (0.4.0-20060810-4) unstable; urgency=medium
+
+ * Install the apache.conf file into the kolab directory to make sure
+ we can enable it by default if the package is installed
+ * Adjust the description in README.Debian to the new path of the
+ apache.conf file for kolab-webadmin
+ * Change my maintainer address
+
+ -- Steffen Joeris <white at debian.org> Wed, 3 Jan 2007 13:02:25 +0100
+
+kolab-webadmin (0.4.0-20060810-3) unstable; urgency=medium
+
+ * Added DirectoryIndex index.php
+ * Turned off PHP's E_WARNING
+ * Small clarification in default session_vars.php
+
+ -- Peter Eisentraut <petere at debian.org> Sat, 4 Nov 2006 11:39:44 +0100
+
+kolab-webadmin (0.4.0-20060810-2) unstable; urgency=medium
+
+ * Restricted permissions on configuration files containing passwords
+ * Added XS-X-Vcs-Svn field
+ * Added Apache configuration file (closes: #376661)
+ * Put PHP include path into Apache configuration (closes: #392354);
+ obsoletes large parts of 10-fix-require.dpatch
+ * Put web templates under /var/cache, per FHS
+ * Remove templates directory on package removal
+
+ -- Peter Eisentraut <petere at debian.org> Fri, 27 Oct 2006 15:00:27 +0200
+
+kolab-webadmin (0.4.0-20060810-1) unstable; urgency=low
+
+ * New upstream release
+ * Improved package description
+ * Updated standards version
+ * Fixed Build-Depends vs. Build-Depends-Indep
+ * Removed unused autotools-dev dealings
+ * Added watch file
+ * Changed priority to extra for policy conformance
+
+ -- Peter Eisentraut <petere at debian.org> Fri, 15 Sep 2006 15:26:36 +0200
+
+kolab-webadmin (0.4.0-5) unstable; urgency=low
+
+ * Look for res_pub.pem in correct directory (closes: #361000)
+ * Use /usr/share/dpatch/dpatch-run in dpatches
+
+ -- Peter Eisentraut <petere at debian.org> Fri, 7 Apr 2006 18:51:22 +0200
+
+kolab-webadmin (0.4.0-4) unstable; urgency=low
+
+ [ Steffen Joeris ]
+
+ * added php-net-sieve to depends to make sure all features are
+ available (Closes: #357514)
+
+ -- Steffen Joeris <steffen.joeris at skolelinux.de> Fri, 17 Mar 2006 23:29:20 +0100
+
+kolab-webadmin (0.4.0-3) experimental; urgency=low
+
+ * add missing .tpl files
+ * add 30-admin_distributionlist_list.patch
+
+ -- Noèl Köthe <noel at debian.org> Thu, 16 Mar 2006 13:44:47 +0100
+
+kolab-webadmin (0.4.0-2) experimental; urgency=low
+
+ * correct debian/copyright information
+ (missing php/admin/include/Sieve.php copyright)
+
+ -- Steffen Joeris <steffen.joeris at skolelinux.de> Mon, 20 Feb 2006 10:16:41 +0100
+
+kolab-webadmin (0.4.0-1) experimental; urgency=low
+
+ * Initial release
+ part of the Kolab Groupware. See ITP #180634 or Kolab on alioth
+ https://alioth.debian.org/projects/pkg-kolab/
+
+ -- Steffen Joeris <steffen.joeris at skolelinux.de> Mon, 13 Feb 2006 15:36:36 +0100
+
Modified: kolab-webadmin/branches/2.2.1/debian/svn-deblayout
===================================================================
--- kolab-webadmin/trunk/debian/svn-deblayout 2008-12-16 22:29:49 UTC (rev 1060)
+++ kolab-webadmin/branches/2.2.1/debian/svn-deblayout 2008-12-16 23:00:19 UTC (rev 1064)
@@ -1,2 +1,2 @@
-origDir=../upstream
-buildArea=../build-area
+origDir=../../upstream
+buildArea=../../build-area
Deleted: kolab-webadmin/branches/2.2.1/debian/watch
===================================================================
--- kolab-webadmin/trunk/debian/watch 2008-12-16 22:29:49 UTC (rev 1060)
+++ kolab-webadmin/branches/2.2.1/debian/watch 2008-12-16 23:00:19 UTC (rev 1064)
@@ -1,6 +0,0 @@
-version=3
-opts=dversionmangle=s/~rc/.rc/ \
-# original URL for stable releases:
-ftp://ftp.belnet.be/packages/kolab/server/release/kolab-server-(?:[\d.]+)/sources/kolab-webadmin-([\d.-]+).src.rpm debian debian/uupdate-wrapper
-# URL for development releases:
-#ftp://ftp.belnet.be/packages/kolab/server/development-2.2/current/sources/kolab-webadmin-([\d\w.-]+).src.rpm debian debian/uupdate-wrapper
Copied: kolab-webadmin/branches/2.2.1/debian/watch (from rev 1063, kolab-webadmin/trunk/debian/watch)
===================================================================
--- kolab-webadmin/branches/2.2.1/debian/watch (rev 0)
+++ kolab-webadmin/branches/2.2.1/debian/watch 2008-12-16 23:00:19 UTC (rev 1064)
@@ -0,0 +1,8 @@
+version=3
+opts=dversionmangle=s/~rc/.rc/ \
+# original URL for stable releases:
+#ftp://ftp.belnet.be/packages/kolab/server/release/kolab-server-(?:[\d.]+)/sources/kolab-webadmin-([\d.-]+).src.rpm debian debian/uupdate-wrapper
+# URL for development releases:
+#ftp://ftp.belnet.be/packages/kolab/server/development-2.2/current/sources/kolab-webadmin-([\d\w.-]+).src.rpm debian debian/uupdate-wrapper
+# URL for beta releases:
+ftp://ftp.belnet.be/packages/kolab/server/beta/kolab-server-([\d\w.-]*)/sources/kolab-webadmin-([\d\w.-]*).src.rpm debian debian/uupdate-wrapper
More information about the pkg-kolab-devel
mailing list