[Glibc-bsd-commits] r2170 - in trunk/freebsd-sendpr/debian: . patches

guillem at alioth.debian.org guillem at alioth.debian.org
Sun Jun 8 20:57:34 UTC 2008 

Author: guillem
Date: 2008-06-08 20:57:33 +0000 (Sun, 08 Jun 2008)
New Revision: 2170

Modified:
   trunk/freebsd-sendpr/debian/changelog
   trunk/freebsd-sendpr/debian/patches/001_main.diff
   trunk/freebsd-sendpr/debian/patches/002_man_sendbug.patch
   trunk/freebsd-sendpr/debian/patches/003_info_dir_section.patch
   trunk/freebsd-sendpr/debian/patches/004_bashims.patch
   trunk/freebsd-sendpr/debian/patches/series
Log:
Switch all patches from -p0 to -pab

(Closes: #485249)


Modified: trunk/freebsd-sendpr/debian/changelog
===================================================================
--- trunk/freebsd-sendpr/debian/changelog	2008-06-07 15:53:30 UTC (rev 2169)
+++ trunk/freebsd-sendpr/debian/changelog	2008-06-08 20:57:33 UTC (rev 2170)
@@ -1,3 +1,9 @@
+freebsd-sendpr (3.113+5.3-9) UNRELEASED; urgency=low
+
+  * Switch all patches from -p0 to -pab. (Closes: #485249)
+
+ -- Guillem Jover <guillem at debian.org>  Sun, 08 Jun 2008 23:55:46 +0300
+
 freebsd-sendpr (3.113+5.3-8) unstable; urgency=low
 
   * Fix bashisms (closes: bug#464649)

Modified: trunk/freebsd-sendpr/debian/patches/001_main.diff
===================================================================
--- trunk/freebsd-sendpr/debian/patches/001_main.diff	2008-06-07 15:53:30 UTC (rev 2169)
+++ trunk/freebsd-sendpr/debian/patches/001_main.diff	2008-06-08 20:57:33 UTC (rev 2170)
@@ -1,7 +1,8 @@
-diff -ur src.old/gnu/usr.bin/send-pr/send-pr.sh src/gnu/usr.bin/send-pr/send-pr.sh
---- src.old/gnu/usr.bin/send-pr/send-pr.sh	2004-12-18 01:40:07.000000000 +0100
-+++ src/gnu/usr.bin/send-pr/send-pr.sh	2004-12-18 01:42:40.000000000 +0100
-@@ -88,10 +88,12 @@
+Index: b/src/gnu/usr.bin/send-pr/send-pr.sh
+===================================================================
+--- a/src/gnu/usr.bin/send-pr/send-pr.sh	2008-06-08 23:53:34.000000000 +0300
++++ b/src/gnu/usr.bin/send-pr/send-pr.sh	2008-06-08 23:54:19.000000000 +0300
+@@ -88,10 +88,12 @@ fi
  # Find out the name of the originator of this PR.
  if [ -n "$NAME" ]; then
    ORIGINATOR="$NAME"
@@ -16,7 +17,7 @@
    # Must use temp file due to incompatibilities in quoting behavior
    # and to protect shell metacharacters in the expansion of $LOGNAME
    $PW usershow $LOGNAME | awk -F: '{ print $8 }' | sed -e 's/,.*//' > $PTEMP
-@@ -99,8 +101,17 @@
+@@ -99,8 +101,17 @@ else
    rm -f $PTEMP
  fi
  
@@ -36,7 +37,7 @@
  
  if [ -n "$ORGANIZATION" ]; then
    if [ -f "$ORGANIZATION" ]; then
-@@ -111,6 +122,10 @@
+@@ -111,6 +122,10 @@ else
      ORGANIZATION="$DEFAULT_ORGANIZATION"
    elif [ -f $HOME/.organization ]; then
      ORGANIZATION="`cat $HOME/.organization`"
@@ -47,7 +48,7 @@
    fi
  fi
  
-@@ -257,8 +272,8 @@
+@@ -257,8 +272,8 @@ HOW_TO_REPEAT_C='<code/input/activities 
  FIX_C='<how to correct or work around the problem, if known (multiple lines)>'
  
  # Create temporary files, safely
@@ -58,7 +59,7 @@
  # Catch some signals. ($xs kludge needed by Sun /bin/sh)
  xs=0
  trap 'rm -f $REF $TEMP; exit $xs' 0
-@@ -492,7 +507,7 @@
+@@ -492,7 +507,7 @@ while true; do
      case "$input" in
        a*)
  	if [ -z "$BATCH" ]; then
@@ -67,7 +68,7 @@
  	  echo "$COMMAND: the problem report remains in $BAD and is not sent."
  	  mv $TEMP $BAD
          else
-@@ -574,7 +589,7 @@
+@@ -574,7 +589,7 @@ if $MAIL_AGENT < $REF; then
  else
    echo "$COMMAND: mysterious mail failure."
    if [ -z "$BATCH" ]; then

Modified: trunk/freebsd-sendpr/debian/patches/002_man_sendbug.patch
===================================================================
--- trunk/freebsd-sendpr/debian/patches/002_man_sendbug.patch	2008-06-07 15:53:30 UTC (rev 2169)
+++ trunk/freebsd-sendpr/debian/patches/002_man_sendbug.patch	2008-06-08 20:57:33 UTC (rev 2170)
@@ -1,7 +1,7 @@
-Index: src/gnu/usr.bin/send-pr/send-pr.1
+Index: b/src/gnu/usr.bin/send-pr/send-pr.1
 ===================================================================
---- src/gnu/usr.bin/send-pr/send-pr.1.orig	2007-07-17 07:26:37.000000000 +0300
-+++ src/gnu/usr.bin/send-pr/send-pr.1	2007-07-17 07:26:49.000000000 +0300
+--- a/src/gnu/usr.bin/send-pr/send-pr.1	2008-06-08 23:53:58.000000000 +0300
++++ b/src/gnu/usr.bin/send-pr/send-pr.1	2008-06-08 23:54:11.000000000 +0300
 @@ -26,7 +26,7 @@
  .nh
  .TH SEND-PR 1 3.113 "February 1993"

Modified: trunk/freebsd-sendpr/debian/patches/003_info_dir_section.patch
===================================================================
--- trunk/freebsd-sendpr/debian/patches/003_info_dir_section.patch	2008-06-07 15:53:30 UTC (rev 2169)
+++ trunk/freebsd-sendpr/debian/patches/003_info_dir_section.patch	2008-06-08 20:57:33 UTC (rev 2170)
@@ -1,7 +1,7 @@
-Index: src/gnu/usr.bin/send-pr/doc/send-pr.texi
+Index: b/src/gnu/usr.bin/send-pr/doc/send-pr.texi
 ===================================================================
---- src/gnu/usr.bin/send-pr/doc/send-pr.texi.orig	2007-07-17 07:33:15.000000000 +0300
-+++ src/gnu/usr.bin/send-pr/doc/send-pr.texi	2007-07-17 07:33:32.000000000 +0300
+--- a/src/gnu/usr.bin/send-pr/doc/send-pr.texi	2008-06-08 23:53:58.000000000 +0300
++++ b/src/gnu/usr.bin/send-pr/doc/send-pr.texi	2008-06-08 23:54:16.000000000 +0300
 @@ -9,6 +9,7 @@
  @include version.texi
  @set SENDPR

Modified: trunk/freebsd-sendpr/debian/patches/004_bashims.patch
===================================================================
--- trunk/freebsd-sendpr/debian/patches/004_bashims.patch	2008-06-07 15:53:30 UTC (rev 2169)
+++ trunk/freebsd-sendpr/debian/patches/004_bashims.patch	2008-06-08 20:57:33 UTC (rev 2170)
@@ -1,6 +1,8 @@
---- src.orig/gnu/usr.bin/send-pr/send-pr.sh
-+++ src/gnu/usr.bin/send-pr/send-pr.sh	
-@@ -277,7 +277,7 @@
+Index: b/src/gnu/usr.bin/send-pr/send-pr.sh
+===================================================================
+--- a/src/gnu/usr.bin/send-pr/send-pr.sh	2008-06-08 23:54:19.000000000 +0300
++++ b/src/gnu/usr.bin/send-pr/send-pr.sh	2008-06-08 23:54:22.000000000 +0300
+@@ -277,7 +277,7 @@ TEMP=`mktemp -t pf.XXXXXX` || exit 1
  # Catch some signals. ($xs kludge needed by Sun /bin/sh)
  xs=0
  trap 'rm -f $REF $TEMP; exit $xs' 0

Modified: trunk/freebsd-sendpr/debian/patches/series
===================================================================
--- trunk/freebsd-sendpr/debian/patches/series	2008-06-07 15:53:30 UTC (rev 2169)
+++ trunk/freebsd-sendpr/debian/patches/series	2008-06-08 20:57:33 UTC (rev 2170)
@@ -1,4 +1,4 @@
-002_man_sendbug.patch -p0
-003_info_dir_section.patch -p0
-001_main.diff -p0
-004_bashims.patch -p0
+002_man_sendbug.patch
+003_info_dir_section.patch
+001_main.diff
+004_bashims.patch

More information about the Glibc-bsd-commits mailing list