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

Thu May 26 00:06:14 UTC 2011

Author: guillem
Date: 2011-05-26 00:06:14 +0000 (Thu, 26 May 2011)
New Revision: 3321

Modified:
   trunk/freebsd-sendpr/debian/changelog
   trunk/freebsd-sendpr/debian/info
   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/rules
Log:
Add get-orig-source support

As a consequence move the source code to the same path as on the
FreeBSD repository (gnu/usr.bin/sendpr/).


Modified: trunk/freebsd-sendpr/debian/changelog
===================================================================

--- trunk/freebsd-sendpr/debian/changelog	2011-05-25 20:27:33 UTC (rev 3320)
+++ trunk/freebsd-sendpr/debian/changelog	2011-05-26 00:06:14 UTC (rev 3321)
@@ -2,6 +2,8 @@
 
   * Use signal names w/o a SIG prefix, which is a bashism.
   * Now using Standards-Version 3.9.2 (no changes needed).
+  * Add get-orig-source support, and as a consequence move the source code
+    to the same path as on the FreeBSD repository (gnu/usr.bin/sendpr/).
 
  -- Guillem Jover <guillem at debian.org>  Sun, 13 Feb 2011 22:20:12 +0100
 

Modified: trunk/freebsd-sendpr/debian/info
===================================================================
--- trunk/freebsd-sendpr/debian/info	2011-05-25 20:27:33 UTC (rev 3320)
+++ trunk/freebsd-sendpr/debian/info	2011-05-26 00:06:14 UTC (rev 3321)
@@ -1 +1 @@
-doc/send-pr.info
+gnu/usr.bin/send-pr/doc/send-pr.info

Modified: trunk/freebsd-sendpr/debian/patches/001_main.diff
===================================================================
--- trunk/freebsd-sendpr/debian/patches/001_main.diff	2011-05-25 20:27:33 UTC (rev 3320)
+++ trunk/freebsd-sendpr/debian/patches/001_main.diff	2011-05-26 00:06:14 UTC (rev 3321)
@@ -1,9 +1,9 @@
 ---
- send-pr.sh |   31 +++++++++++++++++++++++--------
+ gnu/usr.bin/send-pr/send-pr.sh |   31 +++++++++++++++++++++++--------
  1 file changed, 23 insertions(+), 8 deletions(-)
 
---- a/send-pr.sh
-+++ b/send-pr.sh
+--- a/gnu/usr.bin/send-pr/send-pr.sh
++++ b/gnu/usr.bin/send-pr/send-pr.sh
 @@ -88,10 +88,12 @@ fi
  # Find out the name of the originator of this PR.
  if [ -n "$NAME" ]; then
@@ -50,7 +50,7 @@
    fi
  fi
  
-@@ -257,8 +272,8 @@ HOW_TO_REPEAT_C='<code/input/activities 
+@@ -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

Modified: trunk/freebsd-sendpr/debian/patches/002_man_sendbug.patch
===================================================================
--- trunk/freebsd-sendpr/debian/patches/002_man_sendbug.patch	2011-05-25 20:27:33 UTC (rev 3320)
+++ trunk/freebsd-sendpr/debian/patches/002_man_sendbug.patch	2011-05-26 00:06:14 UTC (rev 3321)
@@ -1,9 +1,9 @@
 ---
- send-pr.1 |    2 +-
+ gnu/usr.bin/send-pr/send-pr.1 |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/send-pr.1
-+++ b/send-pr.1
+--- a/gnu/usr.bin/send-pr/send-pr.1
++++ b/gnu/usr.bin/send-pr/send-pr.1
 @@ -26,7 +26,7 @@
  .nh
  .TH SEND-PR 1 3.113 "October 2006"

Modified: trunk/freebsd-sendpr/debian/patches/003_info_dir_section.patch
===================================================================
--- trunk/freebsd-sendpr/debian/patches/003_info_dir_section.patch	2011-05-25 20:27:33 UTC (rev 3320)
+++ trunk/freebsd-sendpr/debian/patches/003_info_dir_section.patch	2011-05-26 00:06:14 UTC (rev 3321)
@@ -1,7 +1,9 @@
-Index: b/doc/send-pr.texi
-===================================================================
---- 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
+---
+ gnu/usr.bin/send-pr/doc/send-pr.texi |    1 +
+ 1 file changed, 1 insertion(+)
+
+--- a/gnu/usr.bin/send-pr/doc/send-pr.texi
++++ b/gnu/usr.bin/send-pr/doc/send-pr.texi
 @@ -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	2011-05-25 20:27:33 UTC (rev 3320)
+++ trunk/freebsd-sendpr/debian/patches/004_bashims.patch	2011-05-26 00:06:14 UTC (rev 3321)
@@ -1,9 +1,9 @@
 ---
- send-pr.sh |    2 +-
+ gnu/usr.bin/send-pr/send-pr.sh |    2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
 
---- a/send-pr.sh
-+++ b/send-pr.sh
+--- a/gnu/usr.bin/send-pr/send-pr.sh
++++ b/gnu/usr.bin/send-pr/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

Modified: trunk/freebsd-sendpr/debian/rules
===================================================================
--- trunk/freebsd-sendpr/debian/rules	2011-05-25 20:27:33 UTC (rev 3320)
+++ trunk/freebsd-sendpr/debian/rules	2011-05-26 00:06:14 UTC (rev 3321)
@@ -5,22 +5,38 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-pkgdir := $(CURDIR)/debian/freebsd-sendpr
+PKG := freebsd-sendpr
 
+VERSION = $(shell dpkg-parsechangelog | sed -e '/^Version:/!d' -e 's/^Version: //g' -e 's/-.*//g')
+FREEBSD_VERSION = $(shell echo $(VERSION) | sed -e 's/^[^+]\++//g')
+SVN = http://svn.freebsd.org/base/release/$(FREEBSD_VERSION).0
+ORIGDIR = $(PKG)-$(VERSION)
+
+get-orig-source:
+	rm -rf $(ORIGDIR)
+	mkdir -p $(ORIGDIR)
+	for i in gnu/usr.bin/send-pr ; do \
+	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
+	done
+	tar --numeric-owner --owner 0 --group 0 -czf ../$(PKG)_$(VERSION).orig.tar.gz $(ORIGDIR)
+	rm -rf $(ORIGDIR)
+
+pkgdir := $(CURDIR)/debian/$(PKG)
+
 PMAKE := freebsd-make DESTDIR=$(pkgdir) BINDIR=/usr/bin
 
 clean:
 	dh_testdir
 	dh_testroot
 
-	$(PMAKE) clean
+	$(PMAKE) -C gnu/usr.bin/send-pr clean
 
 	dh_clean
 
 build-indep:
 	dh_testdir
 
-	$(PMAKE)
+	$(PMAKE) -C gnu/usr.bin/send-pr
 
 build-arch:
 
@@ -32,7 +48,7 @@
 	dh_prep
 	dh_installdirs
 
-	$(PMAKE) install etc-gnats-freefall
+	$(PMAKE) -C gnu/usr.bin/send-pr install etc-gnats-freefall
 	for i in $(pkgdir)/usr/share/man/man1/*.gz ; do \
 		[ -L $$i ] || gunzip $$i ; \
 	done


