[pkg-kolab] r1568 - in kolab-webadmin/trunk/debian: . patches
Mathieu Parent
sathieu at alioth.debian.org
Sat Nov 19 18:02:34 UTC 2011
Author: sathieu
Date: 2011-11-19 18:02:33 +0000 (Sat, 19 Nov 2011)
New Revision: 1568
Removed:
kolab-webadmin/trunk/debian/patches/70-sieve-port-i18n.diff
Modified:
kolab-webadmin/trunk/debian/changelog
Log:
removed 70-sieve-port-i18n.diff: merged upstream
Modified: kolab-webadmin/trunk/debian/changelog
===================================================================
--- kolab-webadmin/trunk/debian/changelog 2011-11-19 17:59:24 UTC (rev 1567)
+++ kolab-webadmin/trunk/debian/changelog 2011-11-19 18:02:33 UTC (rev 1568)
@@ -1,10 +1,11 @@
kolab-webadmin (2.3.4-20110927-1) UNRELEASED; urgency=low
- * New upstream release (2.3.4-20110927-1)
+ * New upstream release (2.3.4-20110927)
- d/watch: updated
- d/uupdate-wrapper: updated as new upstream ar tgz instead of tar.bz2
- Upstream is now a PEAR package, major rework
- removed 10-dist_conf.diff, 60-no_extra_doc.diff: not needed with PEAR
+ - removed 70-sieve-port-i18n.diff: merged upstream
* Drop php4 support (probably not working already)
* Moved to debhelper compat level 8 and dh
* Moved to pkg-php-tools
Deleted: kolab-webadmin/trunk/debian/patches/70-sieve-port-i18n.diff
===================================================================
--- kolab-webadmin/trunk/debian/patches/70-sieve-port-i18n.diff 2011-11-19 17:59:24 UTC (rev 1567)
+++ kolab-webadmin/trunk/debian/patches/70-sieve-port-i18n.diff 2011-11-19 18:02:33 UTC (rev 1568)
@@ -1,93 +0,0 @@
-Description: allow another port than 2000 for sieve
- (i18n part)
-Bug: https://issues.kolab.org/issue4373
-Bug-Debian: http://bugs.debian.org/598010
-
-Index: kolab-webadmin-2.2.3-20091217/php/admin/locale/de/LC_MESSAGES/messages.po
-===================================================================
---- kolab-webadmin-2.2.3-20091217.orig/php/admin/locale/de/LC_MESSAGES/messages.po 2010-09-30 23:35:59.000000000 +0200
-+++ kolab-webadmin-2.2.3-20091217/php/admin/locale/de/LC_MESSAGES/messages.po 2010-09-30 23:36:02.000000000 +0200
-@@ -1675,8 +1675,8 @@
- msgstr "IMAP/SSL-Dienst (TCP-Port 993)"
-
- #: ../../../www/admin/settings/index.php.in:277
--msgid "Sieve service (TCP port 2000)"
--msgstr "Sieve-Dienst (TCP-Port 2000)"
-+msgid "Sieve service (TCP port %s)"
-+msgstr "Sieve-Dienst (TCP-Port %s)"
-
- #: ../../../www/admin/settings/index.php.in:278
- msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-Index: kolab-webadmin-2.2.3-20091217/php/admin/locale/es/LC_MESSAGES/messages.po
-===================================================================
---- kolab-webadmin-2.2.3-20091217.orig/php/admin/locale/es/LC_MESSAGES/messages.po 2010-09-30 23:35:59.000000000 +0200
-+++ kolab-webadmin-2.2.3-20091217/php/admin/locale/es/LC_MESSAGES/messages.po 2010-09-30 23:36:02.000000000 +0200
-@@ -1669,8 +1669,8 @@
- msgstr "Servicio IMAP/SSL (puerto TCP 993)"
-
- #: ../../../www/admin/settings/index.php.in:277
--msgid "Sieve service (TCP port 2000)"
--msgstr "Servicio Sieve (puerto TCP 2000)"
-+msgid "Sieve service (TCP port %s)"
-+msgstr "Servicio Sieve (puerto TCP %s)"
-
- #: ../../../www/admin/settings/index.php.in:278
- msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-Index: kolab-webadmin-2.2.3-20091217/php/admin/locale/fr/LC_MESSAGES/messages.po
-===================================================================
---- kolab-webadmin-2.2.3-20091217.orig/php/admin/locale/fr/LC_MESSAGES/messages.po 2010-09-30 23:35:59.000000000 +0200
-+++ kolab-webadmin-2.2.3-20091217/php/admin/locale/fr/LC_MESSAGES/messages.po 2010-09-30 23:36:02.000000000 +0200
-@@ -1674,8 +1674,8 @@
- msgstr "Service IMAP/SSL (TCP port 993)"
-
- #: ../../../www/admin/settings/index.php.in:279
--msgid "Sieve service (TCP port 2000)"
--msgstr "Service Sieve (TCP port 2000)"
-+msgid "Sieve service (TCP port %s)"
-+msgstr "Service Sieve (TCP port %s)"
-
- #: ../../../www/admin/settings/index.php.in:280
- msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-Index: kolab-webadmin-2.2.3-20091217/php/admin/locale/it/LC_MESSAGES/messages.po
-===================================================================
---- kolab-webadmin-2.2.3-20091217.orig/php/admin/locale/it/LC_MESSAGES/messages.po 2010-09-30 23:35:59.000000000 +0200
-+++ kolab-webadmin-2.2.3-20091217/php/admin/locale/it/LC_MESSAGES/messages.po 2010-09-30 23:36:02.000000000 +0200
-@@ -1669,8 +1669,8 @@
- msgstr "Servizio IMAP/SSL (Porta TCP 993)"
-
- #: ../../../www/admin/settings/index.php.in:277
--msgid "Sieve service (TCP port 2000)"
--msgstr "Servizio Sieve (Porta TCP 2000)"
-+msgid "Sieve service (TCP port %s)"
-+msgstr "Servizio Sieve (Porta TCP %s)"
-
- #: ../../../www/admin/settings/index.php.in:278
- msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-Index: kolab-webadmin-2.2.3-20091217/php/admin/locale/nl/LC_MESSAGES/messages.po
-===================================================================
---- kolab-webadmin-2.2.3-20091217.orig/php/admin/locale/nl/LC_MESSAGES/messages.po 2010-09-30 23:35:59.000000000 +0200
-+++ kolab-webadmin-2.2.3-20091217/php/admin/locale/nl/LC_MESSAGES/messages.po 2010-09-30 23:36:02.000000000 +0200
-@@ -1656,8 +1656,8 @@
- msgstr "IMAP/SSL Service (TCP poort 993)"
-
- #: ../../../www/admin/settings/index.php.in:277
--msgid "Sieve service (TCP port 2000)"
--msgstr "Sieve service (TCP poort 2000)"
-+msgid "Sieve service (TCP port %s)"
-+msgstr "Sieve service (TCP poort %s)"
-
- #: ../../../www/admin/settings/index.php.in:278
- msgid "FreeBusy Service via HTTP (in addition to HTTPS)"
-Index: kolab-webadmin-2.2.3-20091217/www/admin/settings/index.php.in
-===================================================================
---- kolab-webadmin-2.2.3-20091217.orig/www/admin/settings/index.php.in 2010-09-30 23:35:59.000000000 +0200
-+++ kolab-webadmin-2.2.3-20091217/www/admin/settings/index.php.in 2010-09-30 23:43:11.000000000 +0200
-@@ -276,7 +276,7 @@
- array( 'service' => 'pop3s', 'name' => _('POP3/SSL service (TCP port 995)'), 'enabled' => toboolstr( $pop3s ) ),
- array( 'service' => 'imap', 'name' => _('IMAP Service'), 'enabled' => toboolstr( $imap ) ),
- array( 'service' => 'imaps', 'name' => _('IMAP/SSL Service (TCP port 993)'), 'enabled' => toboolstr( $imaps ) ),
-- array( 'service' => 'sieve', 'name' => _('Sieve service (TCP port 2000)'), 'enabled' => toboolstr( $sieve ) ),
-+ array( 'service' => 'sieve', 'name' => sprintf(_('Sieve service (TCP port %s)'), 2000), 'enabled' => toboolstr( $sieve ) ),
- array( 'service' => 'http', 'name' => _('FreeBusy Service via HTTP (in addition to HTTPS)'), 'enabled' => toboolstr( $http ) ),
- array( 'service' => 'amavis', 'name' => _('Amavis Email Scanning (Virus/Spam)'),
- 'enabled' => toboolstr( $amavis ) ) );
More information about the pkg-kolab-devel
mailing list