[Glibc-bsd-commits] r2681 - in trunk/ufsutils/debian: . patches

[Aurelien Jarno]

Author: aurel32
Date: 2009-07-30 11:58:03 +0000 (Thu, 30 Jul 2009)
New Revision: 2681

Removed:
   trunk/ufsutils/debian/libufs2.dirs
   trunk/ufsutils/debian/libufs2.install
Modified:
   trunk/ufsutils/debian/changelog
   trunk/ufsutils/debian/control
   trunk/ufsutils/debian/patches/01_libufs.patch
   trunk/ufsutils/debian/patches/02_badsect.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_fsdb.ufs.patch
Log:
  * Remove the libufs2 library and link statically instead. It is small, not
    really usable, and anyway comes without -dev package.



Modified: trunk/ufsutils/debian/changelog
===================================================================
--- trunk/ufsutils/debian/changelog	2009-07-30 10:51:51 UTC (rev 2680)
+++ trunk/ufsutils/debian/changelog	2009-07-30 11:58:03 UTC (rev 2681)
@@ -2,8 +2,10 @@
 
   * Remove the warning in the package's description about the fact it is an
     experimental package.
+  * Remove the libufs2 library and link statically instead. It is small, not
+    really usable, and anyway comes without -dev package.
 
- -- Aurelien Jarno <aurel32 at debian.org>  Thu, 30 Jul 2009 11:31:11 +0200
+ -- Aurelien Jarno <aurel32 at debian.org>  Thu, 30 Jul 2009 13:57:13 +0200
 
 ufsutils (7.2-1) unstable; urgency=low
 

Modified: trunk/ufsutils/debian/control
===================================================================
--- trunk/ufsutils/debian/control	2009-07-30 10:51:51 UTC (rev 2680)
+++ trunk/ufsutils/debian/control	2009-07-30 11:58:03 UTC (rev 2681)
@@ -28,12 +28,3 @@
   * tunefs.ufs
   * badsect.ufs
   * ffsinfo
-
-Package: libufs2
-Architecture: any
-Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: UFS filesystem shared library
- Shared library to manage the UFS filesystem, mostly used in BSD or derived
- operating systems. This include FFS, UFS and UFS2.
-

Deleted: trunk/ufsutils/debian/libufs2.dirs
===================================================================
--- trunk/ufsutils/debian/libufs2.dirs	2009-07-30 10:51:51 UTC (rev 2680)
+++ trunk/ufsutils/debian/libufs2.dirs	2009-07-30 11:58:03 UTC (rev 2681)
@@ -1 +0,0 @@
-lib

Deleted: trunk/ufsutils/debian/libufs2.install
===================================================================
--- trunk/ufsutils/debian/libufs2.install	2009-07-30 10:51:51 UTC (rev 2680)
+++ trunk/ufsutils/debian/libufs2.install	2009-07-30 11:58:03 UTC (rev 2681)
@@ -1 +0,0 @@
-lib/lib*.so.*

Modified: trunk/ufsutils/debian/patches/01_libufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/01_libufs.patch	2009-07-30 10:51:51 UTC (rev 2680)
+++ trunk/ufsutils/debian/patches/01_libufs.patch	2009-07-30 11:58:03 UTC (rev 2681)
@@ -66,7 +66,7 @@
 ===================================================================
 --- ufsutils.orig/libufs/Makefile
 +++ ufsutils/libufs/Makefile
-@@ -1,26 +1,16 @@
+@@ -1,26 +1,17 @@
  # $FreeBSD: src/lib/libufs/Makefile,v 1.14.8.1 2009/04/15 03:14:26 kensmith Exp $
  
  LIB=	ufs
@@ -85,6 +85,7 @@
 -MLINKS+= ufs_disk_close.3 ufs_disk_fillout.3
 -MLINKS+= ufs_disk_close.3 ufs_disk_fillout_blank.3
 -MLINKS+= ufs_disk_close.3 ufs_disk_write.3
++LIB_type = static
 +ALL_CFLAGS+= -D_LIBUFS
 +ifdef LIBUFS_DEBUG
 +ALL_CFLAGS+= -D_LIBUFS_DEBUGGING

Modified: trunk/ufsutils/debian/patches/02_badsect.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_badsect.ufs.patch	2009-07-30 10:51:51 UTC (rev 2680)
+++ trunk/ufsutils/debian/patches/02_badsect.ufs.patch	2009-07-30 11:58:03 UTC (rev 2681)
@@ -16,7 +16,7 @@
 +MAN = badsect.8:badsect.ufs.8
 +
 +INCLUDES = -I../libufs
-+LDADD += -L../libufs -lufs
++LDADD += -L../libufs -lufs -lbsd
 +
 +include ../Makefile.common
  

Modified: trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch	2009-07-30 10:51:51 UTC (rev 2680)
+++ trunk/ufsutils/debian/patches/02_dumpfs.ufs.patch	2009-07-30 11:58:03 UTC (rev 2681)
@@ -27,7 +27,7 @@
 +WARNS = 0
 +MAN = dumpfs.8:dumpfs.ufs.8
 +
-+LDADD += -L../libufs/ -lufs
++LDADD += -L../libufs/ -lufs -lbsd
 +INCLUDES = -I../libufs
 +
 +include ../Makefile.common

Modified: trunk/ufsutils/debian/patches/02_ffsinfo.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_ffsinfo.patch	2009-07-30 10:51:51 UTC (rev 2680)
+++ trunk/ufsutils/debian/patches/02_ffsinfo.patch	2009-07-30 11:58:03 UTC (rev 2681)
@@ -16,7 +16,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 -lbsd
 +
 +include ../Makefile.common
  

Modified: trunk/ufsutils/debian/patches/02_fsck.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsck.ufs.patch	2009-07-30 10:51:51 UTC (rev 2680)
+++ trunk/ufsutils/debian/patches/02_fsck.ufs.patch	2009-07-30 11:58:03 UTC (rev 2681)
@@ -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 -lbsd -lfreebsd
 +INCLUDES = -I. -I../libufs -I../mount
 +
 +include ../Makefile.common

Modified: trunk/ufsutils/debian/patches/02_fsdb.ufs.patch
===================================================================
--- trunk/ufsutils/debian/patches/02_fsdb.ufs.patch	2009-07-30 10:51:51 UTC (rev 2680)
+++ trunk/ufsutils/debian/patches/02_fsdb.ufs.patch	2009-07-30 11:58:03 UTC (rev 2681)
@@ -102,7 +102,7 @@
 +MAN = fsdb.8:fsdb.ufs.8
 +SRCS = fsdb.c fsdbutil.c
 +WARNS = 0
-+LDADD += -ledit -ltermcap -L../libufs -lufs -L../fsck.ufs -lfsck.ufs
++LDADD += -ledit -ltermcap -L../libufs -lufs -lbsd -L../fsck.ufs -lfsck.ufs -lfreebsd
 +DPADD += ${LIBEDIT} ${LIBTERMCAP}
 +INCLUDES = -I../fsck.ufs