[Glibc-bsd-commits] r3446 - trunk/freebsd-libs/debian

[Guillem Jover]

Author: guillem
Date: 2011-06-15 20:08:21 +0000 (Wed, 15 Jun 2011)
New Revision: 3446

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/libusbhid-common.install
   trunk/freebsd-libs/debian/rules
Log:
Integrate svn exports of single files into the main svn export loop


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2011-06-15 19:58:06 UTC (rev 3445)
+++ trunk/freebsd-libs/debian/changelog	2011-06-15 20:08:21 UTC (rev 3446)
@@ -5,6 +5,7 @@
   * Add new libjail library packages. Based on a patch by Robert Millan.
     (Closes: #629521)
   * Update copyright holders and years in debian/copyright.
+  * Integrate svn exports of single files into the main svn export loop.
 
  -- Guillem Jover <guillem at debian.org>  Sun, 12 Jun 2011 03:27:53 +0200
 

Modified: trunk/freebsd-libs/debian/libusbhid-common.install
===================================================================
--- trunk/freebsd-libs/debian/libusbhid-common.install	2011-06-15 19:58:06 UTC (rev 3445)
+++ trunk/freebsd-libs/debian/libusbhid-common.install	2011-06-15 20:08:21 UTC (rev 3446)
@@ -1 +1 @@
-lib/libusbhid/usb_hid_usages /usr/share/misc/
+share/misc/usb_hid_usages /usr/share/misc/

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2011-06-15 19:58:06 UTC (rev 3445)
+++ trunk/freebsd-libs/debian/rules	2011-06-15 20:08:21 UTC (rev 3446)
@@ -37,17 +37,18 @@
 
 get-orig-source:
 	rm -rf $(ORIGDIR)
+	mkdir -p $(ORIGDIR)/share/misc
+	mkdir -p $(ORIGDIR)/sys/kern
+	mkdir -p $(ORIGDIR)/sys/sys
 	for i in lib/libcam lib/libdevstat lib/libgeom lib/libipx \
 	         lib/libkiconv lib/libnetgraph lib/libjail \
 	         lib/libkvm lib/libmemstat lib/libsbuf lib/libusb \
-	         lib/libusbhid sys/cam ; do \
+	         lib/libusbhid sys/cam \
+	         sys/kern/subr_sbuf.c \
+	         sys/sys/sbuf.h \
+	         share/misc/usb_hid_usages ; do \
 	    svn export $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
-	svn cat $(SVN)/share/misc/usb_hid_usages > $(ORIGDIR)/lib/libusbhid/usb_hid_usages
-	mkdir -p $(ORIGDIR)/sys/kern && \
-	    svn cat $(SVN)/sys/kern/subr_sbuf.c > $(ORIGDIR)/sys/kern/subr_sbuf.c
-	mkdir -p $(ORIGDIR)/sys/sys && \
-	    svn cat $(SVN)/sys/sys/sbuf.h > $(ORIGDIR)/sys/sys/sbuf.h
 	# Remove unused files with non GPL compatible license (eg BSD 4 clauses)
 	rm -f $(ORIGDIR)/sys/cam/scsi/scsi_ch.*
 	rm -f $(ORIGDIR)/lib/libkvm/kvm_ia64.c