@@ -1,3 +1,9 @@

+kolab-syncroton (2.3.1-0~kolab3) unstable; urgency=low

+

+  * Revert workaround for #2050

+ 

+ -- Christoph Wickert <wickert@kolabsys.com>  Thu, 12 Feb 2015 12:22:47 +0100

+

 kolab-syncroton (2.3.1-0~kolab2) unstable; urgency=low

   * Do a full apache restart to work around #2050

​

@@ -17,9 +17,7 @@

 reload_apache()

 {

     if apache2ctl configtest 2>/dev/null; then

-        # Workaround for #2050

-        # invoke-rc.d apache2 $1 || true

-        /etc/init.d/apache2 stop && sleep 3 && /etc/init.d/apache2 start || true

+        invoke-rc.d apache2 $1 || true

     else

         echo "Your apache2 configuration is broken, so we're not restarting it for you."

     fi

​

@@ -5,9 +5,7 @@

 reload_apache()

 {

     if apache2ctl configtest 2>/dev/null; then

-        # Workaround for #2050

-        # invoke-rc.d apache2 $1 || true

-        /etc/init.d/apache2 stop && sleep 3 && /etc/init.d/apache2 start || true

+        invoke-rc.d apache2 $1 || true

     else

         echo "Your apache2 configuration is broken, so we're not restarting it for you."

     fi

​

@@ -8,9 +8,7 @@

 reload_apache()

 {

     if apache2ctl configtest 2>/dev/null; then

-        # Workaround for #2050

-        # invoke-rc.d apache2 $1 || true

-        /etc/init.d/apache2 stop && sleep 3 && /etc/init.d/apache2 start || true

+        invoke-rc.d apache2 $1 || true

     else

         echo "Your apache2 configuration is broken, so we're not restarting it for you."

     fi

​

@@ -2,7 +2,7 @@

 Source: kolab-syncroton

 Binary: kolab-syncroton

 Architecture: all

-Version: 2.3.1-0~kolab2

+Version: 2.3.1-0~kolab3

 Maintainer: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>

 Uploaders: Paul Klos <kolab@klos2day.nl>

 Homepage: http://www.kolab.org/

​