[Pkg-roundcube-maintainers] Bug#736782: roundcube: diff for NMU version 0.9.5+dfsg1-4.1

Wed Oct 15 03:10:39 UTC 2014

Control: tags 736782 + pending


Dear maintainer,


I've prepared an NMU for roundcube (versioned as 0.9.5+dfsg1-4.1) and
uploaded it to DELAYED/10. Please feel free to tell me if I
should delay it longer.


This is a fix #736782, which is blocking roundcube getting into
jessie.  I've give it a brief test and it seemed to work but I
am a (very) casual roundcube user so I doubt I'd notice anything
subtle.


Note that the .orig.tar.gz is by necessity repackaged now.  I've
arranged for uscan to do this automatically when it downloads it.
If you keep this arrangement naturally this means you should use
uscan to download the .orig.tar.gz from now on.


The diff has had the files removed from the .orig.tar.gz below.
Lines 1000's of characters long don't help clarity.




Regards,
Russell Stuart






diff -Nru roundcube-0.9.5/debian/changelog roundcube-0.9.5+dfsg1/debian/changelog

--- roundcube-0.9.5/debian/changelog	2014-01-21 05:02:05.000000000 +1000
+++ roundcube-0.9.5+dfsg1/debian/changelog	2014-10-15 09:52:34.000000000 +1000
@@ -1,3 +1,20 @@
+roundcube (0.9.5+dfsg1-4.1) unstable; urgency=low
+
+  * NMU - rc bug preventing roundcube from being included in jessie.
+  * Changed debian/watch & debian/copyright so uscan repackage
+    upstream tarball to remove files without source.
+    Closes: #736782.
+  * Added sources for jquery-ui and jstz.js to debian/missing-sources.
+  * Modified debian/copyright to acknowledge copyrights of
+    files in debian/missing-sources.
+  * Added debian/create-jquery-ui-custom.sh that creates the
+    jquery-ui-1.9.1.custom.min.js from upstream source.
+  * Modified debian/rules to create jstz.min.js and
+    jquery-ui-1.9.1.custom.min.js form the versions we have
+    sources for.
+
+ -- Russell Stuart <russell-debian at stuart.id.au>  Wed, 15 Oct 2014 09:51:17 +1000
+
 roundcube (0.9.5-4) unstable; urgency=low


   * Depends directly on postgresql-client instead of a particular (and
diff -Nru roundcube-0.9.5/debian/copyright roundcube-0.9.5+dfsg1/debian/copyright
--- roundcube-0.9.5/debian/copyright	2014-01-21 05:02:05.000000000 +1000
+++ roundcube-0.9.5+dfsg1/debian/copyright	2014-10-14 19:13:01.000000000 +1000
@@ -1,7 +1,8 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Roundcube Dev. - Switzerland
 Upstream-Contact: http://roundcube.net/support
 Source: http://roundcube.net/download
+Files-Excluded: program/js/jquery.min.js program/js/jstz.min.js plugins/jqueryui/js/jquery-ui-1.9.1.custom.min.js


 Files: *
 Copyright: Copyright (C) 2005-2011, The Roundcube Dev Team
@@ -90,6 +91,16 @@
            2007-2011, Romain Beauxis <toots at rastageeks.org>
 License: GPL-2


+Files: debian/missing-sources/jquery-ui*
+Copyright: 2012 jQuery Foundation and other contributors
+License: Expat
+Comment: Source - http://jqueryui.com/download/all/
+
+Files: debian/missing-sources/*-jstimezonedetect-*
+Copyright: 2013 Jon Nylander
+License: Expat
+Comment: Source - https://bitbucket.org/pellepim/jstimezonedetect/downloads
+
 License: BSD-2-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions
@@ -576,3 +587,23 @@
  On Debian systems, the full text of the GNU General Public License
  version 3 can be found in the file
  `/usr/share/common-licenses/GPL-3`.
+
+License: Expat
+  Permission is hereby granted, free of charge, to any person obtaining
+  a copy of this software and associated documentation files (the
+  "Software"), to deal in the Software without restriction, including
+  without limitation the rights to use, copy, modify, merge, publish,
+  distribute, sublicense, and/or sell copies of the Software, and to
+  permit persons to whom the Software is furnished to do so, subject to
+  the following conditions:
+  .
+  The above copyright notice and this permission notice shall be
+  included in all copies or substantial portions of the Software.
+  .
+  THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
+  EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
+  MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
+  NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+  LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
+  OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
+  WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
diff -Nru roundcube-0.9.5/debian/create-jquery-ui-custom.sh roundcube-0.9.5+dfsg1/debian/create-jquery-ui-custom.sh
--- roundcube-0.9.5/debian/create-jquery-ui-custom.sh	1970-01-01 10:00:00.000000000 +1000
+++ roundcube-0.9.5+dfsg1/debian/create-jquery-ui-custom.sh	2014-10-15 10:04:57.000000000 +1000
@@ -0,0 +1,24 @@
+#!/bin/sh
+#
+# The program/js/jquery-ui-1.9.1.custom.js can't be shipped
+# because we don't have the source for it.  So construct that
+# works the way roundcude wants it from the original sources.
+#
+# We actually just mung the minified source because it's closest
+# to what we want.
+#
+# This transformation was figured out by diffing the
+# jquery-ui-1.9.1.custom.js to the one shipped in the original
+# (ie unrepacked, ie not the Debian .orig.tar.gz) tarball.
+#
+# In brief, the transformation is to replace every global
+# function definition, which all have the form:
+#   function (arg ...) { ... } (jQuery),
+# with:
+#   (function (arg ...) { ... }) (jQuery);
+
+unzip -p "${1}" "*/jquery-ui.min.js" |
+  sed '
+      s/}\((jQuery)\),\(jQuery.effects||\)\?\(function([a-z$]\)/})\1;\2(\3/g
+      s/})(jQuery),function(/})(jQuery);(function(/
+      s/}(jQuery);$/})(jQuery);/'
Binary files /tmp/5uvUQrNAYu/roundcube-0.9.5/debian/missing-sources/jquery-ui-1.9.1.zip and /tmp/30uxTFpJL1/roundcube-0.9.5+dfsg1/debian/missing-sources/jquery-ui-1.9.1.zip differ
Binary files /tmp/5uvUQrNAYu/roundcube-0.9.5/debian/missing-sources/pellepim-jstimezonedetect-0aba564fe816.tar.gz and /tmp/30uxTFpJL1/roundcube-0.9.5+dfsg1/debian/missing-sources/pellepim-jstimezonedetect-0aba564fe816.tar.gz differ
diff -Nru roundcube-0.9.5/debian/rules roundcube-0.9.5+dfsg1/debian/rules
--- roundcube-0.9.5/debian/rules	2014-01-21 05:02:05.000000000 +1000
+++ roundcube-0.9.5+dfsg1/debian/rules	2014-10-15 10:49:23.000000000 +1000
@@ -9,6 +9,16 @@
 	--exclude=chgvirtualminpasswd.c \
 	--exclude=chpass-wrapper.py


