[packaging] Branch 'ucs/3.1/kolab-2.3' - 4 commits - debian/changelog debian/control debian/patches

Christoph Wickert wickert at kolabsys.com
Mon Mar 4 11:18:47 CET 2013


 debian/changelog                              |    7 +++++
 debian/control                                |    3 --
 debian/patches/fix-advanced-ACL-editing.patch |   33 ++++++++++++++++++++++++++
 debian/patches/series                         |    1 
 4 files changed, 42 insertions(+), 2 deletions(-)

New commits:
commit 345244285f12c7a3922f2a76e44ea715f587ccab
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Mon Mar 4 11:06:14 2013 +0100

    0.9~beta-13: Update changelog

diff --git a/debian/changelog b/debian/changelog
index a35334a..f3d7e52 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+roundcube (0.9~beta-13) unstable; urgency=low
+
+  * Fix advanced ACL editing (#1673)
+  * Remove invalid 'Obsoletes' tag from control file
+
+ -- Christoph Wickert <wickert at kolabsys.com>  Mon, 04 Mar 2013 10:27:57 +0100
+
 roundcube (0.9~beta-12) unstable; urgency=low
 
   [ Jeroen van Meeuwen (Kolab Systems) ]


commit 9a377be45d60880963dd6155974bd8add02158f8
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Mon Mar 4 11:05:43 2013 +0100

    Remove invalid 'Obsoletes' tag from control file

diff --git a/debian/control b/debian/control
index 9af921d..e5c5490 100644
--- a/debian/control
+++ b/debian/control
@@ -84,7 +84,6 @@ Architecture: all
 Depends: roundcube-core (= ${source:Version}),
 	roundcube-plugin-composeaddressbook,
 	roundcube-plugin-contextmenu
-Obsoletes: roundcube-plugins-extra (<< 0.9)
 Replaces: roundcube-plugins-extra (<< 0.9)
 Description: Additional plugins for RoundCube Webmail
  This package pulls in additional plugins for RoundCube Webmail, such as:


commit c52b469da62e43db7d1c2e4b8686be3d19274d7c
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Mon Mar 4 10:52:08 2013 +0100

    Fix advanced ACL editing (#1673)

diff --git a/debian/patches/fix-advanced-ACL-editing.patch b/debian/patches/fix-advanced-ACL-editing.patch
new file mode 100644
index 0000000..527c594
--- /dev/null
+++ b/debian/patches/fix-advanced-ACL-editing.patch
@@ -0,0 +1,33 @@
+commit f5584cbfeb098fbf26f57c74fa36464a634e2397
+Author: Aleksander Machniak <alec at alec.pl>
+Date:   Fri Mar 1 17:45:43 2013 +0100
+
+    Fixed ACL edition in advanced mode
+
+diff --git a/plugins/acl/acl.js b/plugins/acl/acl.js
+index b6e2c81..d693478 100644
+--- a/plugins/acl/acl.js
++++ b/plugins/acl/acl.js
+@@ -302,7 +302,7 @@ rcube_webmail.prototype.acl_init_form = function(id)
+         li_elements.map(function() {
+             val = this.value;
+             td = $('td.'+this.id, row);
+-            if (td && td.hasClass('enabled'))
++            if (td.length && td.hasClass('enabled'))
+                 this.checked = true;
+         });
+ 
+diff --git a/plugins/acl/acl.php b/plugins/acl/acl.php
+index ab7c8ce..a4abe28 100644
+--- a/plugins/acl/acl.php
++++ b/plugins/acl/acl.php
+@@ -233,7 +233,8 @@ class acl extends rcube_plugin
+ 
+         // Advanced rights
+         $attrib['id'] = 'advancedrights';
+-        foreach ($supported as $idx => $val) {
++        foreach ($supported as $key => $val) {
++            $id = "acl$val";
+             $ul .= html::tag('li', null,
+                 $input->show('', array(
+                     'name' => "acl[$val]", 'value' => $val, 'id' => $id))
diff --git a/debian/patches/series b/debian/patches/series
index 5d89590..745424c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 correct_install_path.patch
 #use_pspell.patch
 default-charset-utf8.patch
+fix-advanced-ACL-editing.patch


commit 945d11fbf016b4888f99d99a321b5ec0728fb60f
Author: Christoph Wickert <wickert at kolabsys.com>
Date:   Mon Mar 4 10:49:50 2013 +0100

    Add myself to Uploaders

diff --git a/debian/control b/debian/control
index 9337e49..9af921d 100644
--- a/debian/control
+++ b/debian/control
@@ -2,7 +2,7 @@ Source: roundcube
 Section: web
 Priority: extra
 Maintainer: Debian Roundcube Maintainers <pkg-roundcube-maintainers at lists.alioth.debian.org>
-Uploaders: Vincent Bernat <bernat at debian.org>, Romain Beauxis <toots at rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
+Uploaders: Vincent Bernat <bernat at debian.org>, Romain Beauxis <toots at rastageeks.org>, Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>, Christoph Wickert <wickert at kolabsys.com>
 Build-Depends: cdbs, debhelper (>= 5), dh-buildinfo, po-debconf, yui-compressor
 Homepage: http://www.roundcube.net/
 Standards-Version: 3.9.3




More information about the packaging-commits mailing list