Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Please unblock package otrs2 It fixes the bug #763750, an incompatibility with the jQuery version in Debian. If you ACK it, I would also upload a 3.3.9-3 to also fix #767517, the full diff would be then: diff -Naur '--exclude=.svn' tags/3.3.9-1/debian/changelog trunk/debian/changelog --- tags/3.3.9-1/debian/changelog 2014-09-30 18:14:30.442103255 +0200 +++ trunk/debian/changelog 2014-10-31 18:48:46.913246993 +0100 @@ -1,3 +1,21 @@ +otrs2 (3.3.9-3) UNRELEASED; urgency=low + + * Move database servers from recommends to suggest and add Postgres and MySQL + clients to recommends. + Closes: #767517 + + -- Patrick Matthäi <pmatth...@debian.org> Fri, 31 Oct 2014 18:48:00 +0100 + +otrs2 (3.3.9-2) unstable; urgency=low + + * Drop libjs-jquery dependency and use the emebedded version again to avoid + application errors. + Closes: #763750 + * Bump Standards-Version to 3.9.6 (no changes required). + * Remove unused override about package-contains-broken-symlink. + + -- Patrick Matthäi <pmatth...@debian.org> Mon, 27 Oct 2014 21:07:36 +0100 + otrs2 (3.3.9-1) unstable; urgency=medium * New upstream release. diff -Naur '--exclude=.svn' tags/3.3.9-1/debian/control trunk/debian/control --- tags/3.3.9-1/debian/control 2014-09-30 18:14:30.402104049 +0200 +++ trunk/debian/control 2014-10-31 18:47:49.762372686 +0100 @@ -3,7 +3,7 @@ Priority: optional Maintainer: Patrick Matthäi <pmatth...@debian.org> Uploaders: Thomas Mueller <tho...@chaschperli.ch> -Standards-Version: 3.9.5 +Standards-Version: 3.9.6 Build-Depends: debhelper (>= 9), yui-compressor Homepage: http://www.otrs.org @@ -45,7 +45,6 @@ libdbi-perl, libdigest-sha-perl, libjs-jquery-ui, - libjs-jquery, libjavascript-minifier-perl, libcss-minifier-perl, ttf-dejavu-extra, @@ -56,7 +55,7 @@ libsys-hostname-long-perl, libmail-imapclient-perl (>= 3.31), libjson-perl -Recommends: postgresql | mysql-server, +Recommends: postgresql-client | mysql-client, procmail | maildrop, aspell | ispell, libcrypt-eksblowfish-perl, @@ -65,6 +64,7 @@ libencode-hanextra-perl Suggests: otrs2-doc-en | otrs2-doc-de, libnet-ldap-perl, + postgresql | mysql-server, libnet-smtp-tls-butmaintained-perl Breaks: otrs (<< 3.0) Replaces: otrs (<< 3.0) diff -Naur '--exclude=.svn' tags/3.3.9-1/debian/otrs2.links trunk/debian/otrs2.links --- tags/3.3.9-1/debian/otrs2.links 2014-09-30 18:14:30.490102304 +0200 +++ trunk/debian/otrs2.links 2014-10-27 20:33:29.327736541 +0100 @@ -5,7 +5,6 @@ var/lib/otrs/Config/Files usr/share/otrs/Kernel/Config/Files var/spool/otrs var/lib/otrs/spool run/otrs var/lib/otrs/run -usr/share/javascript/jquery var/lib/otrs/httpd/htdocs/js/thirdparty/jquery usr/share/javascript/jquery-ui var/lib/otrs/httpd/htdocs/js/thirdparty/jquery-ui var/lib/otrs/ARCHIVE usr/share/otrs/ARCHIVE usr/share/fonts/truetype/ttf-dejavu/DejaVuSans-Bold.ttf var/lib/otrs/fonts/DejaVuSans-Bold.ttf diff -Naur '--exclude=.svn' tags/3.3.9-1/debian/otrs2.lintian-overrides trunk/debian/otrs2.lintian-overrides --- tags/3.3.9-1/debian/otrs2.lintian-overrides 2014-09-30 18:14:30.386104365 +0200 +++ trunk/debian/otrs2.lintian-overrides 2014-10-27 21:07:12.151870448 +0100 @@ -1,6 +1,5 @@ otrs2: package-contains-broken-symlink usr/share/otrs/Kernel/Config.pm etc/otrs/Kernel/Config.pm otrs2: package-contains-broken-symlink usr/share/otrs/Kernel/Config/GenericAgent.pm etc/otrs/Kernel/Config/GenericAgent.pm -otrs2: package-contains-broken-symlink var/lib/otrs/httpd/htdocs/js/thirdparty/jquery usr/share/javascript/jquery otrs2: package-contains-broken-symlink var/lib/otrs/httpd/htdocs/js/thirdparty/jquery-ui usr/share/javascript/jquery-ui otrs2: package-contains-broken-symlink var/lib/otrs/run run/otrs otrs2: apache2-deprecated-auth-config Order diff -Naur '--exclude=.svn' tags/3.3.9-1/debian/patches/12-use-debian-libjs-packages.diff trunk/debian/patches/12-use-debian-libjs-packages.diff --- tags/3.3.9-1/debian/patches/12-use-debian-libjs-packages.diff 2014-09-30 18:14:30.482102464 +0200 +++ trunk/debian/patches/12-use-debian-libjs-packages.diff 2014-10-27 20:42:20.658243376 +0100 @@ -1,26 +1,19 @@ # Use the system libjs package, instead of the embedded one. -diff -Naur otrs-3.3.7.orig/Kernel/Config/Files/Framework.xml otrs-3.3.7/Kernel/Config/Files/Framework.xml ---- otrs-3.3.7.orig/Kernel/Config/Files/Framework.xml 2014-05-13 10:04:59.607291858 +0200 -+++ otrs-3.3.7/Kernel/Config/Files/Framework.xml 2014-05-13 10:06:34.378898582 +0200 -@@ -5921,9 +5921,9 @@ - <SubGroup>Core::Web</SubGroup> - <Setting> +diff -Naur otrs-3.3.9.orig/Kernel/Config/Files/Framework.xml otrs-3.3.9/Kernel/Config/Files/Framework.xml +--- otrs-3.3.9.orig/Kernel/Config/Files/Framework.xml 2014-10-27 20:40:28.612239639 +0100 ++++ otrs-3.3.9/Kernel/Config/Files/Framework.xml 2014-10-27 20:41:53.490727893 +0100 +@@ -5923,7 +5923,7 @@ <Array> -- <Item>thirdparty/jquery-1.10.0/jquery.js</Item> -+ <Item>thirdparty/jquery/jquery.js</Item> + <Item>thirdparty/jquery-1.10.0/jquery.js</Item> <Item>thirdparty/jquery-browser-detection/jquery-browser-detection.js</Item> - <Item>thirdparty/jquery-ui-1.10.3/jquery-ui.js</Item> + <Item>thirdparty/jquery-ui/jquery-ui.js</Item> <Item>thirdparty/jquery-validate-1.11.1/jquery.validate.js</Item> <Item>thirdparty/stacktrace-0.4/stacktrace.js</Item> <Item>thirdparty/jquery-pubsub/pubsub.js</Item> -@@ -6003,10 +6003,10 @@ - <SubGroup>Core::Web</SubGroup> - <Setting> - <Array> -- <Item>thirdparty/jquery-1.10.0/jquery.js</Item> -+ <Item>thirdparty/jquery/jquery.js</Item> +@@ -6006,7 +6006,7 @@ + <Item>thirdparty/jquery-1.10.0/jquery.js</Item> <Item>thirdparty/jquery-browser-detection/jquery-browser-detection.js</Item> <Item>thirdparty/jquery-validate-1.11.1/jquery.validate.js</Item> - <Item>thirdparty/jquery-ui-1.10.3/jquery-ui.js</Item> diff -Naur '--exclude=.svn' tags/3.3.9-1/debian/patches/13-load-debian-libjs.diff trunk/debian/patches/13-load-debian-libjs.diff --- tags/3.3.9-1/debian/patches/13-load-debian-libjs.diff 2014-09-30 18:14:30.454103018 +0200 +++ trunk/debian/patches/13-load-debian-libjs.diff 2014-10-27 20:43:50.984649654 +0100 @@ -1,14 +1,10 @@ # Use the system libjs package, instead of the embedded one. -diff -Naur otrs-3.3.5.orig/Kernel/Config/Defaults.pm otrs-3.3.5/Kernel/Config/Defaults.pm ---- otrs-3.3.5.orig/Kernel/Config/Defaults.pm 2014-02-20 09:22:11.000000000 +0100 -+++ otrs-3.3.5/Kernel/Config/Defaults.pm 2014-02-27 12:40:17.602474948 +0100 -@@ -867,10 +867,10 @@ - - # Customer Common JS - $Self->{'Loader::Customer::CommonJS'}->{'000-Framework'} = [ -- 'thirdparty/jquery-1.10.0/jquery.js', -+ 'thirdparty/jquery/jquery.js', +diff -Naur otrs-3.3.9.orig/Kernel/Config/Defaults.pm otrs-3.3.9/Kernel/Config/Defaults.pm +--- otrs-3.3.9.orig/Kernel/Config/Defaults.pm 2014-09-03 15:15:41.000000000 +0200 ++++ otrs-3.3.9/Kernel/Config/Defaults.pm 2014-10-27 20:43:29.425022736 +0100 +@@ -870,7 +870,7 @@ + 'thirdparty/jquery-1.10.0/jquery.js', 'thirdparty/jquery-browser-detection/jquery-browser-detection.js', 'thirdparty/jquery-validate-1.11.1/jquery.validate.js', - 'thirdparty/jquery-ui-1.10.3/jquery-ui.js', @@ -16,12 +12,9 @@ 'thirdparty/stacktrace-0.4/stacktrace.js', 'thirdparty/jquery-pubsub/pubsub.js', 'thirdparty/jquery-jstree-v.pre1.0/jquery.jstree.js', -@@ -899,9 +899,9 @@ - - # Agent Common JS +@@ -901,7 +901,7 @@ $Self->{'Loader::Agent::CommonJS'}->{'000-Framework'} = [ -- 'thirdparty/jquery-1.10.0/jquery.js', -+ 'thirdparty/jquery/jquery.js', + 'thirdparty/jquery-1.10.0/jquery.js', 'thirdparty/jquery-browser-detection/jquery-browser-detection.js', - 'thirdparty/jquery-ui-1.10.3/jquery-ui.js', + 'thirdparty/jquery-ui/jquery-ui.js', diff -Naur '--exclude=.svn' tags/3.3.9-1/debian/rules trunk/debian/rules --- tags/3.3.9-1/debian/rules 2014-09-30 18:14:30.490102304 +0200 +++ trunk/debian/rules 2014-10-27 20:32:58.808309079 +0100 @@ -49,8 +49,7 @@ $(OTRS_DST)$(OTRSHOME)/bin/Cron4Win32.pl # Remove some thirdparty directories, where we link against the # system version. - rm -r $(OTRS_DST)/var/lib/otrs/httpd/htdocs/js/thirdparty/jquery-1.* \ - $(OTRS_DST)/var/lib/otrs/httpd/htdocs/js/thirdparty/jquery-ui-1.* + rm -rf $(OTRS_DST)/var/lib/otrs/httpd/htdocs/js/thirdparty/jquery-ui-1.* # Remove embedded ttf-dejavu fonts. rm $(OTRS_DST)/var/lib/otrs/fonts/DejaVu*.ttf # Remove embedded fonts-font-awesome fonts. unblock otrs2/3.3.9-2 -- System Information: Debian Release: 7.7 APT prefers stable-updates APT policy: (500, 'stable-updates'), (500, 'stable') Architecture: amd64 (x86_64) Kernel: Linux 3.2.0-4-amd64 (SMP w/2 CPU cores) Locale: LANG=de_DE.UTF-8, LC_CTYPE=de_DE.UTF-8 (charmap=UTF-8) Shell: /bin/sh linked to /bin/dash -- To UNSUBSCRIBE, email to debian-bugs-dist-requ...@lists.debian.org with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