+pre-build::
+	debian/create-jquery-ui-custom.sh debian/missing-sources/jquery-ui-1.9.1.zip >plugins/jqueryui/js/jquery-ui-1.9.1.custom.min.js
+	tar xzf debian/missing-sources/*-jstimezonedetect-*.tar.gz --wildcards --to-stdout '*/jstz.min.js' >program/js/jstz.min.js
+	>program/js/jquery.min.js
+
+clean::
+	rm -f program/js/jquery.min.js
+	rm -f program/js/jstz.min.js
+	rm -f plugins/jqueryui/js/jquery-ui-1.9.1.custom.min.js
+
 binary-install/roundcube-core::
 	# Install config files
 	install -m 0640 $(CURDIR)/config/db.inc.php.dist $(CURDIR)/debian/roundcube-core/etc/roundcube/db.inc.php
diff -Nru roundcube-0.9.5/debian/source/include-binaries roundcube-0.9.5+dfsg1/debian/source/include-binaries
--- roundcube-0.9.5/debian/source/include-binaries	1970-01-01 10:00:00.000000000 +1000
+++ roundcube-0.9.5+dfsg1/debian/source/include-binaries	2014-10-15 10:53:36.000000000 +1000
@@ -0,0 +1,2 @@
+debian/missing-sources/pellepim-jstimezonedetect-0aba564fe816.tar.gz
+debian/missing-sources/jquery-ui-1.9.1.zip
diff -Nru roundcube-0.9.5/debian/watch roundcube-0.9.5+dfsg1/debian/watch
--- roundcube-0.9.5/debian/watch	2014-01-21 05:02:05.000000000 +1000
+++ roundcube-0.9.5+dfsg1/debian/watch	2014-10-15 12:39:53.000000000 +1000
@@ -1,2 +1,3 @@
 version=3
-opts="uversionmangle=s/-(rc|alpha|beta)/~$1/,dversionmangle=s/\+dfsg//" http://sf.net/roundcubemail/roundcubemail-([\d\.]+.*)-dep\.tar\.gz
+opts="dversionmangle=s/\+dfsg\d*$//,repacksuffix=+dfsg1" \
+  http://sf.net/roundcubemail/roundcubemail-([\d\.]+)-dep\.tar\.gz

-------------- next part --------------
A non-text attachment was scrubbed...
Name: signature.asc
Type: application/pgp-signature
Size: 878 bytes
Desc: not available
URL: <http://lists.alioth.debian.org/pipermail/pkg-roundcube-maintainers/attachments/20141015/93a642ea/attachment.sig>
