[evolvis-commits] r16467: Updated dpatch
mirabilos at evolvis.org
mirabilos at evolvis.org
Tue Mar 1 01:19:43 CET 2011
Author: mirabilos
Date: 2011-03-01 01:19:43 +0100 (Tue, 01 Mar 2011)
New Revision: 16467
Modified:
trunk/gforge_base/evolvisforge-5.1/src/debian/patches/use-jquery-from-distro.dpatch
Log:
Updated dpatch
Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/patches/use-jquery-from-distro.dpatch
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/patches/use-jquery-from-distro.dpatch 2011-03-01 00:19:41 UTC (rev 16466)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/patches/use-jquery-from-distro.dpatch 2011-03-01 00:19:43 UTC (rev 16467)
@@ -7,7 +7,7 @@
@DPATCH@
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' src~/www/include/html.php src/www/include/html.php
--- src~/www/include/html.php 2010-10-19 21:04:18.000000000 +0200
-+++ src/www/include/html.php 2010-10-28 16:35:55.400965535 +0200
++++ src/www/include/html.php 2010-10-29 09:29:40.576563257 +0200
@@ -353,7 +353,7 @@
}
@@ -18,14 +18,14 @@
use_javascript('/js/tooltips.js');
use_stylesheet('/scripts/jquery-tipsy/src/stylesheets/tipsy.css');
diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' src~/www/themes/funky/Theme.class.php src/www/themes/funky/Theme.class.php
---- src~/www/themes/funky/Theme.class.php 2010-10-28 14:33:42.000000000 +0200
-+++ src/www/themes/funky/Theme.class.php 2010-10-28 16:35:55.404959874 +0200
-@@ -401,7 +401,7 @@
- echo '<script type="text/javascript" src="/scripts/codendi/validate.js"></script>';
- echo '<script type="text/javascript" src="/scripts/codendi/Tooltip.js"></script>';
-
-- echo '<script type="text/javascript" src="'.$this->themeurl.'js/jquery-1.4.2.min.js"></script>' ."\n";
-+ echo '<script type="text/javascript" src="'.$this->themeurl.'js/jquery.min.js"></script>' ."\n";
- ?>
- <script>
- var JQuery = jQuery.noConflict();
+--- src~/www/themes/funky/Theme.class.php 2010-10-28 19:55:57.000000000 +0200
++++ src/www/themes/funky/Theme.class.php 2010-10-29 09:29:41.636561367 +0200
+@@ -394,7 +394,7 @@
+ */
+ function headerJS()
+ {
+- use_javascript('/scripts/jquery/jquery-1.4.2.min.js');
++ use_javascript('/scripts/jquery/jquery.min.js');
+
+ echo '<script type="text/javascript" src="'. util_make_uri('/js/common.js') .'"></script>';
+ echo '<script type="text/javascript" src="/scripts/codendi/LayoutManager.js"></script>';
More information about the evolvis-commits
mailing list