[Glibc-bsd-commits] r5552 - trunk/kfreebsd-kernel-headers/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-09-20 02:50:34 +0000 (Sat, 20 Sep 2014)
New Revision: 5552

Modified:
   trunk/kfreebsd-kernel-headers/debian/changelog
   trunk/kfreebsd-kernel-headers/debian/rules
Log:
Replace __FreeBSD_version with __FreeBSD_kernel_version.  Fixes a
regression introduced by 10.0~1, first seen in libgtop2 2.28.5-2,
which assumes the latter to be defined when __FreeBSD_kernel__ is.
Most consumers are able to use both.


Modified: trunk/kfreebsd-kernel-headers/debian/changelog
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/changelog	2014-09-20 01:12:32 UTC (rev 5551)
+++ trunk/kfreebsd-kernel-headers/debian/changelog	2014-09-20 02:50:34 UTC (rev 5552)
@@ -4,6 +4,10 @@
   * 000_bruno_haible.diff: update sys/timex.h diff from upstream:
     - define ntptimeval as ntptimeval4 (Closes: #756786)
     - add missing extern declarations for ntp_adjtime, ntp_gettime
+  * Replace __FreeBSD_version with __FreeBSD_kernel_version.  Fixes a
+    regression introduced by 10.0~1, first seen in libgtop2 2.28.5-2,
+    which assumes the latter to be defined when __FreeBSD_kernel__ is.
+    Most consumers are able to use both.
 
  -- GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>  Sat, 20 Sep 2014 00:22:24 +0100
 

Modified: trunk/kfreebsd-kernel-headers/debian/rules
===================================================================
--- trunk/kfreebsd-kernel-headers/debian/rules	2014-09-20 01:12:32 UTC (rev 5551)
+++ trunk/kfreebsd-kernel-headers/debian/rules	2014-09-20 02:50:34 UTC (rev 5552)
@@ -45,6 +45,7 @@
 	set -e ; \
 	find sys -type f | (while read i ; do \
 	sed -i $$i \
+		-e 's/__FreeBSD_version/__FreeBSD_kernel_version/g' \
 		\
 		-e 's/defined\s*(\s*__GNUCLIKE_[A-Z_]\+\s*)/defined(__GNUC__)/g' \
 		-e 's/#\s*ifdef\s*__GNUCLIKE_[A-Z_]\+\(\s\|$$\)/#if defined(__GNUC__)/g' \