[Glibc-bsd-commits] r5224 - in trunk/freebsd-libs/debian: . patches

[rmh at alioth.debian.org]

Author: rmh
Date: 2013-12-07 22:58:08 +0000 (Sat, 07 Dec 2013)
New Revision: 5224

Removed:
   trunk/freebsd-libs/debian/patches/06_libgeom.diff
Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/patches/makefiles.diff
   trunk/freebsd-libs/debian/patches/series
Log:
Leave -lbsdxml untouched (latest freebsd-glue supports it).

Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog	2013-12-07 22:51:24 UTC (rev 5223)
+++ trunk/freebsd-libs/debian/changelog	2013-12-07 22:58:08 UTC (rev 5224)
@@ -1,6 +1,7 @@
 freebsd-libs (9.2+ds2-3) UNRELEASED; urgency=low
 
   * Fetch source code securely (https) in get-orig-source.
+  * Leave -lbsdxml untouched (latest freebsd-glue supports it).
 
  -- Robert Millan <rmh at debian.org>  Sat, 07 Dec 2013 23:22:56 +0100
 

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2013-12-07 22:51:24 UTC (rev 5223)
+++ trunk/freebsd-libs/debian/control	2013-12-07 22:58:08 UTC (rev 5224)
@@ -13,7 +13,7 @@
  libexpat-dev [kfreebsd-any],
 # libncurses5-dev: needed by libalias
  libncurses5-dev [kfreebsd-any],
- freebsd-glue (>= 0.0.15~),
+ freebsd-glue (>= 0.2.5~),
 Vcs-Browser: http://anonscm.debian.org/viewvc/glibc-bsd/trunk/freebsd-libs/
 Vcs-Svn: svn://anonscm.debian.org/glibc-bsd/trunk/freebsd-libs/
 Standards-Version: 3.9.4

Deleted: trunk/freebsd-libs/debian/patches/06_libgeom.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/06_libgeom.diff	2013-12-07 22:51:24 UTC (rev 5223)
+++ trunk/freebsd-libs/debian/patches/06_libgeom.diff	2013-12-07 22:58:08 UTC (rev 5224)
@@ -1,19 +0,0 @@
---- a/lib/libgeom/Makefile
-+++ b/lib/libgeom/Makefile
-@@ -1,6 +1,7 @@
- # $FreeBSD$
- 
- LIB=	geom
-+SHLIB_MAJOR= 1
- SHLIBDIR?= /lib
- SRCS+=	geom_getxml.c
- SRCS+=	geom_stats.c
-@@ -14,7 +15,7 @@
- WARNS?=	3
- 
- DPADD=	${LIBBSDXML} ${LIBSBUF}
--LDADD=	-lbsdxml -lsbuf
-+LDADD=	-lexpat -L../libsbuf/ -lsbuf -lrt -lbsd
- 
- MAN=	libgeom.3
- 

Modified: trunk/freebsd-libs/debian/patches/makefiles.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/makefiles.diff	2013-12-07 22:51:24 UTC (rev 5223)
+++ trunk/freebsd-libs/debian/patches/makefiles.diff	2013-12-07 22:58:08 UTC (rev 5224)
@@ -1,3 +1,22 @@
+--- a/lib/libgeom/Makefile
++++ b/lib/libgeom/Makefile
+@@ -1,6 +1,7 @@
+ # $FreeBSD$
+ 
+ LIB=	geom
++SHLIB_MAJOR= 1
+ SHLIBDIR?= /lib
+ SRCS+=	geom_getxml.c
+ SRCS+=	geom_stats.c
+@@ -16,6 +17,8 @@
+ DPADD=	${LIBBSDXML} ${LIBSBUF}
+ LDADD=	-lbsdxml -lsbuf
+ 
++LDADD+=	-L../libsbuf/ -lrt -lbsd
++
+ MAN=	libgeom.3
+ 
+ MLINKS+= \
 --- a/lib/libutil/Makefile
 +++ b/lib/libutil/Makefile
 @@ -5,18 +5,22 @@

Modified: trunk/freebsd-libs/debian/patches/series
===================================================================
--- trunk/freebsd-libs/debian/patches/series	2013-12-07 22:51:24 UTC (rev 5223)
+++ trunk/freebsd-libs/debian/patches/series	2013-12-07 22:58:08 UTC (rev 5224)
@@ -9,7 +9,6 @@
 03_libsbuf.diff
 04_libkvm.diff
 05_libipx.diff
-06_libgeom.diff
 08_libdevstat.diff
 09_libusbhid.diff
 10_memstat.diff