[Fusionforge-commits] r15096 - in trunk: . src/debian/patches

Roland Mas lolando at fusionforge.org
Fri Mar 9 14:51:16 CET 2012


Author: lolando
Date: 2012-03-09 14:51:15 +0100 (Fri, 09 Mar 2012)
New Revision: 15096

Modified:
   trunk/
   trunk/src/debian/patches/disable-dav.patch
   trunk/src/debian/patches/disable-tracker-reply-by-email.patch
   trunk/src/debian/patches/production-environment.patch
   trunk/src/debian/patches/upgrade-db-location
   trunk/src/debian/patches/upgrade-db-noninteractive
   trunk/src/debian/patches/use-jquery-from-distro.patch
   trunk/src/debian/patches/use-nusoap-from-distro.patch
   trunk/src/debian/patches/use-simplepie-from-distro.patch
   trunk/src/debian/patches/use-snoopy-from-distro.patch
   trunk/src/debian/patches/use-yui-from-distro
Log:
Refreshed Debian patches

Modified: trunk/src/debian/patches/disable-dav.patch
===================================================================
--- trunk/src/debian/patches/disable-dav.patch	2012-03-08 14:07:27 UTC (rev 15095)
+++ trunk/src/debian/patches/disable-dav.patch	2012-03-09 13:51:15 UTC (rev 15096)
@@ -2,8 +2,8 @@
 Description: Disable SVN-over-WebDAV
 Index: src/plugins/scmsvn/etc/scmsvn.ini
 ===================================================================
---- src.orig/plugins/scmsvn/etc/scmsvn.ini	2011-08-03 15:14:30.181495000 +0200
-+++ src/plugins/scmsvn/etc/scmsvn.ini	2011-08-22 21:08:16.804150640 +0200
+--- src.orig/plugins/scmsvn/etc/scmsvn.ini	2012-03-09 14:49:42.271529992 +0100
++++ src/plugins/scmsvn/etc/scmsvn.ini	2012-03-09 14:50:00.375884399 +0100
 @@ -7,9 +7,9 @@
  ; is available in installation_environment = development only.
  plugin_status = valid

Modified: trunk/src/debian/patches/disable-tracker-reply-by-email.patch
===================================================================
--- trunk/src/debian/patches/disable-tracker-reply-by-email.patch	2012-03-08 14:07:27 UTC (rev 15095)
+++ trunk/src/debian/patches/disable-tracker-reply-by-email.patch	2012-03-09 13:51:15 UTC (rev 15096)
@@ -3,9 +3,9 @@
 at least until this is made to work.
 Index: src/common/tracker/Artifact.class.php
 ===================================================================
---- src.orig/common/tracker/Artifact.class.php	2011-08-22 21:07:40.557440659 +0200
-+++ src/common/tracker/Artifact.class.php	2011-08-22 21:08:08.155687398 +0200
-@@ -1541,10 +1541,6 @@
+--- src.orig/common/tracker/Artifact.class.php	2012-03-09 14:49:42.515533608 +0100
++++ src/common/tracker/Artifact.class.php	2012-03-09 14:49:59.151854974 +0100
+@@ -1563,10 +1563,6 @@
  			"\n".util_make_url ('/tracker/?func=detail&atid='. $this->ArtifactType->getID() .
  					    "&aid=". $this->getID() .
  					    "&group_id=". $this->ArtifactType->Group->getID()) .

Modified: trunk/src/debian/patches/production-environment.patch
===================================================================
--- trunk/src/debian/patches/production-environment.patch	2012-03-08 14:07:27 UTC (rev 15095)
+++ trunk/src/debian/patches/production-environment.patch	2012-03-09 13:51:15 UTC (rev 15096)
@@ -2,8 +2,8 @@
 Description: Default deployment is production, not development
 Index: src/etc/config.ini.d/debug.ini
 ===================================================================
---- src.orig/etc/config.ini.d/debug.ini	2011-08-22 16:33:30.157637214 +0200
-+++ src/etc/config.ini.d/debug.ini	2011-08-22 16:33:34.283860208 +0200
+--- src.orig/etc/config.ini.d/debug.ini	2012-03-09 14:49:40.199500696 +0100
++++ src/etc/config.ini.d/debug.ini	2012-03-09 14:50:07.876081153 +0100
 @@ -1,12 +1,12 @@
  [core]
  

Modified: trunk/src/debian/patches/upgrade-db-location
===================================================================
--- trunk/src/debian/patches/upgrade-db-location	2012-03-08 14:07:27 UTC (rev 15095)
+++ trunk/src/debian/patches/upgrade-db-location	2012-03-09 13:51:15 UTC (rev 15096)
@@ -1,8 +1,8 @@
 Index: src/db/upgrade-db.php
 ===================================================================
