From: Roland Mas <lolando@debian.org>
Date: Sun, 21 Mar 2010 21:17:47 +0000 (+0000)
Subject: Merged from 5.0: fix Debian-specific patch
X-Git-Tag: v5.1~2812
X-Git-Url: https://scm.fusionforge.org/anonscm/gitweb?p=fusionforge%2Ffusionforge.git;a=commitdiff_plain;h=5453c305b95c3f6ceebdcccf8facdec3267a7481;hp=c293334adbace630514ff6bd01c289f83d203437

Merged from 5.0: fix Debian-specific patch
---

diff --git a/gforge/debian/patches/disable-tracker-reply-by-email.dpatch b/gforge/debian/patches/disable-tracker-reply-by-email.dpatch
index ec579f90d6..6fe77a3d59 100755
--- a/gforge/debian/patches/disable-tracker-reply-by-email.dpatch
+++ b/gforge/debian/patches/disable-tracker-reply-by-email.dpatch
@@ -5,17 +5,17 @@
 ## DP: at least until this is made to work.
 
 @DPATCH@
-diff -urNad gforge~/common/tracker/Artifact.class.php gforge/common/tracker/Artifact.class.php
---- gforge~/common/tracker/Artifact.class.php	2009-05-19 10:58:03.000000000 +0200
-+++ gforge/common/tracker/Artifact.class.php	2009-05-27 18:23:22.000000000 +0200
-@@ -1346,10 +1346,6 @@
+diff -urNad '--exclude=CVS' '--exclude=.svn' '--exclude=.git' '--exclude=.arch' '--exclude=.hg' '--exclude=_darcs' '--exclude=.bzr' gforge~/common/tracker/Artifact.class.php gforge/common/tracker/Artifact.class.php
+--- gforge~/common/tracker/Artifact.class.php	2010-03-17 22:26:33.000000000 +0100
++++ gforge/common/tracker/Artifact.class.php	2010-03-21 22:15:07.000000000 +0100
+@@ -1448,10 +1448,6 @@
+ 			"\n".util_make_url ('/tracker/?func=detail&atid='. $this->ArtifactType->getID() .
  					    "&aid=". $this->getID() .
  					    "&group_id=". $this->ArtifactType->Group->getID()) .
- 			"\nOr by replying to this e-mail entering your response between the following markers: ".
+-			"\nOr by replying to this e-mail entering your response between the following markers: ".
 -			"\n".ARTIFACT_MAIL_MARKER.
 -			"\n(enter your response here, only in plain text format)".
 -			"\n".ARTIFACT_MAIL_MARKER.
--			"\n\n".
+ 			"\n\n".
  			$this->marker('status',$changes).
  			 "Status: ". $this->getStatusName() ."\n".
- 			$this->marker('priority',$changes).