Depends on libjs-jquery (>= 1.3) since this is now used by roundcube.

diff --git a/debian/changelog b/debian/changelog
index 3c50f2a27f7abb8e484ac6303d1457823dad690d..353e9bec299cdf186d7634ad3d3ded8774b7cf7d 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ roundcube (0.3-1) UNRELEASED; urgency=low
   * Roundcube configuration now uses 'language' instead of 'locale_string'
     to specify the default language. Update postinst to reflect this
     change. Thanks to Richard van den Berg for noticing this. Closes: #544579.
+  * Depends on libjs-jquery (>= 1.3) since this is now used by roundcube.
 
  -- Vincent Bernat <bernat@debian.org>  Wed, 16 Sep 2009 22:32:29 +0200
 

diff --git a/debian/control b/debian/control
index 9c96ec3a01e914aef6ea4385a498ffb10b3279ff..95e93fa65788d9237fd1179c3373da1008122dea 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -11,7 +11,7 @@ Vcs-Browser: http://svn.debian.org/wsvn/pkg-roundcube/roundcube
 
 Package: roundcube-core
 Architecture: all
-Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1, php5-pspell
+Depends: dbconfig-common, debconf | debconf-2.0, apache2 | lighttpd | httpd, php5, php5-mcrypt, php5-gd, roundcube-sqlite (= ${source:Version}) | roundcube-mysql (= ${source:Version}) | roundcube-pgsql (= ${source:Version}), php-mdb2, php-auth, php-net-smtp, php-net-socket, php-mail-mime (>= 1.5.0), ucf, tinymce (>= 3), ${misc:Depends}, libmagic1, php5-pspell, libjs-jquery (>= 1.3.3)
 Replaces: roundcube
 Conflicts: roundcube (<< 0.1~rc2-2)
 Description: skinnable AJAX based webmail solution for IMAP servers

diff --git a/debian/copyright b/debian/copyright
index 2518c53e5820492ed26627edda4f1f1035c1e65d..8b396eaa8f0e64b4f1144a03aed5f7aa9054c2f0 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -22,6 +22,7 @@ Some files are taken from other projects :
  - lib/{enriched,icl_commons,imap,mime,utf7}.inc from IlohaMail project, GPL license
  - lib/encoding/*.map from Unicode, Inc., with "BSD-lite" license
  - debian/patches/xss-fix.patch contains code from Squirrelmail, GPLv2
+ - program/js/jquery-1.3.min.js is MIT and GPLv2 licensed
  - lib/magic is an autogenerated file. We don't ship it and use the
    one from libmagic1 instead. Here is the license:
 

diff --git a/debian/rules b/debian/rules
index c04db2896c9ccc0014846bc6e68ea28babcb732c..0d9aead33d7a4de49f3d36441ecc08b53043a8fc 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -41,6 +41,9 @@ binary-install/roundcube-core::
        # Remove files shipped in tinymce package
        rm -rf $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/tiny_mce
        dh_link -proundcube-core usr/share/tinymce/www usr/share/roundcube/program/js/tiny_mce
+       # Remove jquery as well
+       rm $(CURDIR)/debian/roundcube-core/usr/share/roundcube/program/js/jquery-1.3.min.js
+       dh_link -proundcube-core usr/share/javascript/jquery/jquery.min.js usr/share/roundcube/program/js/jquery-1.3.min.js
 
 $(patsubst %,binary-install/%,$(DEB_PACKAGES)) :: binary-install/% :
        install -d $(CURDIR)/debian/$(cdbs_curpkg)/usr/share/bug/$(cdbs_curpkg)