[evolvis-commits] r15288: Update dpatch

mirabilos at evolvis.org mirabilos at evolvis.org
Mon Feb 28 23:53:30 CET 2011


Author: mirabilos
Date: 2011-02-28 23:53:30 +0100 (Mon, 28 Feb 2011)
New Revision: 15288

Modified:
   trunk/gforge_base/evolvisforge-5.1/gforge/debian/patches/use-snoopy-from-distro.dpatch
Log:
Update dpatch

Modified: trunk/gforge_base/evolvisforge-5.1/gforge/debian/patches/use-snoopy-from-distro.dpatch
===================================================================
--- trunk/gforge_base/evolvisforge-5.1/gforge/debian/patches/use-snoopy-from-distro.dpatch	2011-02-28 22:53:23 UTC (rev 15287)
+++ trunk/gforge_base/evolvisforge-5.1/gforge/debian/patches/use-snoopy-from-distro.dpatch	2011-02-28 22:53:30 UTC (rev 15288)
@@ -6,21 +6,21 @@
 ## DP: instead of shipping a local one.
 
 @DPATCH@
-diff -urNad gforge~/plugins/cvstracker/bin/post.php gforge/plugins/cvstracker/bin/post.php
---- 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 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gforge~/plugins/cvstracker/bin/post.php gforge/plugins/cvstracker/bin/post.php
+--- gforge~/plugins/cvstracker/bin/post.php	2010-06-02 17:03:55.000000000 +0200
++++ gforge/plugins/cvstracker/bin/post.php	2010-06-02 20:08:55.000000000 +0200
+@@ -33,7 +33,7 @@
  require dirname(__FILE__).'/../../env.inc.php';
- require_once ($gfconfig.'plugins/cvstracker/config.php');
+ require_once $gfwww.'include/pre.php';
  require_once ($gfcommon.'common/include/utils.php');
 -require_once ($gfplugins.'cvstracker/common/Snoopy.class.php');
 +require_once ('/usr/share/php/libphp-snoopy/Snoopy.class.php');
  
+ $cvs_binary_version = get_cvs_binary_version () ;
  
- 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-07-19 20:57:25.000000000 +0200
-+++ gforge/plugins/scmcvs/bin/aclcheck.php	2009-07-23 11:21:52.000000000 +0200
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gforge~/plugins/scmcvs/bin/aclcheck.php gforge/plugins/scmcvs/bin/aclcheck.php
+--- gforge~/plugins/scmcvs/bin/aclcheck.php	2010-05-28 15:36:11.000000000 +0200
++++ gforge/plugins/scmcvs/bin/aclcheck.php	2010-06-02 20:08:55.000000000 +0200
 @@ -31,7 +31,7 @@
  require $gfcgfile;
  require_once $gfcommon.'include/utils.php';
@@ -30,15 +30,15 @@
  
  // 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-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 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gforge~/plugins/svntracker/bin/post.php gforge/plugins/svntracker/bin/post.php
+--- gforge~/plugins/svntracker/bin/post.php	2010-06-02 16:32:18.000000000 +0200
++++ gforge/plugins/svntracker/bin/post.php	2010-06-02 20:08:55.000000000 +0200
+@@ -31,7 +31,7 @@
+  */
  
- 
- require $gfconfig.'plugins/svntracker/config.php';
+ require_once $gfwww.'include/pre.php';
 -require $gfplugins.'svntracker/common/Snoopy.class.php';
 +require '/usr/share/php/libphp-snoopy/Snoopy.class.php';
  
- if ($svn_tracker_debug) {
- 	$file = fopen($svn_tracker_debug_file,"a+");	
+ /**
+  * It returns the usage and exit program



More information about the evolvis-commits mailing list