[Glibc-bsd-commits] r5618 - in trunk/freebsd-utils/debian: . patches

[stevenc-guest at alioth.debian.org]

Author: stevenc-guest
Date: 2014-10-08 22:55:49 +0000 (Wed, 08 Oct 2014)
New Revision: 5618

Removed:
   trunk/freebsd-utils/debian/patches/mk_tests.diff
Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/series
   trunk/freebsd-utils/debian/rules
Log:
* Delete patch mk_tests.diff: freebsd-mk now provides MK_TESTS
* No longer try to override MK_TESTS in debian/rules (default is "no")


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2014-10-08 20:53:02 UTC (rev 5617)
+++ trunk/freebsd-utils/debian/changelog	2014-10-08 22:55:49 UTC (rev 5618)
@@ -1,3 +1,10 @@
+freebsd-utils (10.1~svn272167-2) UNRELEASED; urgency=medium
+
+  * Delete patch mk_tests.diff: freebsd-mk now provides MK_TESTS
+  * No longer try to override MK_TESTS in debian/rules (default is "no")
+
+ -- Steven Chamberlain <steven at pyro.eu.org>  Wed, 08 Oct 2014 22:18:48 +0100
+
 freebsd-utils (10.1~svn272167-1) unstable; urgency=low
 
   [ Steven Chamberlain ]

Deleted: trunk/freebsd-utils/debian/patches/mk_tests.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/mk_tests.diff	2014-10-08 20:53:02 UTC (rev 5617)
+++ trunk/freebsd-utils/debian/patches/mk_tests.diff	2014-10-08 22:55:49 UTC (rev 5618)
@@ -1,25 +0,0 @@
-Don't use MK_TESTS yet:  freebsd-buildutils >> 10.1~ will add it;
-it defaults to "no" anyway.
-
---- a/src/sbin/devd/Makefile
-+++ b/src/sbin/devd/Makefile
-@@ -30,8 +30,4 @@
- 
- CLEANFILES= y.output
- 
--.if ${MK_TESTS} != "no"
--SUBDIR+=    tests
--.endif
--
- .include <bsd.prog.mk>
---- a/src/sbin/mdconfig/Makefile
-+++ b/src/sbin/mdconfig/Makefile
-@@ -8,8 +8,4 @@
- DPADD=	${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} 
- LDADD=	-lgeom
- 
--.if ${MK_TESTS} != "no"
--SUBDIR+=    tests
--.endif
--
- .include <bsd.prog.mk>

Modified: trunk/freebsd-utils/debian/patches/series
===================================================================
--- trunk/freebsd-utils/debian/patches/series	2014-10-08 20:53:02 UTC (rev 5617)
+++ trunk/freebsd-utils/debian/patches/series	2014-10-08 22:55:49 UTC (rev 5618)
@@ -36,6 +36,5 @@
 
 # Patches that are likely to be Debian-specific
 makefiles.diff
-mk_tests.diff
 netstat_maddrs.diff
 netstat_oqdrops.diff

Modified: trunk/freebsd-utils/debian/rules
===================================================================
--- trunk/freebsd-utils/debian/rules	2014-10-08 20:53:02 UTC (rev 5617)
+++ trunk/freebsd-utils/debian/rules	2014-10-08 22:55:49 UTC (rev 5618)
@@ -52,7 +52,7 @@
 	MAKEFLAGS=$(BSD_MAKEFLAGS) \
 	MAKEOBJDIRPREFIX=$(CURDIR)/obj-deb \
 	CFLAGS="$(CFLAGS)" \
-	NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO MK_TESTS=no\
+	NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO \
 	DESTDIR="$(DESTDIR)" \
 	make -C src $(PMAKE_FLAGS)
 PMAKE_UDEB = \