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

Mon Jun 23 15:51:46 UTC 2008

Author: ps-guest
Date: 2008-06-23 15:51:45 +0000 (Mon, 23 Jun 2008)
New Revision: 2188

Modified:
   trunk/freebsd-libs/debian/changelog
   trunk/freebsd-libs/debian/control
   trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff
   trunk/freebsd-libs/debian/rules
   trunk/freebsd-libs/fetch
Log:
* preliminary freebsd-libs based on 7.0


Modified: trunk/freebsd-libs/debian/changelog
===================================================================

--- trunk/freebsd-libs/debian/changelog	2008-06-23 15:50:54 UTC (rev 2187)
+++ trunk/freebsd-libs/debian/changelog	2008-06-23 15:51:45 UTC (rev 2188)
@@ -1,3 +1,14 @@
+freebsd-libs (7.0-1) UNRELEASED; urgency=low
+
+  [ Petr Salinger ]
+  * based on FreeBSD 7.0
+  * Change packages name to reflect SONAME changes:
+    - libusbhid2   -> libusbhid3
+    - libkiconv2   -> libkiconv3
+    - libdevstat5  -> libdevstat6 
+
+ -- Aurelien Jarno <aurel32 at debian.org>  Mon, 23 Jun 2008 12:00:00 +0200
+
 freebsd-libs (6.3-2) UNRELEASED; urgency=low
 
   [ Aurelien Jarno ]

Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control	2008-06-23 15:50:54 UTC (rev 2187)
+++ trunk/freebsd-libs/debian/control	2008-06-23 15:51:45 UTC (rev 2188)
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
 Uploaders: Aurelien Jarno <aurel32 at debian.org>
-Build-Depends: debhelper (>= 4.1.0), kfreebsd-source-6.3, freebsd6-buildutils, libbsd-dev, libfreebsd-dev, libgdbm-dev, kfreebsd-kernel-headers (>= 0.27), libexpat-dev 
+Build-Depends: debhelper (>= 4.1.0), kfreebsd-source-7.0, freebsd6-buildutils, libbsd-dev, libfreebsd-dev, libgdbm-dev, kfreebsd-kernel-headers (>= 0.30), libexpat-dev 
 # libexpat-dev: aka bsdxml. needed by libgeom
 Standards-Version: 3.7.3
 
@@ -53,7 +53,7 @@
  This package contains the header files and static library needed to
  compile applications that use libcam.
 
-Package: libusbhid2
+Package: libusbhid3
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}
 Description: FreeBSD library to access USB HID devices
@@ -68,7 +68,7 @@
 Package: libusbhid-dev
 Section: libdevel
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: libusbhid2 (>= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
+Depends: libusbhid3 (>= ${binary:Version}), libc0.1-dev | libc-dev, libbsd-dev
 Description: Development files for libusbhid
  This package contains the header files and static library needed to
  compile applications that use libusbhid.
@@ -88,7 +88,7 @@
  This package contains the header files and static library needed to
  compile applications that use libkvm.
 
-Package: libdevstat5
+Package: libdevstat6
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}
 Description: FreeBSD devstat (kernel interface) library
@@ -98,7 +98,7 @@
 Package: libdevstat-dev
 Section: libdevel
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: libdevstat5 (>= ${binary:Version}), libkvm-dev, libc0.1-dev | libc-dev, libfreebsd-dev, libbsd-dev
+Depends: libdevstat6 (>= ${binary:Version}), libkvm-dev, libc0.1-dev | libc-dev, libfreebsd-dev, libbsd-dev
 Description: Development files for libdevstat
  This package contains the header files and static library needed to
  compile applications that use libdevstat.
@@ -117,7 +117,7 @@
  This package contains the header files and static library needed to
  compile applications that use libipx.
 
-Package: libkiconv2
+Package: libkiconv3
 Architecture: kfreebsd-i386 kfreebsd-amd64
 Depends: ${shlibs:Depends}
 Description: FreeBSD kernel side iconv library
@@ -127,7 +127,7 @@
 Package: libkiconv-dev
 Section: libdevel
 Architecture: kfreebsd-i386 kfreebsd-amd64
