Package: release.debian.org
Severity: normal
User: release.debian....@packages.debian.org
Usertags: unblock

-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA256

Please unblock package roundcube

Closes: #680917, #656886, #688634, #699604.
The #688634 is the most important to close here.

unblock roundcube/0.7.2-7

- -- System Information:
Debian Release: wheezy/sid
  APT prefers raring-updates
  APT policy: (500, 'raring-updates'), (500, 'raring-security'), (500, 
'raring'), (100, 'raring-backports')
Architecture: amd64 (x86_64)
Foreign Architectures: i386

Kernel: Linux 3.8.0-13-generic (SMP w/4 CPU cores)
Locale: LANG=en_GB.UTF-8, LC_CTYPE=en_GB.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash

-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.12 (GNU/Linux)

iQIcBAEBCAAGBQJRSk7lAAoJEIh7YGGLPBauMFwP/AvwrVRXkhuiMTX9g2TVsooo
ZMWjI+mipShUzpoFndukegwojCa4tFktQ9/NI/gZJZEN5TEmya8uUrzs9IiUrtrh
jFhgPBZYcudtHzcbVGE6q7DnYG/+iHPbvretOZ+V6s/lLXLMYFtPHN1a/mj1p177
iaNtLCgPFugYdXiLwzcvpptJv2O+4lF20ADE+ElVmn9bpmC3JXDuUF+Lrkfvc1Cs
bZhinbbUW9Y9bJkeKzB+2OWGCFEmIj7Sb3lFKczdlouQfCzh0ZOuCyXSsPee9K/s
vGjKQ+ILnu44CX10GNg7Goe7TW+UyxgSEkogCcsRpzTInIpza9OCjOgQjgxYBpfw
VEdEQRn5qSNCDfeC5IrTtlW7n8kOHHvyf+a5W/Ygl5p0g49rIEFnWzBwXy8anksL
Jr0VxnD0nMIqELIZRIIIhivBRSwAcgJi2dvwcBnmqVrgEewoUZBpe4nNWSsCxecL
PH4w3OzpKeT0N550PHm4OeZQoEtURiTpHSlmxqYmFpWjSd/1Fg8VMBx0A37ldQid
DHYf7VqUWBlIZHAeUQrIo0nUXmFb9YBS8IrrhORpFLde6JMIdz5exvNkypm4tY07
RHCJ1OtWabRW5LiquGu0EiGKQW8c1a/Sn31VZ7NsQsL6dp1OMQE0//9fGSQ0WBQR
HOJJcqsSnHT1xebD+2qn
=EZXZ
-----END PGP SIGNATURE-----
diff -Nru roundcube-0.7.2/debian/changelog roundcube-0.7.2/debian/changelog
--- roundcube-0.7.2/debian/changelog	2012-09-29 10:39:58.000000000 +0100
+++ roundcube-0.7.2/debian/changelog	2013-03-16 16:26:29.000000000 +0000
@@ -1,3 +1,20 @@
+roundcube (0.7.2-7) unstable; urgency=low
+
+  * Fix dependencies to postgresql and postgresql-client. Closes: #699604.
+  * Drop roundcube-sqlite transition package since we don't provide an
+    automatic upgrade path. The user will have to remove the package by
+    herself. Move the related NEWS entry from roundcube-sqlite to
+    roundcube-core and explain how to continue upgrade. Closes: #688634.
+
+ -- Vincent Bernat <ber...@debian.org>  Sat, 16 Mar 2013 17:26:20 +0100
+
+roundcube (0.7.2-6) unstable; urgency=low
+
+  * Fix the symlink mess in postinst when upgrading from 0.5 to a more
+    recent version. Closes: #680917, #656886.
+
+ -- Vincent Bernat <ber...@debian.org>  Sat, 10 Nov 2012 13:51:17 +0100
+
 roundcube (0.7.2-5) unstable; urgency=low
 
   * Fix problem with some uuencoded attachments. Patch from MichaƂ
diff -Nru roundcube-0.7.2/debian/control roundcube-0.7.2/debian/control
--- roundcube-0.7.2/debian/control	2012-09-29 10:39:58.000000000 +0100
+++ roundcube-0.7.2/debian/control	2013-03-16 16:26:29.000000000 +0000
@@ -46,13 +46,6 @@
  .
  This package will install a full roundcube application.
 
