Imported Debian patch 0.1~rc1-2

diff --git a/debian/changelog b/debian/changelog
index dfb0edf0022c554bb34988e090da9af25edad8ea..f8877b7ffbf0558ae968a984b38c53fbd591da3d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+roundcube (0.1~rc1-2) unstable; urgency=low
+
+  * Fix dependencies by creating virtual packages for each database
+    backend, thanks to Joey Hess (Closes: #444925).
+
+ -- Vincent Bernat <bernat@luffy.cx>  Tue, 02 Oct 2007 20:09:19 +0200
+
 roundcube (0.1~rc1-1) unstable; urgency=low
 
   * New upstream release

diff --git a/debian/control b/debian/control
index 31c79579e0df34c923fd374fc409546fe6a758f9..b998456d210a6a49769fa725c4687b02a4af2ccc 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,7 @@ Standards-Version: 3.7.2
 
 Package: roundcube
 Architecture: all
-Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5, php5-mcrypt, php5-mysql | php5-pgsql | php5-sqlite, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, mysql-client | virtual-mysql-client | postgresql-client-8.1 | postgresql-client | sqlite, ${misc:Depends}
-Suggests: mysql-server | posgresql-server
+Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, ${misc:Depends}
 Description: skinnable AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
@@ -20,3 +19,32 @@ Description: skinnable AJAX based webmail solution for IMAP servers
  The user interface is fully skinnable using XHTML and CSS 2.
  .
   Homepage: http://www.roundcube.net/
+
+Package: roundcube-mysql
+Architecture: all
+Depends: roundcube, php5-mysql, mysql-client | virtual-mysql-client
+Suggests: mysql-server
+Provides: roundcube-db
+Description: virtual package providing MySQL dependencies for RoundCube
+ This package provides MySQL dependencies for RoundCube Webmail, a
+ skinnable AJAX based webmail solution for IMAP servers. Install this
+ one if you want to use a MySQL database with RoundCube.
+
+Package: roundcube-pgsql
+Architecture: all
+Depends: roundcube, php5-pgsql, postgresql-client-8.1 | postgresql-client 
+Suggests: postgresql-server
+Provides: roundcube-db
+Description: virtual package providing PostgreSQL dependencies for RoundCube
+ This package provides PostgreSQL dependencies for RoundCube Webmail,
+ a skinnable AJAX based webmail solution for IMAP servers. Install
+ this one if you want to use a PostgreSQL database with RoundCube.
+
+Package: roundcube-sqlite
+Architecture: all
+Depends: roundcube, php5-sqlite, sqlite
+Provides: roundcube-db
+Description: virtual package providing sqlite dependencies for RoundCube
+ This package provides sqlite dependencies for RoundCube Webmail, a
+ skinnable AJAX based webmail solution for IMAP servers. Install this
+ one if you want to use a sqlite database with RoundCube.

diff --git a/debian/control.in b/debian/control.in
index 517da34ee48d3066f8c4fedcba2e35bf2f75914a..0ff756a298e5f2b5bb94fa6619be9442e35b6fa6 100644 (file)
--- a/debian/control.in
+++ b/debian/control.in
@@ -9,8 +9,7 @@ Standards-Version: 3.7.2
 
 Package: roundcube
 Architecture: all
-Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5, php5-mcrypt, php5-mysql | php5-pgsql | php5-sqlite, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, mysql-client | virtual-mysql-client | postgresql-client-8.1 | postgresql-client | sqlite, ${misc:Depends}
-Suggests: mysql-server | posgresql-server
+Depends: dbconfig-common, debconf | debconf-2.0, apache2 | httpd, php5, php5-mcrypt, roundcube-db, php-db, php-auth, php-net-smtp, php-net-socket, php-mail-mime, ucf, ${misc:Depends}
 Description: skinnable AJAX based webmail solution for IMAP servers
  RoundCube Webmail is a browser-based multilingual IMAP client with an
  application-like user interface. It provides full functionality
@@ -20,3 +19,32 @@ Description: skinnable AJAX based webmail solution for IMAP servers
  The user interface is fully skinnable using XHTML and CSS 2.
  .
   Homepage: http://www.roundcube.net/
+
+Package: roundcube-mysql
+Architecture: all
+Depends: roundcube, php5-mysql, mysql-client | virtual-mysql-client
+Suggests: mysql-server
+Provides: roundcube-db
+Description: virtual package providing MySQL dependencies for RoundCube
+ This package provides MySQL dependencies for RoundCube Webmail, a
+ skinnable AJAX based webmail solution for IMAP servers. Install this
+ one if you want to use a MySQL database with RoundCube.
+
+Package: roundcube-pgsql
+Architecture: all
+Depends: roundcube, php5-pgsql, postgresql-client-8.1 | postgresql-client 
+Suggests: postgresql-server
+Provides: roundcube-db
+Description: virtual package providing PostgreSQL dependencies for RoundCube
+ This package provides PostgreSQL dependencies for RoundCube Webmail,
+ a skinnable AJAX based webmail solution for IMAP servers. Install
+ this one if you want to use a PostgreSQL database with RoundCube.
+
+Package: roundcube-sqlite
+Architecture: all
+Depends: roundcube, php5-sqlite, sqlite
+Provides: roundcube-db
+Description: virtual package providing sqlite dependencies for RoundCube
+ This package provides sqlite dependencies for RoundCube Webmail, a
+ skinnable AJAX based webmail solution for IMAP servers. Install this
+ one if you want to use a sqlite database with RoundCube.

diff --git a/debian/copyright b/debian/copyright
index 440d03a084d9b75db19e13fe1347c593e31d6e7f..d3ebfd170ea5e1cf0200f28fcc4a1b8d796bd714 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -14,7 +14,6 @@ Version 2 or later, found on Debian systems in the file
 Some files are taken from other projects :
  - googiespell from amix@amix.dk, MIT license
  - lib/html2text.inc from jon@chuggnutt.com, GPL license
- - lib/utf8.class.php from Alexander Minkovsky, public domain
  - lib/{enriched,icl_commons,imap,mime,utf7}.inc from IlohaMail project, GPL license
  - lib/encoding/*.map from Unicode, Inc., with "BSD-lite" license
 

diff --git a/debian/po/ar.po b/debian/po/ar.po
index 8d688068c8aa64df41e9ae41aa72c417a968d376..dd89f76ebcf2e97881e2c1fe5c1fd37c5bdc06a4 100644 (file)
--- a/debian/po/ar.po
+++ b/debian/po/ar.po
@@ -71,8 +71,12 @@ msgstr "هل تريد تشغيل خادم الوب الآن؟"
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "In order to activate the new configuration, the reconfigured web servers "
+#| "have to be restarted."
 msgid ""
-"In order to activate the new configuration, the reconfigured web servers "
+"In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
 "لتنشيط التهيئة الجديدة، يجب إعادة تشغيل خادمات الوب التي تمت إعادة تهيئتها."

diff --git a/debian/po/cs.po b/debian/po/cs.po
index 8f9ecf25d45b0c594573694a324ffb9f1c5c73ed..ccb5b2e0a6e3c01e7a410ff39de0dd95811c1560 100644 (file)
--- a/debian/po/cs.po
+++ b/debian/po/cs.po
@@ -74,8 +74,12 @@ msgstr "Mají se webové servery restartovat nyní?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "In order to activate the new configuration, the reconfigured web servers "
+#| "have to be restarted."
 msgid ""
-"In order to activate the new configuration, the reconfigured web servers "
+"In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
 "Aby se nové nastavení projevilo, musí se příslušné webové servery "

diff --git a/debian/po/de.po b/debian/po/de.po
index 66f7237fb08b7afb2c3eae76793d6be92726df55..0808342c02474d71f7a8883fffda78404c157bec 100644 (file)
--- a/debian/po/de.po
+++ b/debian/po/de.po
@@ -73,8 +73,12 @@ msgstr "Soll der/die Webserver jetzt automatisch neu gestartet werden?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "In order to activate the new configuration, the reconfigured web servers "
+#| "have to be restarted."
 msgid ""
-"In order to activate the new configuration, the reconfigured web servers "
+"In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
 "Um die neue Konfiguration zu aktivieren, müssen die rekonfigurierten "

diff --git a/debian/po/es.po b/debian/po/es.po
index 3e3cfe639642c9535e7ae53bf27e00ac80525c06..7c3c20c4ec7c6d4b4867c6d896ef2986e6f23ed1 100644 (file)
--- a/debian/po/es.po
+++ b/debian/po/es.po
@@ -95,7 +95,7 @@ msgstr ""
 #: ../templates:3001
 #, fuzzy
 msgid ""
-"In order to activate the new configuration, the reconfigured web servers "
+"In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
 "Recuerde que para aplicar los cambios en su(s) servidor(es) web debe "

diff --git a/debian/po/eu.po b/debian/po/eu.po
index 1f437f65d8064ae1047ac6eecfb379485b375f71..042c6df423fe0cc913fc4f8eecfd7a19dc1a1524 100644 (file)
--- a/debian/po/eu.po
+++ b/debian/po/eu.po
@@ -75,8 +75,12 @@ msgstr "Web zerbitzaria(k) orain berrabiarazi behar al da?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "In order to activate the new configuration, the reconfigured web servers "
+#| "have to be restarted."
 msgid ""
-"In order to activate the new configuration, the reconfigured web servers "
+"In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
 "Konfigurazio berria gaitu ahal izateko, birkonfiguratutako web zerbitzariak "

diff --git a/debian/po/fr.po b/debian/po/fr.po
index f29b4c49e7a58fcfee5bc15d016caa3a363c7c3e..60f7d25218d3c6c04480d27c5f2d0444e131e3b3 100644 (file)
--- a/debian/po/fr.po
+++ b/debian/po/fr.po
@@ -74,8 +74,12 @@ msgstr "Faut-il redémarrer le(s) serveur(s) web maintenant ?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "In order to activate the new configuration, the reconfigured web servers "
+#| "have to be restarted."
 msgid ""
-"In order to activate the new configuration, the reconfigured web servers "
+"In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
 "Afin d'activer la nouvelle configuration, le(s) serveur(s) web reconfigurés "

diff --git a/debian/po/gl.po b/debian/po/gl.po
index ceb95ec11d869e2aad5ccf207a71c1c55431e62d..a5b537603cbff8a0657616309f3054c2bd2e5920 100644 (file)
--- a/debian/po/gl.po
+++ b/debian/po/gl.po
@@ -73,8 +73,12 @@ msgstr "¿Debería(n) reiniciarse o(s) servidor(es) web?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "In order to activate the new configuration, the reconfigured web servers "
+#| "have to be restarted."
 msgid ""
-"In order to activate the new configuration, the reconfigured web servers "
+"In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
 "Para activar a nova configuración hai que reiniciar os servidores web "

diff --git a/debian/po/it.po b/debian/po/it.po
index 39c9267100a9eb91aad8fde77131e502cc606e22..559e504526ff47ddb108e4138fb8680fe9652762 100644 (file)
--- a/debian/po/it.po
+++ b/debian/po/it.po
@@ -73,8 +73,12 @@ msgstr "Riavviare il/i server web adesso?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "In order to activate the new configuration, the reconfigured web servers "
+#| "have to be restarted."
 msgid ""
-"In order to activate the new configuration, the reconfigured web servers "
+"In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
 "Per attivare la nuova configurazione è necessario riavviare il/i server web "

diff --git a/debian/po/pt.po b/debian/po/pt.po
index 4a265714cffff970703c5e71e2066ab4dbd6d390..df83dbf3c195adc4d4ce2e0b6ada28b9b2282a2a 100644 (file)
--- a/debian/po/pt.po
+++ b/debian/po/pt.po
@@ -75,8 +75,12 @@ msgstr "Deve o servidor web reiniciado agora?"
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "In order to activate the new configuration, the reconfigured web servers "
+#| "have to be restarted."
 msgid ""
-"In order to activate the new configuration, the reconfigured web servers "
+"In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
 "De modo a activar a nova configuração, os servidores web reconfigurados têm "

diff --git a/debian/po/ru.po b/debian/po/ru.po
index fc25ad5d850f3550afb1cbbcb2d7abcc5bb09933..5d67817d2c43ae461ee8dd9b9a64ee110ef46787 100644 (file)
--- a/debian/po/ru.po
+++ b/debian/po/ru.po
@@ -76,8 +76,12 @@ msgstr "Перезапустить веб-сервер(ы) прямо сейча
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "In order to activate the new configuration, the reconfigured web servers "
+#| "have to be restarted."
 msgid ""
-"In order to activate the new configuration, the reconfigured web servers "
+"In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
 "Чтобы новая конфигурация вступила в силу, нужно перезапустить веб-серверы."

diff --git a/debian/po/ta.po b/debian/po/ta.po
index 3a0b8aac42190e19cd796c2cf8fca8afc6e53a52..85f394b5e51616c36e022123b000c21347d249f7 100644 (file)
--- a/debian/po/ta.po
+++ b/debian/po/ta.po
@@ -74,8 +74,12 @@ msgstr "வலை சேவையகத்தை(கங்களை) மீள
 #. Type: boolean
 #. Description
 #: ../templates:3001
+#, fuzzy
+#| msgid ""
+#| "In order to activate the new configuration, the reconfigured web servers "
+#| "have to be restarted."
 msgid ""
-"In order to activate the new configuration, the reconfigured web servers "
+"In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr "புதிய வடிவமைப்பை செயல்படுத்த வடிவமைத்த வலை சேவையகம் மீள் துவக்கப் பட வேண்டும்."
 

diff --git a/debian/po/templates.pot b/debian/po/templates.pot
index f20122077a5cb2172ebabac44da330efd9c3ff88..b6de0102cb162f6720a570f426c7931c240a8c53 100644 (file)
--- a/debian/po/templates.pot
+++ b/debian/po/templates.pot
@@ -72,7 +72,7 @@ msgstr ""
 #. Description
 #: ../templates:3001
 msgid ""
-"In order to activate the new configuration, the reconfigured web servers "
+"In order to activate the new configuration, the reconfigured web server(s) "
 "have to be restarted."
 msgstr ""
 

diff --git a/debian/templates b/debian/templates
index 9f7d50b1b4d6391627007129da4f5ae4de4aea29..30c0100cfda82093d613ff28c4b8836dc4e51918 100644 (file)
--- a/debian/templates
+++ b/debian/templates
@@ -23,7 +23,7 @@ Type: boolean
 Default: true
 _Description: Should the webserver(s) be restarted now?
  In order to activate the new configuration, the reconfigured web
- servers have to be restarted.
+ server(s) have to be restarted.
 
 Template: roundcube/hosts
 Type: string

diff --git a/debian/watch b/debian/watch
index a68e873776700682ac9dc066593db1348924dc6e..0423c51b87507a462a5f09215dd8f6645d698414 100644 (file)
--- a/debian/watch
+++ b/debian/watch
@@ -2,4 +2,4 @@
 version=3
 
 # Uncomment to find new files on sourceforge, for debscripts >= 2.9
-http://sf.net/roundcubemail/roundcubemail-([\d\.]+.*)\.tar\.gz
+opts=dversionmangle=s/~/-/g;s/$/-dep/ http://sf.net/roundcubemail/roundcubemail-([\d\.]+.*)\.tar\.gz