@@ -1,3 +1,10 @@

+roundcubemail (1:1.1~dev20140811-0~kolab4) unstable; urgency=low

+

+  * don't die on postinst errors

+  * renamed apache config from sitename to sitename.conf

+

+ -- Daniel Hoffend <dh@dotlan.net> Mon, 15 Sep 2014 15:15:39 +0100

+

 roundcubemail (1:1.1~dev20140811-0~kolab3) unstable; urgency=low

   * added database update for debian

​

@@ -63,7 +63,7 @@

    # Install apache2 configuration

    mkdir -p $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available

-   install -pm 644 $(CURDIR)/debian/conf/roundcubemail.conf $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available/roundcubemail

+   install -pm 644 $(CURDIR)/debian/conf/roundcubemail.conf $(CURDIR)/debian/roundcubemail/etc/apache2/sites-available/roundcubemail.conf

 override_dh_compress:

    dh_compress -Xsql   

​

@@ -29,8 +29,8 @@

 update_database() {

     /usr/share/roundcubemail/bin/updatedb.sh \

         --dir /usr/share/doc/roundcubemail/SQL/ \

-        --package roundcube || : \

-        >/dev/null 2>&1

+        --package roundcube \

+        >/dev/null 2>&1 || :

 }

@@ -39,8 +39,8 @@

     configure)

         fixperms

         update_database

-        if [ -e "/etc/apache2/sites-available/roundcubemail" -a ! -e "/etc/apache2/sites-enabled/roundcubemail" ]; then

-            a2ensite roundcubemail

+        if [ -e "/etc/apache2/sites-available/roundcubemail.conf" -a ! -e "/etc/apache2/sites-enabled/roundcubemail.conf" ]; then

+            a2ensite roundcubemail.conf

             reload_apache reload

         fi

     ;;

​

@@ -0,0 +1,30 @@

+#!/bin/sh

+

+set -e

+

+reload_apache()

+{

+    if apache2ctl configtest 2>/dev/null; then

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

+    else

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

+    fi

+}

+

+

+case "$1" in

+    upgrade|install)

+        # rename old apache/http sites rom sitename to sitename.conf

+        if [ -e /etc/apache2/sites-available/roundcubemail -a ! -e /etc/apache2/sites-available/roundcubemail.conf ]; then

+            if [ -h /etc/apache2/sites-enabled/roundcubemail ]; then

+                a2dissite roundcubemail

+            fi

+            mv /etc/apache2/sites-available/roundcubemail /etc/apache2/sites-available/roundcubemail.conf

+            a2ensite roundcubemail.conf

+            reload_apache

+        fi

+    ;;

+esac

+

+exit 0

+

​

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

 Source: roundcubemail

 Binary: roundcubemail

 Architecture: all

-Version: 1:1.1~dev20140404-0~kolab3

+Version: 1:1.1~dev20140404-0~kolab4

 Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers@lists.alioth.debian.org>

 Uploaders: Vincent Bernat <bernat@debian.org>, Romain Beauxis <toots@rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen@kolabsys.com>, Paul Klos <kolab@klos2day.nl>

 Homepage: http://www.roundcube.net/

​