From: Vincent Bernat Date: Tue, 2 Oct 2007 18:09:19 +0000 (+0200) Subject: Imported Debian patch 0.1~rc1-2 X-Git-Url: https://git.donarmstrong.com/?a=commitdiff_plain;h=49c269dbcd1363fc730d9f14a927993f9c1c9c37;p=roundcube.git Imported Debian patch 0.1~rc1-2 --- diff --git a/debian/changelog b/debian/changelog index dfb0edf..f8877b7 100644 --- 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 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 31c7957..b998456 100644 --- 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 517da34..0ff756a 100644 --- 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 440d03a..d3ebfd1 100644 --- 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 8d68806..dd89f76 100644 --- 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 8f9ecf2..ccb5b2e 100644 --- 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 66f7237..0808342 100644 --- 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 3e3cfe6..7c3c20c 100644 --- 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 1f437f6..042c6df 100644 --- 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 f29b4c4..60f7d25 100644 --- 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 ceb95ec..a5b5376 100644 --- 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 39c9267..559e504 100644 --- 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 4a26571..df83dbf 100644 --- 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 fc25ad5..5d67817 100644 --- 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 3a0b8aa..85f394b 100644 --- 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 f201220..b6de010 100644 --- 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 9f7d50b..30c0100 100644 --- 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 a68e873..0423c51 100644 --- 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