From 03ea94d72a1d4eb59c7ee1a1229c4033113d572e Mon Sep 17 00:00:00 2001 From: Roland Mas Date: Sat, 2 Jun 2012 16:02:44 +0000 Subject: [PATCH] Use more of the distro-provided Jquery --- src/debian/control | 2 +- src/debian/patches/use-jquery-from-distro | 22 +++++++++++++++++++++- src/packaging/control/030web-apache2 | 2 +- src/packaging/links/web-apache2 | 4 ++++ 4 files changed, 27 insertions(+), 3 deletions(-) diff --git a/src/debian/control b/src/debian/control index 72b4239e17..9cc81bb231 100644 --- a/src/debian/control +++ b/src/debian/control @@ -84,7 +84,7 @@ Description: collaborative development tool - shared files Package: gforge-web-apache2 Architecture: all -Depends: gforge-common, gforge-db-postgresql | gforge-db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, libphp-simplepie, php-http, libjs-yui, libjs-scriptaculous, libjs-jquery, libjs-jquery-tipsy, libphp-jpgraph, ${misc:Depends} +Depends: gforge-common, gforge-db-postgresql | gforge-db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, libphp-simplepie, php-http, libjs-yui, libjs-scriptaculous, libjs-jquery, libjs-jquery-tipsy, libjs-jquery-ui, libjs-jquery-ui-theme-overcast, libphp-jpgraph, ${misc:Depends} Recommends: locales | locales-all Provides: gforge-web Conflicts: gforge-web diff --git a/src/debian/patches/use-jquery-from-distro b/src/debian/patches/use-jquery-from-distro index c39440019d..b3dd59e79c 100644 --- a/src/debian/patches/use-jquery-from-distro +++ b/src/debian/patches/use-jquery-from-distro @@ -4,7 +4,7 @@ Index: src/www/include/html.php =================================================================== --- src.orig/www/include/html.php +++ src/www/include/html.php -@@ -377,7 +377,7 @@ +@@ -377,14 +377,14 @@ } function html_use_jquery() { @@ -13,3 +13,23 @@ Index: src/www/include/html.php } function html_use_tooltips() { + html_use_jquery(); +- use_javascript('/scripts/jquery-tipsy/src/javascripts/jquery.tipsy.js'); ++ use_javascript('/scripts/jquery-tipsy/jquery.tipsy.js'); + use_javascript('/js/jquery-common.js'); +- use_stylesheet('/scripts/jquery-tipsy/src/stylesheets/tipsy.css'); ++ use_stylesheet('/scripts/jquery-tipsy/stylesheets/tipsy.css'); + } + + function html_use_storage() { +@@ -407,8 +407,8 @@ + + function html_use_jqueryui() { + html_use_jquery(); +- use_javascript('/scripts/jquery-ui/js/jquery-ui-1.8.17.custom.min.js'); +- use_stylesheet('/scripts/jquery-ui/css/overcast/jquery-ui-1.8.17.custom.css'); ++ use_javascript('/scripts/jquery-ui/jquery-ui.min.js'); ++ use_stylesheet('/scripts/jquery-ui-themes/overcast/jquery-ui.min.css'); + } + + /** diff --git a/src/packaging/control/030web-apache2 b/src/packaging/control/030web-apache2 index 117de5528a..84781d7631 100644 --- a/src/packaging/control/030web-apache2 +++ b/src/packaging/control/030web-apache2 @@ -1,6 +1,6 @@ Package: @OLDPACKAGE@-web-apache2 Architecture: all -Depends: @OLDPACKAGE@-common, @OLDPACKAGE@-db-postgresql | @OLDPACKAGE@-db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, libphp-simplepie, php-http, libjs-yui, libjs-scriptaculous, libjs-jquery, libjs-jquery-tipsy, libphp-jpgraph, ${misc:Depends} +Depends: @OLDPACKAGE@-common, @OLDPACKAGE@-db-postgresql | @OLDPACKAGE@-db, libapache2-mod-php5, php5-cgi, php5-pgsql, php5-gd, perl, libdbi-perl, libdbd-pg-perl, debianutils (>= 1.7), debconf (>= 1.0.32) | debconf-2.0, ucf, cronolog, python, ssl-cert, libnusoap-php, libphp-simplepie, php-http, libjs-yui, libjs-scriptaculous, libjs-jquery, libjs-jquery-tipsy, libjs-jquery-ui, libjs-jquery-ui-theme-overcast, libphp-jpgraph, ${misc:Depends} Recommends: locales | locales-all Provides: @OLDPACKAGE@-web Conflicts: @OLDPACKAGE@-web diff --git a/src/packaging/links/web-apache2 b/src/packaging/links/web-apache2 index 9c0dcfa776..98d995f0c7 100644 --- a/src/packaging/links/web-apache2 +++ b/src/packaging/links/web-apache2 @@ -4,8 +4,12 @@ usr/share/javascript/prototype usr/share/@OLDPACKAGE@/www/scripts/prototype usr/share/javascript/scriptaculous usr/share/@OLDPACKAGE@/www/scripts/scriptaculous usr/share/javascript/jquery usr/share/@OLDPACKAGE@/www/scripts/jquery usr/share/javascript/jquery-tipsy usr/share/@OLDPACKAGE@/www/scripts/jquery-tipsy +usr/share/javascript/jquery-ui usr/share/@OLDPACKAGE@/www/scripts/jquery-ui +usr/share/javascript/jquery-ui-themes usr/share/@OLDPACKAGE@/www/scripts/jquery-ui-themes usr/share/javascript/yui usr/share/@OLDPACKAGE@/lib/vendor/yui usr/share/javascript/prototype usr/share/@OLDPACKAGE@/lib/vendor/prototype usr/share/javascript/scriptaculous usr/share/@OLDPACKAGE@/lib/vendor/scriptaculous usr/share/javascript/jquery usr/share/@OLDPACKAGE@/lib/vendor/jquery usr/share/javascript/jquery-tipsy usr/share/@OLDPACKAGE@/lib/vendor/jquery-tipsy +usr/share/javascript/jquery-ui usr/share/@OLDPACKAGE@/lib/vendor/jquery-ui +usr/share/javascript/jquery-ui-themes usr/share/@OLDPACKAGE@/lib/vendor/jquery-ui-themes -- 2.30.2