[Glibc-bsd-commits] r4656 - trunk/zfsutils/debian/patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-06-30 23:18:44 +0000 (Sun, 30 Jun 2013)
New Revision: 4656

Modified:
   trunk/zfsutils/debian/patches/series
Log:
12_freebsd.diff is merged upstream now

Modified: trunk/zfsutils/debian/patches/series
===================================================================
--- trunk/zfsutils/debian/patches/series	2013-06-29 18:26:38 UTC (rev 4655)
+++ trunk/zfsutils/debian/patches/series	2013-06-30 23:18:44 UTC (rev 4656)
@@ -1,3 +1,6 @@
+# Patches from (or merged in) upstream
+12_freebsd.diff
+
 # Mergeable material
 gratuitous_dependencies.diff
 #manpage_hyphens.diff
@@ -2,3 +5,3 @@
 
-# Unclassified
+# Other patches that might or might not be mergeable
 01_glibc_kludge.diff
@@ -10,13 +13,12 @@
 06_mountd.diff
 09_xdr_control.diff
 11_endian.diff
-12_freebsd.diff
 13_mnttab.diff
 14_bootloader_advice.diff
 15_pthread_compat.diff
 16-wrap-cdefs.diff
 
-# Debian-specific
+# Patches that are likely to be Debian-specific
 makefile.diff
 #manpage_debian_specifics.diff
 libmd_static.diff