-Package: roundcube-sqlite
-Architecture: all
-Depends: roundcube-mysql | roundcube-pgsql, ${misc:Depends}
-Section: oldlibs
-Description: transitional dummy package
- This package is a dummy transitional package. It can be safely removed.
-
 Package: roundcube-mysql
 Architecture: all
 Depends: php-mdb2-driver-mysql (>= 1.5.0b2), mysql-client | virtual-mysql-client, ${misc:Depends}
@@ -64,8 +57,8 @@
 
 Package: roundcube-pgsql
 Architecture: all
-Depends: php-mdb2-driver-pgsql (>= 1.5.0b2), postgresql-client-8.1 | postgresql-client, ${misc:Depends}
-Suggests: postgresql-server
+Depends: php-mdb2-driver-pgsql (>= 1.5.0b2), postgresql-client-9.1 | postgresql-client, ${misc:Depends}
+Suggests: postgresql
 Description: metapackage providing PostgreSQL dependencies for RoundCube
  This package provides PostgreSQL dependencies for RoundCube Webmail,
  a skinnable AJAX based webmail solution for IMAP servers. Install
diff -Nru roundcube-0.7.2/debian/roundcube-core.NEWS roundcube-0.7.2/debian/roundcube-core.NEWS
--- roundcube-0.7.2/debian/roundcube-core.NEWS	2012-09-29 10:39:58.000000000 +0100
+++ roundcube-0.7.2/debian/roundcube-core.NEWS	2013-03-16 16:26:29.000000000 +0000
@@ -1,3 +1,22 @@
+roundcube (0.7.2-7) unstable; urgency=low
+
+    Roundcube SQLite support is limited to SQLite 2.x. No support for
+    SQLite 3.x currently exists. Unfortunately, SQLite 2.x is unmaintained
+    for several years and therefore has been dropped from php5
+    package.
+
+    You need to select another database to continue to use
+    Roundcube. Unfortunately, there is currently no migration script
+    available. You have to start from an empty database and migrate
+    data yourself if you want to keep your settings. You can find some
+    directions here:
+     http://wiki.debian.org/Roundcube/DeprecationOfSQLitev2
+
+    Once the migration is done, you can remove roundcube-sqlite
+    package.
+
+ -- Vincent Bernat <ber...@debian.org>  Sat, 02 Mar 2013 22:20:17 +0100
+
 roundcube (0.3.1-2) unstable; urgency=low
 
     Starting from Roundcube 0.3, an incompatibility with Suhosin session
diff -Nru roundcube-0.7.2/debian/roundcube-core.postinst roundcube-0.7.2/debian/roundcube-core.postinst
--- roundcube-0.7.2/debian/roundcube-core.postinst	2012-09-29 10:39:58.000000000 +0100
+++ roundcube-0.7.2/debian/roundcube-core.postinst	2013-03-16 16:26:29.000000000 +0000
@@ -35,6 +35,68 @@
 	fi
 }
 
