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

[Guillem Jover]

Author: guillem
Date: 2011-05-28 07:14:26 +0000 (Sat, 28 May 2011)
New Revision: 3337

Modified:
   trunk/freebsd-utils/debian/changelog
   trunk/freebsd-utils/debian/patches/001_dmesg.diff
   trunk/freebsd-utils/debian/patches/006_mdconfig.diff
   trunk/freebsd-utils/debian/patches/025_camcontrol.diff
Log:
Link camcontrol, mdconfig and dmesg directly to libbsd

Closes: #627129


Modified: trunk/freebsd-utils/debian/changelog
===================================================================
--- trunk/freebsd-utils/debian/changelog	2011-05-28 07:08:08 UTC (rev 3336)
+++ trunk/freebsd-utils/debian/changelog	2011-05-28 07:14:26 UTC (rev 3337)
@@ -26,6 +26,7 @@
     - Remove patch target in debian/rules.
     - Remove now unneeded README.source.
     - Refresh all patches.
+  * Link camcontrol, mdconfig and dmesg directly to libbsd. Closes: #627129
 
  -- Robert Millan <rmh at debian.org>  Wed, 09 Feb 2011 17:42:15 +0100
 

Modified: trunk/freebsd-utils/debian/patches/001_dmesg.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/001_dmesg.diff	2011-05-28 07:08:08 UTC (rev 3336)
+++ trunk/freebsd-utils/debian/patches/001_dmesg.diff	2011-05-28 07:14:26 UTC (rev 3337)
@@ -1,6 +1,7 @@
 ---
- sbin/dmesg/dmesg.c |    7 +++++--
- 1 file changed, 5 insertions(+), 2 deletions(-)
+ sbin/dmesg/Makefile |    2 +-
+ sbin/dmesg/dmesg.c  |    7 +++++--
+ 2 files changed, 6 insertions(+), 3 deletions(-)
 
 --- a/sbin/dmesg/dmesg.c
 +++ b/sbin/dmesg/dmesg.c
@@ -32,3 +33,14 @@
  		case '?':
  		default:
  			usage();
+--- a/sbin/dmesg/Makefile
++++ b/sbin/dmesg/Makefile
+@@ -6,7 +6,7 @@ MAN=	dmesg.8
+ 
+ WARNS?=	6
+ 
+-LDADD=	-lkvm
++LDADD=	-lkvm -lbsd
+ DPADD=	${LIBKVM}
+ 
+ .include <bsd.prog.mk>

Modified: trunk/freebsd-utils/debian/patches/006_mdconfig.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/006_mdconfig.diff	2011-05-28 07:08:08 UTC (rev 3336)
+++ trunk/freebsd-utils/debian/patches/006_mdconfig.diff	2011-05-28 07:14:26 UTC (rev 3337)
@@ -57,6 +57,6 @@
  
  DPADD=	${LIBUTIL} ${LIBGEOM} ${LIBBSDXML} ${LIBSBUF} 
 -LDADD=	-lutil -lgeom -lbsdxml -lsbuf
-+LDADD=	-lutil -lgeom
++LDADD=	-lutil -lgeom -lbsd
  
  .include <bsd.prog.mk>

Modified: trunk/freebsd-utils/debian/patches/025_camcontrol.diff
===================================================================
--- trunk/freebsd-utils/debian/patches/025_camcontrol.diff	2011-05-28 07:08:08 UTC (rev 3336)
+++ trunk/freebsd-utils/debian/patches/025_camcontrol.diff	2011-05-28 07:14:26 UTC (rev 3337)
@@ -1,8 +1,9 @@
 ---
+ sbin/camcontrol/Makefile     |    2 +-
  sbin/camcontrol/camcontrol.c |    9 ++++-----
  sbin/camcontrol/modeedit.c   |    6 +++---
  sbin/camcontrol/util.c       |    4 ++--
- 3 files changed, 9 insertions(+), 10 deletions(-)
+ 4 files changed, 10 insertions(+), 11 deletions(-)
 
 --- a/sbin/camcontrol/camcontrol.c
 +++ b/sbin/camcontrol/camcontrol.c
@@ -85,3 +86,14 @@
  {
  	if (verbose && name && *name)
  		printf("%s:  ", name);
+--- a/sbin/camcontrol/Makefile
++++ b/sbin/camcontrol/Makefile
+@@ -13,7 +13,7 @@ WARNS?= 3
+ WARNS?=	6
+ .endif
+ DPADD=	${LIBCAM} ${LIBSBUF} ${LIBUTIL}
+-LDADD=	-lcam -lsbuf -lutil
++LDADD=	-lcam -lsbuf -lutil -lbsd
+ MAN=	camcontrol.8
+ 
+ .include <bsd.prog.mk>