[evolvis-commits] r18745: switch to the Debian libjs-protaculous package

mirabilos at evolvis.org mirabilos at evolvis.org
Tue Nov 6 12:26:10 CET 2012


Author: mirabilos
Date: 2012-11-06 12:26:09 +0100 (Tue, 06 Nov 2012)
New Revision: 18745

Modified:
   trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
   trunk/gforge_base/evolvisforge-5.1/src/debian/gforge-web-apache2.lintian-overrides
   trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2
   trunk/gforge_base/evolvisforge-5.1/src/packaging/links/web-apache2
   trunk/gforge_base/evolvisforge-5.1/src/plugins/hudson/include/hudsonViews.class.php
   trunk/gforge_base/evolvisforge-5.1/src/plugins/hudson/packaging/control/222plugin-hudson
   trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
Log:
switch to the Debian libjs-protaculous package

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/changelog
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-11-06 11:26:02 UTC (rev 18744)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/changelog	2012-11-06 11:26:09 UTC (rev 18745)
@@ -10,9 +10,10 @@
     Codendi widget layout we’re flexible enough to keep the page fit
   * Widgets: [#3230] “Public Areas” ⇒ “Project Areas” (SECURITY fix)
   * [#3230] Also remove projhtml.php export (unused, same bug)
-  * Speed up page loads: reduce number of files (JS and CSS) referenced
+  * Speed up page loads: reduce number of files (JS and CSS) referenced,
+    use the Debian libjs-protaculous package
 
- -- Thorsten Glaser <tg at mirbsd.de>  Mon, 05 Nov 2012 18:09:03 +0100
+ -- Thorsten Glaser <t.glaser at tarent.de>  Tue, 06 Nov 2012 11:39:12 +0100
 
 fusionforge (1:5.1.1+evolvis74.2) unstable; urgency=high
 

Modified: trunk/gforge_base/evolvisforge-5.1/src/debian/gforge-web-apache2.lintian-overrides
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/debian/gforge-web-apache2.lintian-overrides	2012-11-06 11:26:02 UTC (rev 18744)
+++ trunk/gforge_base/evolvisforge-5.1/src/debian/gforge-web-apache2.lintian-overrides	2012-11-06 11:26:09 UTC (rev 18745)
@@ -12,6 +12,4 @@
 gforge-web-apache2: package-contains-broken-symlink usr/share/gforge/www/images/office-calendar.png ../../../icons/Tango/16x16/apps/office-calendar.png
 gforge-web-apache2: package-contains-broken-symlink usr/share/gforge/www/scripts/jquery ../../../javascript/jquery
 gforge-web-apache2: package-contains-broken-symlink usr/share/gforge/www/scripts/jquery-ui ../../../javascript/jquery-ui
-gforge-web-apache2: package-contains-broken-symlink usr/share/gforge/www/scripts/prototype ../../../javascript/prototype
-gforge-web-apache2: package-contains-broken-symlink usr/share/gforge/www/scripts/scriptaculous ../../../javascript/scriptaculous
-gforge-web-apache2: package-contains-broken-symlink usr/share/gforge/www/scripts/yui ../../../javascript/yui
+gforge-web-apache2: package-contains-broken-symlink usr/share/gforge/www/scripts/protaculous ../../../javascript/protaculous

Modified: trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2	2012-11-06 11:26:02 UTC (rev 18744)
+++ trunk/gforge_base/evolvisforge-5.1/src/packaging/control/030web-apache2	2012-11-06 11:26:09 UTC (rev 18745)
@@ -1,6 +1,6 @@
 Package: @OLDPACKAGE at -web-apache2
 Architecture: all
-Depends: @OLDPACKAGE at -common (>> 1:5.1.1+evolvis72~), @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -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, libjs-prototype (>= 1.7.0-2.1~tarent), libjs-prototype (<< 1.7.0-2.1~tarenu), libjs-scriptaculous (>= 1.9.0-2~), libjs-jquery (>= 1.6.4-1~), libjs-jquery-ui (>= 1.8.ooops.16+dfsg-1~), libphp-jpgraph, tango-icon-theme, toilet, ${misc:Depends}
+Depends: @OLDPACKAGE at -common (>> 1:5.1.1+evolvis72~), @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -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, libjs-prototype (>= 1.7.0-2.1~tarent), libjs-prototype (<< 1.7.0-2.1~tarenu), libjs-scriptaculous (>= 1.9.0-2~), libjs-protoaculous, libjs-jquery (>= 1.6.4-1~), libjs-jquery-ui (>= 1.8.ooops.16+dfsg-1~), libphp-jpgraph, tango-icon-theme, toilet, ${misc:Depends}
 Recommends: locales | locales-all
 Provides: @OLDPACKAGE at -web, evolvisforge-web-apache2
 Conflicts: @OLDPACKAGE at -web

Modified: trunk/gforge_base/evolvisforge-5.1/src/packaging/links/web-apache2
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/packaging/links/web-apache2	2012-11-06 11:26:02 UTC (rev 18744)
+++ trunk/gforge_base/evolvisforge-5.1/src/packaging/links/web-apache2	2012-11-06 11:26:09 UTC (rev 18745)
@@ -1,6 +1,5 @@
 usr/share/@OLDPACKAGE@/www/env.inc.php usr/share/@OLDPACKAGE@/plugins/env.inc.php
-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-ui usr/share/@OLDPACKAGE@/www/scripts/jquery-ui
+usr/share/javascript/protoaculous usr/share/@OLDPACKAGE@/www/scripts/protoaculous
 usr/share/icons/Tango/16x16/apps/office-calendar.png usr/share/@OLDPACKAGE@/www/images/office-calendar.png

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/hudson/include/hudsonViews.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/hudson/include/hudsonViews.class.php	2012-11-06 11:26:02 UTC (rev 18744)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/hudson/include/hudsonViews.class.php	2012-11-06 11:26:09 UTC (rev 18745)
@@ -38,9 +38,6 @@
 	}
 
 	function header() {
-		use_javascript('/scripts/prototype/prototype.js');
-		use_javascript('/scripts/scriptaculous/scriptaculous.js');
-
 		parent::header();
 //		echo $this->_getHelp();
 //		echo '<h1>'.$this->_getTitle().'</h1>';

Modified: trunk/gforge_base/evolvisforge-5.1/src/plugins/hudson/packaging/control/222plugin-hudson
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/plugins/hudson/packaging/control/222plugin-hudson	2012-11-06 11:26:02 UTC (rev 18744)
+++ trunk/gforge_base/evolvisforge-5.1/src/plugins/hudson/packaging/control/222plugin-hudson	2012-11-06 11:26:09 UTC (rev 18745)
@@ -1,4 +1,4 @@
 Package: @PACKAGE at -plugin-hudson
 Architecture: all
-Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, php5-cli, ${misc:Depends}, libjs-scriptaculous
+Depends: @OLDPACKAGE at -common, @OLDPACKAGE at -db-postgresql | @OLDPACKAGE at -db, @OLDPACKAGE at -web-apache2 | @OLDPACKAGE at -web, @OLDPACKAGE at -shell-postgresql | @OLDPACKAGE at -shell, php5-cli, ${misc:Depends}
 Description: collaborative development tool - Hudson plugin

Modified: trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php	2012-11-06 11:26:02 UTC (rev 18744)
+++ trunk/gforge_base/evolvisforge-5.1/src/www/include/Layout.class.php	2012-11-06 11:26:09 UTC (rev 18745)
@@ -166,8 +166,7 @@
 
 		$this->addStylesheet('/themes/css/fusionforge.css');
 
-		$this->addJavascriptEx("/scripts/prototype/prototype.js", false);
-		$this->addJavascriptEx("/scripts/scriptaculous/scriptaculous.js", false);
+		$this->addJavascriptEx("/scripts/protoaculous/protoaculous.js", false);
 		$this->addJavascriptEx("/scripts/codendi/Tooltip.js", false);
 		$this->addJavascriptEx("/scripts/codendi/LayoutManager.js", false);
 		$this->addJavascriptEx("/scripts/codendi/ReorderColumns.js", false);



More information about the evolvis-commits mailing list