Branch '2.3-stable' - 3 commits - release-notes.txt z-push/z-push.spec

[Christoph Wickert]

 release-notes.txt  |   35 +++++++++++++++++++++--------------
 z-push/z-push.spec |    9 ++++++---
 2 files changed, 27 insertions(+), 17 deletions(-)

New commits:
commit 16bcc920c61f36f92d92771d7bc8f1e1770891ad
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Thu Sep 15 21:18:06 2011 +0200

    release-notes.txt: Start new section for 2.3.4 changes

diff --git a/release-notes.txt b/release-notes.txt
index c2b176d..488b5ff 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -6,6 +6,13 @@ For upgrading and installation instructions, please refer to
 the 1st.README file in the package directory.
 
 
+ Changes between 2.3.3 and 2.3.?:
+
+    - z-push-1.5.5-1
+
+	Update to 1.5.5
+
+
  Changes between 2.3.2 and 2.3.3:
 
     - apache-2.2.20-20110912


commit 069ac7854f1b955cfb47dc371b3437b60c44d8b2
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Thu Sep 15 21:16:11 2011 +0200

    release-notes.txt: Fix sorting

diff --git a/release-notes.txt b/release-notes.txt
index b7c8c8c..c2b176d 100644
--- a/release-notes.txt
+++ b/release-notes.txt
@@ -36,20 +36,6 @@ the 1st.README file in the package directory.
 
 	kolab/issue4690 (Umlaut problems in system folders)
 
-    - kolab-webadmin-2.3.3-20110913
-
-	kolab/issue4777 (Bad version welcome-domain-maintainer.tpl)
-	kolab/issue4779 (Domain maintainers welcome template has errors)
-
-    - kronolith-2.3.5-20110912
-
-	Fix the F/B list of the organizer in the event attendee view.
-
-    - turba-2.3.5-20110912
-
-	Display the organizationalUnit (ou) as "department" within the
-	global addressbook.
-
     - Kolab_FreeBusy-0.5.2-20110826
 
 	kolab/issue4765 (Freebusy trigger fails if using localpart of user)
@@ -78,6 +64,15 @@ the 1st.README file in the package directory.
 	bugzilla.kolabsys.com #388 (Large Kolab objects may lead to an
 	exceeded PHP memory limit)
 
+    - kolab-webadmin-2.3.3-20110913
+
+	kolab/issue4777 (Bad version welcome-domain-maintainer.tpl)
+	kolab/issue4779 (Domain maintainers welcome template has errors)
+
+    - kronolith-2.3.5-20110912
+
+	Fix the F/B list of the organizer in the event attendee view.
+
     - openldap-2.4.26-20110823
 
 	Update to 2.4.26
@@ -92,6 +87,11 @@ the 1st.README file in the package directory.
 	Update to 5.3.8 (fixes CVE-2011-1148, CVE-2011-1938, CVE-2011-2202
 	                and CVE-2011-2483)
 
+    - turba-2.3.5-20110912
+
+	Display the organizationalUnit (ou) as "department" within the
+	global addressbook.
+
 
     Packages in the OpenPKG based Kolab server release:
 


commit 4aa56da4b78f8ed61d25514ba6ccb7281b2fb7a8
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Thu Sep 15 21:11:15 2011 +0200

    z-push: Update to 1.5.5

diff --git a/z-push/z-push.spec b/z-push/z-push.spec
index 33f8295..fa9c230 100644
--- a/z-push/z-push.spec
+++ b/z-push/z-push.spec
@@ -1,11 +1,11 @@
 # Variables
 %define         prerelease beta2
-%define         svnrev 685
+%define         svnrev 790
 
 # Package Information
 Name:           z-push
-Version:        1.5.3
-Release:        2
+Version:        1.5.5
+Release:        1
 Summary:        Implementation of the ActiveSync protocol
 # "Web" seems the most reasonable choice from
 # /kolab/bin/openpkg rpm -qa --qf %{group}\\n | sort | uniq
@@ -120,6 +120,9 @@ chown kolab-n:kolab-n %{l_prefix}/var/kolab/www/z-push/state/ ||:
 
 
 %changelog
+* Thu Sep 15 2011 Christoph Wickert <cwickert at fedoraproject.org> - 1.5.5-1
+- Update to 1.5.5
+
 * Thu Jun 30 2011 Christoph Wickert <wickert at kolabsys.com> - 1.5.3-2
 - Fix License tag (issue4754)