---- src.orig/db/upgrade-db.php	2011-09-23 17:05:35.097937435 +0200
-+++ src/db/upgrade-db.php	2011-09-23 17:08:50.415506618 +0200
-@@ -9,7 +9,7 @@
+--- src.orig/db/upgrade-db.php	2012-03-09 14:49:40.839509483 +0100
++++ src/db/upgrade-db.php	2012-03-09 14:50:06.596045595 +0100
+@@ -10,7 +10,7 @@
  require_once $gfcommon.'include/pre.php';
  require_once $gfcommon.'include/sqlparser.php';
  

Modified: trunk/src/debian/patches/upgrade-db-noninteractive
===================================================================
--- trunk/src/debian/patches/upgrade-db-noninteractive	2012-03-08 14:07:27 UTC (rev 15095)
+++ trunk/src/debian/patches/upgrade-db-noninteractive	2012-03-09 13:51:15 UTC (rev 15096)
@@ -1,8 +1,8 @@
 Index: src/db/upgrade-db.php
 ===================================================================
---- src.orig/db/upgrade-db.php	2011-09-23 17:22:49.506364544 +0200
-+++ src/db/upgrade-db.php	2011-09-23 17:23:27.404123090 +0200
-@@ -195,16 +195,7 @@
+--- src.orig/db/upgrade-db.php	2012-03-09 14:50:06.596045595 +0100
++++ src/db/upgrade-db.php	2012-03-09 14:50:07.212062603 +0100
+@@ -197,16 +197,7 @@
  		if (!$res) {
  			show(db_error()."\n");
  			show("QUERY: $query\n");

Modified: trunk/src/debian/patches/use-jquery-from-distro.patch
===================================================================
--- trunk/src/debian/patches/use-jquery-from-distro.patch	2012-03-08 14:07:27 UTC (rev 15095)
+++ trunk/src/debian/patches/use-jquery-from-distro.patch	2012-03-09 13:51:15 UTC (rev 15096)
@@ -2,8 +2,8 @@
 Description: Use JQuery as provided by the libjs-jquery Debian package
 Index: src/www/include/html.php
 ===================================================================
---- src.orig/www/include/html.php	2011-07-18 13:27:58.000000000 +0200
-+++ src/www/include/html.php	2011-08-22 21:10:24.521994301 +0200
+--- src.orig/www/include/html.php	2012-03-09 14:49:41.531519275 +0100
++++ src/www/include/html.php	2012-03-09 14:50:03.535963843 +0100
 @@ -365,7 +365,7 @@
  }
  

Modified: trunk/src/debian/patches/use-nusoap-from-distro.patch
===================================================================
--- trunk/src/debian/patches/use-nusoap-from-distro.patch	2012-03-08 14:07:27 UTC (rev 15095)
+++ trunk/src/debian/patches/use-nusoap-from-distro.patch	2012-03-09 13:51:15 UTC (rev 15096)
@@ -1,8 +1,10 @@
 Author: Olivier Berger <olivier.berger at it-sudparis.eu>
 Description: Use NUSOAP as provided by the libnusoap-php Debian package
---- src.orig/www/soap/index.php
-+++ src/www/soap/index.php
-@@ -13,7 +13,8 @@
+Index: src/www/soap/index.php
+===================================================================
+--- src.orig/www/soap/index.php	2012-03-09 14:49:41.787522930 +0100
++++ src/www/soap/index.php	2012-03-09 14:50:02.391934493 +0100
+@@ -14,7 +14,8 @@
  
  $uri = 'http://'.forge_get_config('web_host');
  // 1. include client and server

Modified: trunk/src/debian/patches/use-simplepie-from-distro.patch
===================================================================
--- trunk/src/debian/patches/use-simplepie-from-distro.patch	2012-03-08 14:07:27 UTC (rev 15095)
+++ trunk/src/debian/patches/use-simplepie-from-distro.patch	2012-03-09 13:51:15 UTC (rev 15096)
@@ -1,7 +1,9 @@
 Author: Roland Mas <lolando at debian.org>
 Description: Use SimplePie as provided by the libphp-simplepie Debian package
