[Evolvis-commits] r199: fix unpatching↵

mirabilos at evolvis.org mirabilos at evolvis.org
Thu Nov 5 15:23:56 CET 2009


Author: mirabilos
Date: 2009-11-05 14:23:53 +0000 (Thu, 05 Nov 2009)
New Revision: 199

Modified:
   trunk/gforge_base/gforge-4.8.1+evolvis/debian/patches/use-snoopy-from-distro.dpatch
Log:
fix unpatching


Modified: trunk/gforge_base/gforge-4.8.1+evolvis/debian/patches/use-snoopy-from-distro.dpatch
===================================================================
--- trunk/gforge_base/gforge-4.8.1+evolvis/debian/patches/use-snoopy-from-distro.dpatch	2009-11-05 14:09:07 UTC (rev 198)
+++ trunk/gforge_base/gforge-4.8.1+evolvis/debian/patches/use-snoopy-from-distro.dpatch	2009-11-05 14:23:53 UTC (rev 199)
@@ -6,9 +6,9 @@
 ## DP: instead of shipping a local one.
 
 @DPATCH@
-diff -urNad gforge~/plugins/cvstracker/bin/post.php gforge/plugins/cvstracker/bin/post.php
+diff -dapruN 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-09-21 12:43:48.000000000 +0200
 @@ -34,7 +34,7 @@
  require dirname(__FILE__).'/../../env.inc.php';
  require_once ($gfconfig.'plugins/cvstracker/config.php');
@@ -18,31 +18,10 @@
  
  
  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
+diff -dapruN 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 @@
++++ gforge/plugins/scmcvs/bin/aclcheck.php	2009-09-21 12:42:56.000000000 +0200
+@@ -30,7 +30,7 @@ if (((int) $_SERVER['argc']) < 1) {
  require_once dirname(__FILE__).'/../../env.inc.php';
  require_once $gfwww.'include/squal_pre.php';
  require_once $gfconfig.'plugins/scmcvs/config.php';
@@ -51,9 +30,9 @@
  
  // Input cleansing
  $env_cvsroot = (string) $_ENV['CVSROOT'];
-diff -urNad gforge~/plugins/svntracker/bin/post.php gforge/plugins/svntracker/bin/post.php
+diff -dapruN 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-09-21 12:42:56.000000000 +0200
 @@ -32,7 +32,7 @@
  
  




More information about the evolvis-commits mailing list