[drupal/el4/master] Patch fix.

Jon Ciesla limb at fedoraproject.org
Thu Aug 12 19:12:52 UTC 2010


commit 0b1d4e1d2d8722a490dd4101b255df937acb1926
Author: Jon Ciesla <limb at jcomserv.net>
Date:   Thu Aug 12 14:12:49 2010 -0500

    Patch fix.
    
    Conflicts:
    
    	drupal-5.1-scripts-noshebang.patch

 drupal-5.1-scripts-noshebang.patch |    8 ++++----
 1 files changed, 4 insertions(+), 4 deletions(-)
---
diff --git a/drupal-5.1-scripts-noshebang.patch b/drupal-5.1-scripts-noshebang.patch
index c6fc776..e94ff60 100644
--- a/drupal-5.1-scripts-noshebang.patch
+++ b/drupal-5.1-scripts-noshebang.patch
@@ -3,7 +3,7 @@ diff -u scripts/code-clean.sh scripts.new/code-clean.sh
 +++ scripts/code-clean.sh	2007-05-30 07:19:53.000000000 -0500
 @@ -1,4 +1,3 @@
 -#!/bin/sh
- # $Id: drupal-5.1-scripts-noshebang.patch,v 1.1 2007/07/25 12:23:35 limb Exp $
+ # $Id: code-clean.sh,v 1.8 2005/08/11 13:02:08 dries Exp $
  
  find . -name "*~" -type f | xargs rm -f
 diff -u scripts/code-style.pl scripts.new/code-style.pl
@@ -11,7 +11,7 @@ diff -u scripts/code-style.pl scripts.new/code-style.pl
 +++ scripts/code-style.pl	2007-05-30 07:20:33.000000000 -0500
 @@ -1,4 +1,3 @@
 -#!/usr/bin/perl -w
- # $Id: drupal-5.1-scripts-noshebang.patch,v 1.1 2007/07/25 12:23:35 limb Exp $
+ # $Id: code-style.pl,v 1.12 2006/10/14 10:03:27 dries Exp $
  
  # Author: Alexander Schwartz (alexander.schwartz at gmx.net)
 diff -u scripts/cron-curl.sh scripts.new/cron-curl.sh
@@ -19,7 +19,7 @@ diff -u scripts/cron-curl.sh scripts.new/cron-curl.sh
 +++ scripts/cron-curl.sh	2007-05-30 07:19:57.000000000 -0500
 @@ -1,4 +1,3 @@
 -#!/bin/sh
- # $Id: drupal-5.1-scripts-noshebang.patch,v 1.1 2007/07/25 12:23:35 limb Exp $
+ # $Id: cron-curl.sh,v 1.3 2006/08/22 07:38:24 dries Exp $
  
  curl --silent --compressed http://example.com/cron.php
 diff -u scripts/cron-lynx.sh scripts.new/cron-lynx.sh
@@ -27,6 +27,6 @@ diff -u scripts/cron-lynx.sh scripts.new/cron-lynx.sh
 +++ scripts/cron-lynx.sh	2007-05-30 07:20:01.000000000 -0500
 @@ -1,4 +1,3 @@
 -#!/bin/sh
- # $Id: drupal-5.1-scripts-noshebang.patch,v 1.1 2007/07/25 12:23:35 limb Exp $
+ # $Id: cron-lynx.sh,v 1.3 2006/08/22 07:38:24 dries Exp $
  
  /usr/bin/lynx -source http://example.com/cron.php > /dev/null 2>&1


More information about the scm-commits mailing list