[Glibc-bsd-commits] r3534 - in trunk/kfreebsd-9/debian: . patches

[Robert Millan]

Author: rmh
Date: 2011-07-04 19:13:39 +0000 (Mon, 04 Jul 2011)
New Revision: 3534

Removed:
   trunk/kfreebsd-9/debian/patches/101_fdc_make_syntax.diff
Modified:
   trunk/kfreebsd-9/debian/changelog
   trunk/kfreebsd-9/debian/control.in
   trunk/kfreebsd-9/debian/patches/series
Log:
Remove fdc workaround, use fixed freebsd-buildutils instead.

Modified: trunk/kfreebsd-9/debian/changelog
===================================================================
--- trunk/kfreebsd-9/debian/changelog	2011-07-04 18:34:12 UTC (rev 3533)
+++ trunk/kfreebsd-9/debian/changelog	2011-07-04 19:13:39 UTC (rev 3534)
@@ -1,7 +1,5 @@
 kfreebsd-9 (9.0~svn223728-2) UNRELEASED; urgency=low
 
-  * 101_fdc_make_syntax.diff: Workaround for bug in freebsd-make (fix
-    FTBFS on i386).
   * Disable buggy 009_disable_duped_modules.diff.  It was disabling many
     more modules than built into kernel (e.g. all USB modules).
 

Modified: trunk/kfreebsd-9/debian/control.in
===================================================================
--- trunk/kfreebsd-9/debian/control.in	2011-07-04 18:34:12 UTC (rev 3533)
+++ trunk/kfreebsd-9/debian/control.in	2011-07-04 19:13:39 UTC (rev 3534)
@@ -7,6 +7,8 @@
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/kfreebsd-@major@/
 Build-Depends: debhelper (>= 5.0.0), bzip2, sharutils, flex-old | flex,
  freebsd-buildutils (>= 8.1-2) [!kfreebsd-any] | freebsd-buildutils (>= 7) [kfreebsd-any],
+# Avoid bug #632600
+ freebsd-buildutils (<= 8.2-1) | freebsd-buildutils (>= 8.2-5),
  gcc- at gcc_version@, libdb-dev,
  libbsd-dev (>= 0.3.0), pkg-config,
  libsbuf-dev, libsbuf-dev (>= 8.2-2) | kfreebsd-kernel-headers (<< 0.56),

Deleted: trunk/kfreebsd-9/debian/patches/101_fdc_make_syntax.diff
===================================================================
--- trunk/kfreebsd-9/debian/patches/101_fdc_make_syntax.diff	2011-07-04 18:34:12 UTC (rev 3533)
+++ trunk/kfreebsd-9/debian/patches/101_fdc_make_syntax.diff	2011-07-04 19:13:39 UTC (rev 3534)
@@ -1,11 +0,0 @@
---- a/sys/modules/fdc/Makefile
-+++ b/sys/modules/fdc/Makefile
-@@ -18,7 +18,7 @@
- 
- FDC_DEBUG?=	0	# 0/1
- 
--.if ${FDC_DEBUG} > 0
-+.if ${FDC_DEBUG} == 1
- 	echo "#define FDC_DEBUG 1" >> ${.TARGET}
- .endif
- 

Modified: trunk/kfreebsd-9/debian/patches/series
===================================================================
--- trunk/kfreebsd-9/debian/patches/series	2011-07-04 18:34:12 UTC (rev 3533)
+++ trunk/kfreebsd-9/debian/patches/series	2011-07-04 19:13:39 UTC (rev 3534)
@@ -6,7 +6,6 @@
 #009_disable_duped_modules.diff
 013_ip_packed.diff
 020_linker.diff 
-101_fdc_make_syntax.diff
 103_stat_pipe.diff
 #107_mount_update.diff
 108_teken_utf8_table.diff