[Glibc-bsd-commits] r5990 - trunk/kfreebsd-10/debian

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2016-04-10 14:05:10 +0000 (Sun, 10 Apr 2016)
New Revision: 5990

Modified:
   trunk/kfreebsd-10/debian/changelog
   trunk/kfreebsd-10/debian/rules
Log:
Sync up with actual 10.3~svn296998-2 upload


Modified: trunk/kfreebsd-10/debian/changelog
===================================================================
--- trunk/kfreebsd-10/debian/changelog	2016-04-10 14:00:13 UTC (rev 5989)
+++ trunk/kfreebsd-10/debian/changelog	2016-04-10 14:05:10 UTC (rev 5990)
@@ -14,13 +14,15 @@
 
 kfreebsd-10 (10.3~svn296998-2) experimental; urgency=medium
 
+  [ Steven Chamberlain ]
   * Experimentally build all arches with GCC for now (Closes: #813727)
   * Disable Stack Smashing Protection when building with GCC
     (see #819754)
   * Prevent improper #include of mm_malloc.h by GCC headers
-  * Add lintian override for "embedded-library" (zfs.ko) since kernel
-    code cannot link against zlib.
 
+  [ Christoph Egger ]
+  * Also install zlib lintian override for zfs.ko
+
  -- Steven Chamberlain <steven at pyro.eu.org>  Fri, 01 Apr 2016 22:24:32 +0100
 
 kfreebsd-10 (10.3~svn296998-1) experimental; urgency=medium

Modified: trunk/kfreebsd-10/debian/rules
===================================================================
--- trunk/kfreebsd-10/debian/rules	2016-04-10 14:00:13 UTC (rev 5989)
+++ trunk/kfreebsd-10/debian/rules	2016-04-10 14:05:10 UTC (rev 5990)
@@ -429,6 +429,7 @@
 		install -p -o root -g root -m 644 \
 			debian/zlib-modules.overrides \
 			$(CURDIR)/debian/zlib-modules-$(version)-$(abiname)-$${subarch}-di/usr/share/lintian/overrides/zlib-modules-$(version)-$(abiname)-$${subarch}-di ; \
+		# override file \n\
 		mkdir -p $(CURDIR)/debian/zfs-modules-$(version)-$(abiname)-$${subarch}-di/usr/share/lintian/overrides ; \
 		install -p -o root -g root -m 644 \
 			debian/zfs-modules.overrides \