[Fusionforge-commits] r8387 - in branches/Branch_4_8/gforge/debian: . patches

Roland Mas lolando at libremir.placard.fr.eu.org
Wed Nov 18 18:11:15 CET 2009


Author: lolando
Date: 2009-11-18 18:11:14 +0100 (Wed, 18 Nov 2009)
New Revision: 8387

Modified:
   branches/Branch_4_8/gforge/debian/changelog
   branches/Branch_4_8/gforge/debian/patches/use-snoopy-from-distro.dpatch
Log:
Fix problem in use-snoopy-from-distro.dpatch containing .rej changes.


Modified: branches/Branch_4_8/gforge/debian/changelog
===================================================================
--- branches/Branch_4_8/gforge/debian/changelog	2009-11-18 17:11:01 UTC (rev 8386)
+++ branches/Branch_4_8/gforge/debian/changelog	2009-11-18 17:11:14 UTC (rev 8387)
@@ -2,9 +2,10 @@
 
   * Fix copyright file to mention nusoap.
   * Fix location of Vcs-Bzr: sources repository.
+  * Fix problem in use-snoopy-from-distro.dpatch containing .rej changes.
+  
+ -- Olivier Berger <olivier.berger at it-sudparis.eu>  Sat, 14 Nov 2009 11:14:39 +0100
 
- -- Olivier Berger <olivier.berger at it-sudparis.eu>  Sat, 14 Nov 2009 11:12:30 +0100
-
 gforge (4.8.1-3) unstable; urgency=low
 
   * New upstream snapshot from the 4.8 branch.  This includes fixes for

Modified: branches/Branch_4_8/gforge/debian/patches/use-snoopy-from-distro.dpatch
===================================================================
--- branches/Branch_4_8/gforge/debian/patches/use-snoopy-from-distro.dpatch	2009-11-18 17:11:01 UTC (rev 8386)
+++ branches/Branch_4_8/gforge/debian/patches/use-snoopy-from-distro.dpatch	2009-11-18 17:11:14 UTC (rev 8387)
@@ -18,27 +18,6 @@
  
  
  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




More information about the Fusionforge-commits mailing list