[Fusionforge-commits] r8013 - trunk/gforge/debian/patches

Roland Mas lolando at libremir.placard.fr.eu.org
Thu Aug 27 15:44:57 CEST 2009


Author: lolando
Date: 2009-08-27 15:44:57 +0200 (Thu, 27 Aug 2009)
New Revision: 8013

Modified:
   trunk/gforge/debian/patches/disable-dav.dpatch
   trunk/gforge/debian/patches/use-snoopy-from-distro.dpatch
Log:
Removing cruft from dpatches

Modified: trunk/gforge/debian/patches/disable-dav.dpatch
===================================================================
--- trunk/gforge/debian/patches/disable-dav.dpatch	2009-08-27 13:44:46 UTC (rev 8012)
+++ trunk/gforge/debian/patches/disable-dav.dpatch	2009-08-27 13:44:57 UTC (rev 8013)
@@ -5,30 +5,9 @@
 ## DP: Disable SVN-over-WebDAV
 
 @DPATCH@
-diff -urNad gforge~/plugins/cvstracker/bin/post.php.rej gforge/plugins/cvstracker/bin/post.php.rej
---- gforge~/plugins/cvstracker/bin/post.php.rej	2009-07-23 11:14:00.000000000 +0200
-+++ gforge/plugins/cvstracker/bin/post.php.rej	1970-01-01 01:00:00.000000000 +0100
-@@ -1,17 +0,0 @@
--***************
--*** 33,39 ****
--   
--  //require ('local.inc'); we don´t need this file. also, in some installations this file cannot be accessed by the caller (perms problem)
--  require $gfconfig.'plugins/cvstracker/config.php';
--- require $gfplugins.'cvstracker/common/Snoopy.class.php';
--  
--  
--  if ($cvs_binary_version != "1.12" &&
----- 33,39 ----
--   
--  //require ('local.inc'); we don´t need this file. also, in some installations this file cannot be accessed by the caller (perms problem)
--  require $gfconfig.'plugins/cvstracker/config.php';
--+ require '/usr/share/php/libphp-snoopy/Snoopy.class.php';
--  
--  
--  if ($cvs_binary_version != "1.12" &&
 diff -urNad gforge~/plugins/scmsvn/etc/plugins/scmsvn/config.php gforge/plugins/scmsvn/etc/plugins/scmsvn/config.php
 --- gforge~/plugins/scmsvn/etc/plugins/scmsvn/config.php	2009-07-23 11:07:34.000000000 +0200
-+++ gforge/plugins/scmsvn/etc/plugins/scmsvn/config.php	2009-07-23 11:14:10.000000000 +0200
++++ gforge/plugins/scmsvn/etc/plugins/scmsvn/config.php	2009-07-23 11:22:37.000000000 +0200
 @@ -7,10 +7,10 @@
  } else {
  	$default_svn_server = 'scm';

Modified: trunk/gforge/debian/patches/use-snoopy-from-distro.dpatch
===================================================================
--- trunk/gforge/debian/patches/use-snoopy-from-distro.dpatch	2009-08-27 13:44:46 UTC (rev 8012)
+++ trunk/gforge/debian/patches/use-snoopy-from-distro.dpatch	2009-08-27 13:44:57 UTC (rev 8013)
@@ -7,8 +7,8 @@
 
 @DPATCH@
 diff -urNad gforge~/plugins/cvstracker/bin/post.php gforge/plugins/cvstracker/bin/post.php
---- gforge~/plugins/cvstracker/bin/post.php	2009-06-07 14:20:47.000000000 +0200
-+++ gforge/plugins/cvstracker/bin/post.php	2009-06-07 17:24:09.000000000 +0200
+--- gforge~/plugins/cvstracker/bin/post.php	2009-07-19 20:57:25.000000000 +0200
++++ gforge/plugins/cvstracker/bin/post.php	2009-07-23 11:21:52.000000000 +0200
 @@ -34,7 +34,7 @@
  require dirname(__FILE__).'/../../env.inc.php';
  require_once ($gfconfig.'plugins/cvstracker/config.php');
@@ -18,33 +18,12 @@
  
  
  if ($cvs_binary_version != "1.12" &&
-diff -urNad gforge~/plugins/cvstracker/bin/post.php.rej gforge/plugins/cvstracker/bin/post.php.rej
---- gforge~/plugins/cvstracker/bin/post.php.rej	1970-01-01 01:00:00.000000000 +0100
-+++ gforge/plugins/cvstracker/bin/post.php.rej	2009-06-07 17:22:33.000000000 +0200
-@@ -0,0 +1,17 @@
-+***************
-+*** 33,39 ****
-+   
-+  //require ('local.inc'); we don´t need this file. also, in some installations this file cannot be accessed by the caller (perms problem)
-+  require $gfconfig.'plugins/cvstracker/config.php';
-+- require $gfplugins.'cvstracker/common/Snoopy.class.php';
-+  
-+  
-+  if ($cvs_binary_version != "1.12" &&
-+--- 33,39 ----
-+   
-+  //require ('local.inc'); we don´t need this file. also, in some installations this file cannot be accessed by the caller (perms problem)
-+  require $gfconfig.'plugins/cvstracker/config.php';
-++ require '/usr/share/php/libphp-snoopy/Snoopy.class.php';
-+  
-+  
-+  if ($cvs_binary_version != "1.12" &&
 diff -urNad gforge~/plugins/scmcvs/bin/aclcheck.php gforge/plugins/scmcvs/bin/aclcheck.php
---- gforge~/plugins/scmcvs/bin/aclcheck.php	2009-06-02 20:33:08.000000000 +0200
-+++ gforge/plugins/scmcvs/bin/aclcheck.php	2009-06-07 17:22:33.000000000 +0200
-@@ -30,7 +30,7 @@
- require_once dirname(__FILE__).'/../../env.inc.php';
- require_once $gfwww.'include/squal_pre.php';
+--- gforge~/plugins/scmcvs/bin/aclcheck.php	2009-07-19 20:57:25.000000000 +0200
++++ gforge/plugins/scmcvs/bin/aclcheck.php	2009-07-23 11:21:52.000000000 +0200
+@@ -31,7 +31,7 @@
+ require $gfcgfile;
+ require_once $gfcommon.'include/utils.php';
  require_once $gfconfig.'plugins/scmcvs/config.php';
 -require $gfplugins.'scmcvs/common/Snoopy.class.php';
 +require '/usr/share/php/libphp-snoopy/Snoopy.class.php';
@@ -52,8 +31,8 @@
  // Input cleansing
  $env_cvsroot = (string) $_ENV['CVSROOT'];
 diff -urNad gforge~/plugins/svntracker/bin/post.php gforge/plugins/svntracker/bin/post.php
---- gforge~/plugins/svntracker/bin/post.php	2009-05-15 18:55:18.000000000 +0200
-+++ gforge/plugins/svntracker/bin/post.php	2009-06-07 17:22:33.000000000 +0200
+--- gforge~/plugins/svntracker/bin/post.php	2009-07-19 20:57:25.000000000 +0200
++++ gforge/plugins/svntracker/bin/post.php	2009-07-23 11:21:52.000000000 +0200
 @@ -32,7 +32,7 @@
  
  




More information about the Fusionforge-commits mailing list