Add changesets 3170 and 3202 from upstream to handle gracefully jQuery

1.4. Thanks to Volker Gropp for the report. Closes: #565715.

diff --git a/debian/changelog b/debian/changelog
index a6c36b18d24ef72d2d6c13256aac55b9337b0f29..0a54d417c9dfbab6a94fe92ca95d760c98eb9f50 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,8 +2,10 @@ roundcube (0.3.1-2) UNRELEASED; urgency=low
 
   * Fix VCS links in debian/control, thanks to Torsten Landschoff. Closes: #555900.
   * Really ship NEWS.Debian.
+  * Add changesets 3170 and 3202 from upstream to handle gracefully jQuery
+    1.4. Thanks to Volker Gropp for the report. Closes: #565715.
 
- -- Vincent Bernat <bernat@debian.org>  Thu, 12 Nov 2009 20:28:57 +0100
+ -- Vincent Bernat <bernat@debian.org>  Mon, 18 Jan 2010 23:11:01 +0100
 
 roundcube (0.3.1-1) unstable; urgency=low
 

diff --git a/debian/patches/series b/debian/patches/series
index 055d9040eda23d0ce0889c68975d5f518b2acb63..7b7b57cd76198413e8d8cd7544cf2017de60eedf 100644 (file)
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,5 @@ use_packaged_tinymce.patch
 correct-magic-path.patch
 use_pspell.patch
 loginbox-size.patch
+changeset_r3170.patch
+changeset_r3202.patch