-Depends: libkiconv2 (>= ${binary:Version}), libc0.1-dev | libc-dev
+Depends: libkiconv3 (>= ${binary:Version}), libc0.1-dev | libc-dev
 Description: Development files for libkiconv
  This package contains the header files and static library needed to
  compile applications that use libkiconv.

Modified: trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff	2008-06-23 15:50:54 UTC (rev 2187)
+++ trunk/freebsd-libs/debian/patches/04_glibc_libkvm.diff	2008-06-23 15:51:45 UTC (rev 2188)
@@ -1,16 +1,14 @@
 diff -ur lib.old/libkvm/Makefile lib/libkvm/Makefile
 --- lib.old/libkvm/Makefile	2006-04-19 09:43:10.000000000 +0200
 +++ lib/libkvm/Makefile	2006-04-19 09:42:15.000000000 +0200
-@@ -2,8 +2,7 @@
- # $FreeBSD: src/lib/libkvm/Makefile,v 1.14 2003/08/18 15:25:38 obrien Exp $
+@@ -3,7 +3,6 @@
  
  LIB=	kvm
--SHLIBDIR?= /lib
+ SHLIBDIR?= /lib
 -CFLAGS+=-DLIBC_SCCS -I${.CURDIR}
-+SHLIBDIR?= /lib
- SRCS=	kvm.c kvm_${MACHINE_ARCH}.c kvm_file.c kvm_getloadavg.c \
- 	kvm_getswapinfo.c kvm_proc.c
- INCS=	kvm.h
+ 
+ .if ${MACHINE} == "sun4v"
+ CFLAGS+=-DSUN4V
 diff -ur lib.old/libkvm/kvm.c lib/libkvm/kvm.c
 --- lib.old/libkvm/kvm.c	2006-04-19 09:43:10.000000000 +0200
 +++ lib/libkvm/kvm.c	2006-04-19 09:38:34.000000000 +0200
@@ -22,7 +20,7 @@
  
  #include <vm/vm.h>
  #include <vm/vm_param.h>
-@@ -62,11 +63,14 @@
+@@ -62,11 +63,16 @@
  #include <limits.h>
  #include <nlist.h>
  #include <paths.h>
@@ -32,8 +30,10 @@
  #include <string.h>
  #include <unistd.h>
  
++#ifndef _PATH_FWMEM
++#define _PATH_FWMEM     "/dev/fwmem"
++#endif
 +
-+
  #include "kvm_private.h"
  
  /* from src/lib/libc/gen/nlist.c */

Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules	2008-06-23 15:50:54 UTC (rev 2187)
+++ trunk/freebsd-libs/debian/rules	2008-06-23 15:51:45 UTC (rev 2188)
@@ -18,7 +18,7 @@
 endif
 
 SRC_DIR=src
-KERNEL_SRC=kfreebsd-source-6.3
+KERNEL_SRC=kfreebsd-source-7.0
 PATH:=/usr/lib/freebsd:$(PATH)
 DESTDIR=$(CURDIR)/debian/tmp
 PMAKE=COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
@@ -53,7 +53,7 @@
 	LDADD="-lbsd" $(PMAKE) -C $(SRC_DIR)/lib/libcam
 
 build-geom: build-sbuf $(SRC_DIR)
-	LDADD="-lfreebsd" $(PMAKE) -C $(SRC_DIR)/lib/libgeom
+	LDADD="-lbsd -lfreebsd" $(PMAKE) -C $(SRC_DIR)/lib/libgeom
 
 build-ipx: $(SRC_DIR)
 	$(PMAKE) -C $(SRC_DIR)/lib/libipx

Modified: trunk/freebsd-libs/fetch
===================================================================
--- trunk/freebsd-libs/fetch	2008-06-23 15:50:54 UTC (rev 2187)
+++ trunk/freebsd-libs/fetch	2008-06-23 15:51:45 UTC (rev 2188)
@@ -2,7 +2,7 @@
 set -ex
 
 ANONCVS=anoncvs at anoncvs.fr.freebsd.org:/home/ncvs
-RELENG=RELENG_6_3_0_RELEASE
+RELENG=RELENG_7_0_0_RELEASE
 
 rm -rf src
 


