[Glibc-bsd-commits] r2284 - in trunk/ufsutils/debian: . patches
aurel32 at alioth.debian.org
aurel32 at alioth.debian.org
Wed Aug 6 15:21:59 UTC 2008
Author: aurel32
Date: 2008-08-06 15:21:58 +0000 (Wed, 06 Aug 2008)
New Revision: 2284
Modified:
trunk/ufsutils/debian/changelog
trunk/ufsutils/debian/patches/01_libufs.patch
trunk/ufsutils/debian/patches/02_badsect.ufs.patch
trunk/ufsutils/debian/patches/02_dump.ufs.patch
trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch
trunk/ufsutils/debian/patches/02_ffsinfo.patch
trunk/ufsutils/debian/patches/02_fsck.ufs.patch
trunk/ufsutils/debian/patches/02_growfs.ufs.patch
trunk/ufsutils/debian/patches/02_mkfs.ufs.patch
trunk/ufsutils/debian/patches/02_tunefs.ufs.patch
trunk/ufsutils/debian/rules
Log:
* debian/patches/01_libufs.patch Link libufs with libbsd.
* debian/patches/*: Use LDADD += instead of LDADD =.
Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog 2008-08-05 22:07:45 UTC (rev 2283)
+++ trunk/ufsutils/debian/changelog 2008-08-06 15:21:58 UTC (rev 2284)
@@ -1,3 +1,10 @@
+ufsutils (7.0-2) unstable; urgency=low
+
+ * debian/patches/01_libufs.patch Link libufs with libbsd.
+ * debian/patches/*: Use LDADD += instead of LDADD =.
+
+ -- Aurelien Jarno <aurel32 at debian.org> Wed, 06 Aug 2008 17:21:09 +0200
+
ufsutils (7.0-1) unstable; urgency=low
[Petr Salinger]
Modified: trunk/ufsutils/debian/patches/01_libufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/01_libufs.patch 2008-08-05 22:07:45 UTC (rev 2283)
+++ trunk/ufsutils/debian/patches/01_libufs.patch 2008-08-06 15:21:58 UTC (rev 2284)
@@ -59,7 +59,7 @@
===================================================================
--- ufsutils.orig/libufs/Makefile
+++ ufsutils/libufs/Makefile
-@@ -1,26 +1,15 @@
+@@ -1,26 +1,16 @@
# $FreeBSD: src/lib/libufs/Makefile,v 1.14 2006/10/31 21:21:48 pjd Exp $
LIB= ufs
@@ -82,6 +82,7 @@
+ifdef LIBUFS_DEBUG
+ALL_CFLAGS+= -D_LIBUFS_DEBUGGING
+endif
++LDADD += -lbsd
+INCLUDES = -I.
-WARNS?= 2
Modified: trunk/ufsutils/debian/patches/02_badsect.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_badsect.ufs.patch 2008-08-05 22:07:45 UTC (rev 2283)
+++ trunk/ufsutils/debian/patches/02_badsect.ufs.patch 2008-08-06 15:21:58 UTC (rev 2284)
@@ -17,7 +17,7 @@
+MAN = badsect.8:badsect.ufs.8
+
+INCLUDES = -I../libufs
-+LDADD = -L../libufs -lufs
++LDADD += -L../libufs -lufs
+
+include ../Makefile.common
Modified: trunk/ufsutils/debian/patches/02_dump.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_dump.ufs.patch 2008-08-05 22:07:45 UTC (rev 2283)
+++ trunk/ufsutils/debian/patches/02_dump.ufs.patch 2008-08-06 15:21:58 UTC (rev 2284)
@@ -15,7 +15,7 @@
+
+ALL_CFLAGS = -DRDUMP
+
-+LDADD = -L../libufs -lufs -L../libport -lport
++LDADD += -L../libufs -lufs -L../libport -lport
+INCLUDES = -I../include -I${CURDIR}/../../libexec/rlogind
+
+include ../Makefile.common
Modified: trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch 2008-08-05 22:07:45 UTC (rev 2283)
+++ trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch 2008-08-06 15:21:58 UTC (rev 2284)
@@ -28,7 +28,7 @@
+WARNS = 0
+MAN = dumpfs.8:dumpfs.ufs.8
+
-+LDADD = -L../libufs/ -lufs
++LDADD += -L../libufs/ -lufs
+INCLUDES = -I../libufs
+
+include ../Makefile.common
Modified: trunk/ufsutils/debian/patches/02_ffsinfo.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_ffsinfo.patch 2008-08-05 22:07:45 UTC (rev 2283)
+++ trunk/ufsutils/debian/patches/02_ffsinfo.patch 2008-08-06 15:21:58 UTC (rev 2284)
@@ -17,7 +17,7 @@
-SRCS= ffsinfo.c debug.c
-MAN= ffsinfo.8
+ALL_CFLAGS = -DFS_DEBUG -I../growfs.ufs -I../libufs
-+LDADD = -L../libufs -lufs
++LDADD += -L../libufs -lufs
+
+include ../Makefile.common
Modified: trunk/ufsutils/debian/patches/02_fsck.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsck.ufs.patch 2008-08-05 22:07:45 UTC (rev 2283)
+++ trunk/ufsutils/debian/patches/02_fsck.ufs.patch 2008-08-06 15:21:58 UTC (rev 2284)
@@ -548,7 +548,7 @@
+ ../mount/getmntopts.c
-.PATH: ${.CURDIR}/../../sys/ufs/ffs ${.CURDIR}/../mount
-+LDADD = -L../libport -lport -L. -l$(LIB) -L../libufs -lufs
++LDADD += -L../libport -lport -L. -l$(LIB) -L../libufs -lufs
+INCLUDES = -I. -I../libufs -I../mount
+
+include ../Makefile.common
Modified: trunk/ufsutils/debian/patches/02_growfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_growfs.ufs.patch 2008-08-05 22:07:45 UTC (rev 2283)
+++ trunk/ufsutils/debian/patches/02_growfs.ufs.patch 2008-08-06 15:21:58 UTC (rev 2284)
@@ -72,7 +72,7 @@
+endif
+
+WARNS = 6
-+LDADD = -L../libufs -lufs
++LDADD += -L../libufs -lufs
+INCLUDES =
-.if defined(GFSDBG)
Modified: trunk/ufsutils/debian/patches/02_mkfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_mkfs.ufs.patch 2008-08-05 22:07:45 UTC (rev 2283)
+++ trunk/ufsutils/debian/patches/02_mkfs.ufs.patch 2008-08-06 15:21:58 UTC (rev 2284)
@@ -126,7 +126,7 @@
+MAN = newfs.8:mkfs.ufs.8
-.include <bsd.prog.mk>
-+LDADD = -L../libufs -lufs -L../libdisklabel -ldisklabel -L../libport -lport -lbsd
++LDADD += -L../libufs -lufs -L../libdisklabel -ldisklabel -L../libport -lport -lbsd
+INCLUDES = -I../libufs \
+ -include port/blockdev.h
+
Modified: trunk/ufsutils/debian/patches/02_tunefs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_tunefs.ufs.patch 2008-08-05 22:07:45 UTC (rev 2283)
+++ trunk/ufsutils/debian/patches/02_tunefs.ufs.patch 2008-08-06 15:21:58 UTC (rev 2284)
@@ -76,7 +76,7 @@
+SRCS = tunefs.c
+MAN = tunefs.8:tunefs.ufs.8
+
-+LDADD = -L../libufs -lufs -lbsd
++LDADD += -L../libufs -lufs -lbsd
+INCLUDES = -I../libufs
+
+include ../Makefile.common
Modified: trunk/ufsutils/debian/rules
===================================================================
--- trunk/ufsutils/debian/rules 2008-08-05 22:07:45 UTC (rev 2283)
+++ trunk/ufsutils/debian/rules 2008-08-06 15:21:58 UTC (rev 2284)
@@ -24,7 +24,6 @@
CFLAGS += -D_FILE_OFFSET_BITS=64 -I$(CURDIR)/freebsd
endif
-
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
CFLAGS += -O0
else
@@ -101,11 +100,7 @@
dh_makeshlibs
dh_installdeb
dh_shlibdeps -ldebian/$(libufs)/usr/lib -L$(libufs)
-ifeq (kfreebsd,$(DEB_HOST_ARCH_OS))
- dh_gencontrol -- -DPriority=required
-else
dh_gencontrol
-endif
dh_md5sums
dh_builddeb
More information about the Glibc-bsd-commits
mailing list