---- src.orig/common/rss/simplepie.inc
-+++ /dev/null
+Index: src/common/rss/simplepie.inc
+===================================================================
+--- src.orig/common/rss/simplepie.inc	2012-03-09 14:49:41.299515960 +0100
++++ /dev/null	1970-01-01 00:00:00.000000000 +0000
 @@ -1,13724 +0,0 @@
 -<?php
 -/**
@@ -13727,8 +13729,10 @@
 -}
 -
 -?>
---- src.orig/common/widget/Widget_Rss.class.php
-+++ src/common/widget/Widget_Rss.class.php
+Index: src/common/widget/Widget_Rss.class.php
+===================================================================
+--- src.orig/common/widget/Widget_Rss.class.php	2012-03-09 14:49:41.299515960 +0100
++++ src/common/widget/Widget_Rss.class.php	2012-03-09 14:50:04.803997124 +0100
 @@ -45,7 +45,7 @@
  					return idn_to_unicode($param);
  				}

Modified: trunk/src/debian/patches/use-snoopy-from-distro.patch
===================================================================
--- trunk/src/debian/patches/use-snoopy-from-distro.patch	2012-03-08 14:07:27 UTC (rev 15095)
+++ trunk/src/debian/patches/use-snoopy-from-distro.patch	2012-03-09 13:51:15 UTC (rev 15096)
@@ -1,8 +1,10 @@
 Author: Roland Mas <lolando at debian.org>
 Description: Use Snoopy as provided by the libphp-snoopy Debian package
 instead of shipping a local one.
---- src.orig/plugins/cvstracker/bin/post.php
-+++ src/plugins/cvstracker/bin/post.php
+Index: src/plugins/cvstracker/bin/post.php
+===================================================================
+--- src.orig/plugins/cvstracker/bin/post.php	2012-03-09 14:49:42.031526433 +0100
++++ src/plugins/cvstracker/bin/post.php	2012-03-09 14:50:01.243905701 +0100
 @@ -32,7 +32,7 @@
  require dirname(__FILE__).'/../../env.inc.php';
  require_once $gfcommon.'include/pre.php';
@@ -12,8 +14,10 @@
  
  $cvs_binary_version = get_cvs_binary_version () ;
  
---- src.orig/plugins/scmcvs/bin/aclcheck.php
-+++ src/plugins/scmcvs/bin/aclcheck.php
+Index: src/plugins/scmcvs/bin/aclcheck.php
+===================================================================
+--- src.orig/plugins/scmcvs/bin/aclcheck.php	2012-03-09 14:49:42.031526433 +0100
++++ src/plugins/scmcvs/bin/aclcheck.php	2012-03-09 14:50:01.247905800 +0100
 @@ -31,7 +31,7 @@
  require_once $gfcommon. 'include/pre.php';
  require_once $gfcommon.'include/utils.php';
@@ -23,8 +27,10 @@
  
  // Input cleansing
  $env_cvsroot = (string) $_ENV['CVSROOT'];
---- src.orig/plugins/svntracker/bin/post.php
-+++ src/plugins/svntracker/bin/post.php
+Index: src/plugins/svntracker/bin/post.php
+===================================================================
+--- src.orig/plugins/svntracker/bin/post.php	2012-03-09 14:49:42.031526433 +0100
++++ src/plugins/svntracker/bin/post.php	2012-03-09 14:50:01.255905998 +0100
 @@ -31,7 +31,7 @@
  
  require_once dirname(__FILE__)."/../../env.inc.php";

Modified: trunk/src/debian/patches/use-yui-from-distro
===================================================================
--- trunk/src/debian/patches/use-yui-from-distro	2012-03-08 14:07:27 UTC (rev 15095)
+++ trunk/src/debian/patches/use-yui-from-distro	2012-03-09 13:51:15 UTC (rev 15096)
@@ -1,9 +1,9 @@
 Index: src/etc/httpd.conf.d/vhost-main.inc
 ===================================================================
---- src.orig/etc/httpd.conf.d/vhost-main.inc	2011-09-19 13:53:43.627009522 +0200
-+++ src/etc/httpd.conf.d/vhost-main.inc	2011-09-19 13:54:45.464318503 +0200
-@@ -27,7 +27,7 @@
- Alias /scripts/jquery-storage/ {core/source_path}/lib/vendor/jquery-storage/
+--- src.orig/etc/httpd.conf.d/vhost-main.inc	2012-03-09 14:49:41.059512532 +0100
++++ src/etc/httpd.conf.d/vhost-main.inc	2012-03-09 14:50:05.976028594 +0100
+@@ -32,7 +32,7 @@
+ Alias /scripts/jquery-simpletreemenu/ {core/source_path}/lib/vendor/jquery-simpletreemenu/
  Alias /scripts/prototype/ {core/source_path}/lib/vendor/prototype/
  Alias /scripts/scriptaculous/ {core/source_path}/lib/vendor/scriptaculous/
 -Alias /scripts/yui/ {core/source_path}/lib/vendor/yui/build/




More information about the Fusionforge-commits mailing list