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

[Guillem Jover]

Author: guillem
Date: 2009-11-14 03:09:18 +0000 (Sat, 14 Nov 2009)
New Revision: 2828

Modified:
   trunk/freebsd-sendpr/debian/changelog
   trunk/freebsd-sendpr/debian/copyright
   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
Log:
New upstream release

Stop using tar-in-tar. (Closes: #538558)


Modified: trunk/freebsd-sendpr/debian/changelog
===================================================================
--- trunk/freebsd-sendpr/debian/changelog	2009-11-13 14:55:29 UTC (rev 2827)
+++ trunk/freebsd-sendpr/debian/changelog	2009-11-14 03:09:18 UTC (rev 2828)
@@ -1,5 +1,7 @@
-freebsd-sendpr (3.113+5.3-11) UNRELEASED; urgency=low
+freebsd-sendpr (3.113+8.0-1) UNRELEASED; urgency=low
 
+  * New upstream release.
+    - Stop using tar-in-tar. (Closes: #538558)
   * Switch to debhelper compatibility level 7.
   * Use dh_prep instead of “dh_clean -k”.
 

Modified: trunk/freebsd-sendpr/debian/copyright
===================================================================
--- trunk/freebsd-sendpr/debian/copyright	2009-11-13 14:55:29 UTC (rev 2827)
+++ trunk/freebsd-sendpr/debian/copyright	2009-11-14 03:09:18 UTC (rev 2828)
@@ -1,8 +1,10 @@
 This package was debianized by Robert Millan <rmh at debian.org> on
 Fri,  9 Jul 2004 20:34:53 +0200.
 
-It was downloaded from <http://www.freebsd.org/>
+It was downloaded from:
 
+    <svn://svn.freebsd.org/base/head/gnu/usr.bin/send-pr>
+
 Upstream Authors:
 
     Heinz G. Seidl <hgs at cygnus.com>

Modified: trunk/freebsd-sendpr/debian/patches/001_main.diff
===================================================================
--- trunk/freebsd-sendpr/debian/patches/001_main.diff	2009-11-13 14:55:29 UTC (rev 2827)
+++ trunk/freebsd-sendpr/debian/patches/001_main.diff	2009-11-14 03:09:18 UTC (rev 2828)
@@ -1,7 +1,7 @@
-Index: b/src/gnu/usr.bin/send-pr/send-pr.sh
+Index: b/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
+--- a/send-pr.sh	2008-06-08 23:53:34.000000000 +0300
++++ b/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

Modified: trunk/freebsd-sendpr/debian/patches/002_man_sendbug.patch
===================================================================
--- trunk/freebsd-sendpr/debian/patches/002_man_sendbug.patch	2009-11-13 14:55:29 UTC (rev 2827)
+++ trunk/freebsd-sendpr/debian/patches/002_man_sendbug.patch	2009-11-14 03:09:18 UTC (rev 2828)
@@ -1,7 +1,7 @@
-Index: b/src/gnu/usr.bin/send-pr/send-pr.1
+Index: b/send-pr.1
 ===================================================================
---- 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
+--- a/send-pr.1	2008-06-08 23:53:58.000000000 +0300
++++ b/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	2009-11-13 14:55:29 UTC (rev 2827)
+++ trunk/freebsd-sendpr/debian/patches/003_info_dir_section.patch	2009-11-14 03:09:18 UTC (rev 2828)
@@ -1,7 +1,7 @@
-Index: b/src/gnu/usr.bin/send-pr/doc/send-pr.texi
+Index: b/doc/send-pr.texi
 ===================================================================
---- 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
+--- a/doc/send-pr.texi	2008-06-08 23:53:58.000000000 +0300
++++ b/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	2009-11-13 14:55:29 UTC (rev 2827)
+++ trunk/freebsd-sendpr/debian/patches/004_bashims.patch	2009-11-14 03:09:18 UTC (rev 2828)
@@ -1,13 +1,15 @@
-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
+---
+ send-pr.sh |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- a/send-pr.sh
++++ b/send-pr.sh
 @@ -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
--trap 'echo "$COMMAND: Aborting ... saving unfinished PR into /tmp/pr.$$"; rm -f $REF ; mv $TEMP /tmp/pr.$$; xs=1; exit' 1 2 3 13 15
-+trap 'echo "$COMMAND: Aborting ... saving unfinished PR into /tmp/pr.$$"; rm -f $REF ; mv $TEMP /tmp/pr.$$; xs=1; exit' SIGHUP SIGINT SIGQUIT SIGPIPE SIGTERM
+-trap 'SAV=`mktemp -t pr`;echo "$COMMAND: Aborting ... saving unfinished PR into $SAV"; rm -f $REF ; mv $TEMP $SAV; xs=1; exit' 1 2 3 13 15
++trap 'SAV=`mktemp -t pr`;echo "$COMMAND: Aborting ... saving unfinished PR into $SAV"; rm -f $REF ; mv $TEMP $SAV; xs=1; exit' SIGHUP SIGINT SIGQUIT SIGPIPE SIGTERM
  
  # If they told us to use a specific file, then do so.
  if [ -n "$IN_FILE" ]; then