[Glibc-bsd-commits] r5297 - trunk/freebsd-buildutils/debian

[rmh at alioth.debian.org]

Author: rmh
Date: 2014-01-02 22:22:03 +0000 (Thu, 02 Jan 2014)
New Revision: 5297

Added:
   trunk/freebsd-buildutils/debian/freebsd-mk.dirs
Modified:
   trunk/freebsd-buildutils/debian/changelog
   trunk/freebsd-buildutils/debian/control
   trunk/freebsd-buildutils/debian/dirs
   trunk/freebsd-buildutils/debian/rules
Log:
Break circular build-dependency with freebsd-glue by splitting freebsd-mk into a package of its own.

Modified: trunk/freebsd-buildutils/debian/changelog
===================================================================
--- trunk/freebsd-buildutils/debian/changelog	2014-01-02 20:09:33 UTC (rev 5296)
+++ trunk/freebsd-buildutils/debian/changelog	2014-01-02 22:22:03 UTC (rev 5297)
@@ -1,3 +1,10 @@
+freebsd-buildutils (10.0~svn259404-5) experimental; urgency=low
+
+  * Break circular build-dependency with freebsd-glue by splitting
+    freebsd-mk into a package of its own.
+
+ -- Robert Millan <rmh at debian.org>  Thu, 02 Jan 2014 23:17:49 +0100
+
 freebsd-buildutils (10.0~svn259404-4) unstable; urgency=low
 
   * Correctly setup BSD version of MAKEFLAGS to support parallel builds.

Modified: trunk/freebsd-buildutils/debian/control
===================================================================
--- trunk/freebsd-buildutils/debian/control	2014-01-02 20:09:33 UTC (rev 5296)
+++ trunk/freebsd-buildutils/debian/control	2014-01-02 22:22:03 UTC (rev 5297)
@@ -20,6 +20,9 @@
  freebsd-glue (>= 0.2.8~),
 # Required by lex
  m4,
+# Not strictly required anymore. But let's drag it in for now, to avoid breaking
+# expectations.
+ freebsd-mk,
 Conflicts: freebsd5-buildutils, freebsd6-buildutils
 Provides: freebsd6-buildutils, freebsd7-buildutils
 Description: Utilities for building FreeBSD sources
@@ -28,3 +31,17 @@
  .
  They have some specific modifications needed to be able to build FreeBSD
  sources.
+
+Package: freebsd-mk
+Architecture: all
+Replaces: freebsd-buildutils (<< 10.0~svn259404-5~)
+Enhances: bmake
+Description: FreeBSD makefile templates for bmake
+ This package contains the makefile templates from the FreeBSD project. They
+ provide simple rules to build programs, libraries, etc.
+ .
+ These templates provide an alternative to the default makefile templates
+ shipped with bmake. If you want to enable them in your programs, simply
+ invoke bmake as follows:
+ .
+ bmake -m /usr/share/mk-freebsd

Modified: trunk/freebsd-buildutils/debian/dirs
===================================================================
--- trunk/freebsd-buildutils/debian/dirs	2014-01-02 20:09:33 UTC (rev 5296)
+++ trunk/freebsd-buildutils/debian/dirs	2014-01-02 22:22:03 UTC (rev 5297)
@@ -6,5 +6,4 @@
 usr/share/man/man8
 usr/lib
 var/db
-usr/share/mk-freebsd
 usr/lib/freebsd

Added: trunk/freebsd-buildutils/debian/freebsd-mk.dirs
===================================================================
--- trunk/freebsd-buildutils/debian/freebsd-mk.dirs	                        (rev 0)
+++ trunk/freebsd-buildutils/debian/freebsd-mk.dirs	2014-01-02 22:22:03 UTC (rev 5297)
@@ -0,0 +1 @@
+usr/share/mk-freebsd

Modified: trunk/freebsd-buildutils/debian/rules
===================================================================
--- trunk/freebsd-buildutils/debian/rules	2014-01-02 20:09:33 UTC (rev 5296)
+++ trunk/freebsd-buildutils/debian/rules	2014-01-02 22:22:03 UTC (rev 5297)
@@ -147,7 +147,7 @@
 		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/lib/freebsd ; \
 	done
 	$(PMAKE) -C build-tree/src/share/mk install \
-		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/share
+		DESTDIR=$(CURDIR)/debian/freebsd-mk BINDIR=/usr/share
 
 	$(PMAKE) -C build-tree/src/sys/dev/aic7xxx/aicasm install \
 		DESTDIR=$(CURDIR)/debian/$(package) BINDIR=/usr/bin