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

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-10-04 18:42:51 +0000 (Sat, 04 Oct 2014)
New Revision: 5591

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/rules
Log:
* In get-orig-source, svn export with --ignore-keywords so that
  revision tags do not fuzzy the patches
* Mention the patches actually refreshed after cleanup
* Adjust revision to exactly match 10.1-RC1 branch point;  no
  differences in the source from r272500, just for consistency


Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2014-10-04 18:40:52 UTC (rev 5590)
+++ trunk/freebsd-libs/debian/changelog	2014-10-04 18:42:51 UTC (rev 5591)
@@ -1,11 +1,27 @@
-freebsd-libs (10.1~svn272500-1) UNRELEASED; urgency=medium
+freebsd-libs (10.1~svn272464-1) UNRELEASED; urgency=medium
 
-  * New upstream snapshot of 10.1 releng branch
+  [ Petr Salinger ]
+  * New upstream snapshot of 10.1-RC1
+  * Refresh patches with "a/" "b/" paths and without revision tags:
+    - cdefs_macros.diff
+    - 04_libkvm.diff
+    - 05_libipx.diff
+    - kvm_size_t_kludge.diff
+    - dwarf.diff
+    - elf.diff
+    - libusb_pthread_condattr_setclock.diff
+    - libbsd_nlist.diff
+    - assume_default_login_class.diff
+    - rlimit.diff
+    - libdwarf_off64_t.diff
+    - makefiles.diff
 
   [ Steven Chamberlain ]
   * Match up libutil.h declarations of openpty, forkpty with those in
     GNU libc pty.h, in case an application includes both (fixes FTBFS of
     ruby2.1)
+  * In get-orig-source, svn export with --ignore-keywords so that
+    revision tags do not fuzzy the patches
 
  -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Mon, 22 Sep 2014 23:11:27 +0100
 

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2014-10-04 18:40:52 UTC (rev 5590)
+++ trunk/freebsd-libs/debian/rules	2014-10-04 18:42:51 UTC (rev 5591)
@@ -81,7 +81,7 @@
 	         sys/sys/sbuf.h \
 		sys/netipx/ipx.h \
 	         share/misc/usb_hid_usages ; do \
-	    svn export -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/$$i ; \
+	    svn export --ignore-keywords -r $(svn_revision) $(SVN)/$$i $(ORIGDIR)/$$i ; \
 	done
 	# Remove unused files with non GPL compatible license (eg BSD 4 clauses)
 	rm -f $(ORIGDIR)/sys/cam/scsi/scsi_ch.*