+fix_symlinks() {
+    # In 0.5.1-1, symlinks have been mangled. Before this version,
+    # /var/lib/roundcube and /usr/share/roundcube were using symlinks
+    # to each other:
+    #  /usr/share/roundcube/config   -> /var/lib/roundcube/config
+    #  /usr/share/roundcube/logs     -> /var/lib/roundcube/logs
+    #  /usr/share/roundcube/plugins  -> /var/lib/roundcube/plugins
+    #  /usr/share/roundcube/skins    -> /var/lib/roundcube/skins
+    #  /usr/share/roundcube/temp     -> /var/lib/roundcube/temp
+    #  /var/lib/roundcube/logs       -> ../../log/roundcube
+    #  /var/lib/roundcube/.htaccess  -> /usr/share/roundcube/.htaccess
+    #  /var/lib/roundcube/bin        -> /usr/share/roundcube/bin
+    #  /var/lib/roundcube/index.php  -> /usr/share/roundcube/bin
+    #  /var/lib/roundcube/program    -> /usr/share/roundcube/bin
+    #  /var/lib/roundcube/robots.txt -> /usr/share/roundcube/bin
+
+    # As of 0.7.2-6, the user is expected to use /var/lib/roundcube
+    # since /usr/share/roundcube does not contain the appropriate
+    # symlinks anymore.
+    #  /var/lib/roundcube/logs       -> ../../log/roundcube
+    #  /var/lib/roundcube/.htaccess  -> /usr/share/roundcube/.htaccess
+    #  /var/lib/roundcube/index.php  -> /usr/share/roundcube/bin
+    #  /var/lib/roundcube/program    -> /usr/share/roundcube/bin
+    #  /var/lib/roundcube/robots.txt -> /usr/share/roundcube/bin
+    #  /var/lib/roundcube/plugins/*  -> /usr/share/roundcube/plugins/*
+    #  /var/lib/roundcube/skins/*    -> /usr/share/roundcube/skins/*
+
+    # Because dpkg will not overwrite a symlink but follow them, an
+    # upgrade gives a confuse situation. We have the following
+    # symlinks in /usr/share/roundcube:
+    #  /usr/share/roundcube/plugins  -> /var/lib/roundcube/plugins
+    #  /usr/share/roundcube/skins    -> /var/lib/roundcube/skins
+    # And the following are not symlinks as they should be:
+    #  /var/lib/roundcube/plugins/*  -> /usr/share/roundcube/plugins/*
+    #  /var/lib/roundcube/skins/*    -> /usr/share/roundcube/skins/*
+
+    # We detect and fix that.
+    for dir in plugins skins; do
+        [ -L /usr/share/roundcube/${dir} ] || continue
+        echo "Fixing symbolic link /usr/share/roundcube/${dir}"
+        [ ! -L /var/lib/roundcube/${dir} ] || {
+            echo "/var/lib/roundcube/${dir} is not expected to be a symbolic link. Abort."
+            exit 1
+        }
+        # Remove the symbolic link and make a real directory.
+        rm /usr/share/roundcube/${dir}
+        mkdir /usr/share/roundcube/${dir}
+
+        # We move each subdirectory regardless we own them or not. The
+        # ideal solution would be to leave files installed by the user
+        # in /var/lib/roundcube/${dir} but since other packages (like
+        # roundcube-plugins and roundcube-plugins-extra) may have
+        # installed files, it is something difficult to track. We do
+        # not want each package to fix this mess. What's important is
+        # that user installation will keep working as expected,
+        # despite the move.
+        for d in /var/lib/roundcube/${dir}/*; do
+            mv ${d} /usr/share/roundcube/${dir}
+            ln -s /usr/share/roundcube/${dir}/${d##*/} /var/lib/roundcube/${dir}/${d##*/}
+        done
+    done
+}
 
 case "$1" in
     configure)
@@ -72,6 +134,11 @@
 	    fi
 	fi
 
+        # Fix bug 680917
+	if [ -n "$2" ] && dpkg --compare-versions "$2" lt 0.7.2-6; then
+            fix_symlinks
+        fi
+
  	CONFFILE=/etc/roundcube/main.inc.php
  	touch $CONFFILE.ucftmp
  	chmod 640 $CONFFILE.ucftmp
diff -Nru roundcube-0.7.2/debian/roundcube-sqlite.NEWS roundcube-0.7.2/debian/roundcube-sqlite.NEWS
--- roundcube-0.7.2/debian/roundcube-sqlite.NEWS	2012-09-29 10:39:58.000000000 +0100
+++ roundcube-0.7.2/debian/roundcube-sqlite.NEWS	1970-01-01 01:00:00.000000000 +0100
@@ -1,13 +0,0 @@
-roundcube (0.7.2-3) unstable; urgency=low
-
-    Roundcube SQLite support is limited to SQLite 2.x. No support for
-    SQLite 3.x currently exists. Unfortunately, SQLite 2.x is unmaintained
-    for several years and therefore has been dropped from php5
-    package.
-
-    You need to select another database to continue to use
-    Roundcube. Unfortunately, there is currently no migration script
-    available. You have to start from an empty database and migrate
-    data yourself if you want to keep your settings.
-
- -- Vincent Bernat <ber...@debian.org>  Sat, 23 Jun 2012 19:52:33 +0200

Reply via email to