[Glibc-bsd-commits] r3437 - in trunk/freebsd-libs/debian: . patches
Guillem Jover
guillem at alioth.debian.org
Sun Jun 12 01:42:28 UTC 2011
Author: guillem
Date: 2011-06-12 01:42:27 +0000 (Sun, 12 Jun 2011)
New Revision: 3437
Added:
trunk/freebsd-libs/debian/libgeom1-udeb.install
trunk/freebsd-libs/debian/libgeom1.install
trunk/freebsd-libs/debian/libgeom1.symbols
Removed:
trunk/freebsd-libs/debian/libgeom0-udeb.install
trunk/freebsd-libs/debian/libgeom0.install
trunk/freebsd-libs/debian/libgeom0.symbols
Modified:
trunk/freebsd-libs/debian/changelog
trunk/freebsd-libs/debian/control
trunk/freebsd-libs/debian/patches/06_libgeom.diff
trunk/freebsd-libs/debian/rules
Log:
Bump libgeom SOVERSION from 0 to 1
Rename package libgeom0 to libgeom1, due to ABI changes in
?\226?\128?\152struct gprovider?\226?\128?\153.
Closes: #630107
Modified: trunk/freebsd-libs/debian/changelog
===================================================================
--- trunk/freebsd-libs/debian/changelog 2011-06-09 23:55:47 UTC (rev 3436)
+++ trunk/freebsd-libs/debian/changelog 2011-06-12 01:42:27 UTC (rev 3437)
@@ -1,3 +1,10 @@
+freebsd-libs (8.2-3) UNRELEASED; urgency=low
+
+ * Bump libgeom SOVERSION from 0 to 1 and rename package libgeom0 to
+ libgeom1, due to ABI changes in ‘struct gprovider’. (Closes: #630107)
+
+ -- Guillem Jover <guillem at debian.org> Sun, 12 Jun 2011 03:27:53 +0200
+
freebsd-libs (8.2-2) unstable; urgency=low
* Switch to use the libbsd-overlay:
Modified: trunk/freebsd-libs/debian/control
===================================================================
--- trunk/freebsd-libs/debian/control 2011-06-09 23:55:47 UTC (rev 3436)
+++ trunk/freebsd-libs/debian/control 2011-06-12 01:42:27 UTC (rev 3437)
@@ -58,7 +58,7 @@
This package contains the header files and static library needed to
compile applications that use libcam.
-Package: libgeom0
+Package: libgeom1
Architecture: kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
Description: FreeBSD GEOM library
@@ -68,12 +68,12 @@
Package: libgeom-dev
Section: libdevel
Architecture: kfreebsd-any
-Depends: libgeom0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev
+Depends: libgeom1 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev, libbsd-dev
Description: Development files for libgeom
This package contains the header files and static library needed to
compile applications that use libgeom.
-Package: libgeom0-udeb
+Package: libgeom1-udeb
Package-Type: udeb
Section: debian-installer
Architecture: kfreebsd-any
Deleted: trunk/freebsd-libs/debian/libgeom0-udeb.install
===================================================================
--- trunk/freebsd-libs/debian/libgeom0-udeb.install 2011-06-09 23:55:47 UTC (rev 3436)
+++ trunk/freebsd-libs/debian/libgeom0-udeb.install 2011-06-12 01:42:27 UTC (rev 3437)
@@ -1 +0,0 @@
-lib/libgeom*.so.*
Deleted: trunk/freebsd-libs/debian/libgeom0.install
===================================================================
--- trunk/freebsd-libs/debian/libgeom0.install 2011-06-09 23:55:47 UTC (rev 3436)
+++ trunk/freebsd-libs/debian/libgeom0.install 2011-06-12 01:42:27 UTC (rev 3437)
@@ -1 +0,0 @@
-lib/libgeom*.so.*
Deleted: trunk/freebsd-libs/debian/libgeom0.symbols
===================================================================
--- trunk/freebsd-libs/debian/libgeom0.symbols 2011-06-09 23:55:47 UTC (rev 3436)
+++ trunk/freebsd-libs/debian/libgeom0.symbols 2011-06-12 01:42:27 UTC (rev 3437)
@@ -1,33 +0,0 @@
-libgeom.so.0 libgeom0 #MINVER#
- g_close at Base 7.0
- g_delete at Base 7.0
- g_device_path at Base 8.2
- g_flush at Base 7.0
- g_get_ident at Base 7.0
- g_get_name at Base 7.0
- g_mediasize at Base 7.0
- g_open at Base 7.0
- g_open_by_ident at Base 7.0
- g_providername at Base 8.2
- g_sectorsize at Base 7.0
- g_stripeoffset at Base 8.2
- g_stripesize at Base 8.2
- gctl_dump at Base 7.0
- gctl_free at Base 7.0
- gctl_get_handle at Base 7.0
- gctl_issue at Base 7.0
- gctl_ro_param at Base 7.0
- gctl_rw_param at Base 7.0
- geom_deletetree at Base 7.0
- geom_gettree at Base 7.0
- geom_getxml at Base 7.0
- geom_lookupid at Base 7.0
- geom_stats_close at Base 7.0
- geom_stats_open at Base 7.0
- geom_stats_resync at Base 7.0
- geom_stats_snapshot_free at Base 7.0
- geom_stats_snapshot_get at Base 7.0
- geom_stats_snapshot_next at Base 7.0
- geom_stats_snapshot_reset at Base 7.0
- geom_stats_snapshot_timestamp at Base 7.0
- geom_xml2tree at Base 7.0
Copied: trunk/freebsd-libs/debian/libgeom1-udeb.install (from rev 3436, trunk/freebsd-libs/debian/libgeom0-udeb.install)
===================================================================
--- trunk/freebsd-libs/debian/libgeom1-udeb.install (rev 0)
+++ trunk/freebsd-libs/debian/libgeom1-udeb.install 2011-06-12 01:42:27 UTC (rev 3437)
@@ -0,0 +1 @@
+lib/libgeom*.so.*
Copied: trunk/freebsd-libs/debian/libgeom1.install (from rev 3436, trunk/freebsd-libs/debian/libgeom0.install)
===================================================================
--- trunk/freebsd-libs/debian/libgeom1.install (rev 0)
+++ trunk/freebsd-libs/debian/libgeom1.install 2011-06-12 01:42:27 UTC (rev 3437)
@@ -0,0 +1 @@
+lib/libgeom*.so.*
Copied: trunk/freebsd-libs/debian/libgeom1.symbols (from rev 3436, trunk/freebsd-libs/debian/libgeom0.symbols)
===================================================================
--- trunk/freebsd-libs/debian/libgeom1.symbols (rev 0)
+++ trunk/freebsd-libs/debian/libgeom1.symbols 2011-06-12 01:42:27 UTC (rev 3437)
@@ -0,0 +1,33 @@
+libgeom.so.1 libgeom1 #MINVER#
+ g_close at Base 7.0
+ g_delete at Base 7.0
+ g_device_path at Base 8.2
+ g_flush at Base 7.0
+ g_get_ident at Base 7.0
+ g_get_name at Base 7.0
+ g_mediasize at Base 7.0
+ g_open at Base 7.0
+ g_open_by_ident at Base 7.0
+ g_providername at Base 8.2
+ g_sectorsize at Base 7.0
+ g_stripeoffset at Base 8.2
+ g_stripesize at Base 8.2
+ gctl_dump at Base 7.0
+ gctl_free at Base 7.0
+ gctl_get_handle at Base 7.0
+ gctl_issue at Base 7.0
+ gctl_ro_param at Base 7.0
+ gctl_rw_param at Base 7.0
+ geom_deletetree at Base 7.0
+ geom_gettree at Base 7.0
+ geom_getxml at Base 7.0
+ geom_lookupid at Base 7.0
+ geom_stats_close at Base 7.0
+ geom_stats_open at Base 7.0
+ geom_stats_resync at Base 7.0
+ geom_stats_snapshot_free at Base 7.0
+ geom_stats_snapshot_get at Base 7.0
+ geom_stats_snapshot_next at Base 7.0
+ geom_stats_snapshot_reset at Base 7.0
+ geom_stats_snapshot_timestamp at Base 7.0
+ geom_xml2tree at Base 7.0
Modified: trunk/freebsd-libs/debian/patches/06_libgeom.diff
===================================================================
--- trunk/freebsd-libs/debian/patches/06_libgeom.diff 2011-06-09 23:55:47 UTC (rev 3436)
+++ trunk/freebsd-libs/debian/patches/06_libgeom.diff 2011-06-12 01:42:27 UTC (rev 3437)
@@ -1,16 +1,21 @@
---
- lib/libgeom/Makefile | 2 +-
+ lib/libgeom/Makefile | 3 ++-
lib/libgeom/geom_ctl.c | 3 +++
lib/libgeom/geom_stats.c | 2 +-
- lib/libgeom/geom_util.c | 1 +
lib/libgeom/geom_xml2tree.c | 2 +-
- 5 files changed, 7 insertions(+), 3 deletions(-)
+ 4 files changed, 7 insertions(+), 3 deletions(-)
-Index: freebsd-libs/lib/libgeom/Makefile
-===================================================================
---- freebsd-libs.orig/lib/libgeom/Makefile 2009-11-14 09:46:19.000000000 +0000
-+++ freebsd-libs/lib/libgeom/Makefile 2009-11-14 09:46:40.000000000 +0000
-@@ -14,7 +14,7 @@
+--- 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 @@ CFLAGS += -I${.CURDIR}
WARNS?= 3
DPADD= ${LIBBSDXML} ${LIBSBUF}
@@ -19,11 +24,9 @@
MAN= libgeom.3
-Index: freebsd-libs/lib/libgeom/geom_ctl.c
-===================================================================
---- freebsd-libs.orig/lib/libgeom/geom_ctl.c 2009-11-14 09:46:19.000000000 +0000
-+++ freebsd-libs/lib/libgeom/geom_ctl.c 2009-11-14 09:46:40.000000000 +0000
-@@ -167,6 +167,9 @@
+--- a/lib/libgeom/geom_ctl.c
++++ b/lib/libgeom/geom_ctl.c
+@@ -167,6 +167,9 @@ gctl_ro_param(struct gctl_req *req, cons
if (ap->name == NULL)
return;
ap->nlen = strlen(ap->name) + 1;
@@ -33,10 +36,8 @@
ap->value = __DECONST(void *, value);
ap->flag = GCTL_PARAM_RD;
if (len >= 0)
-Index: freebsd-libs/lib/libgeom/geom_stats.c
-===================================================================
---- freebsd-libs.orig/lib/libgeom/geom_stats.c 2009-11-14 09:46:20.000000000 +0000
-+++ freebsd-libs/lib/libgeom/geom_stats.c 2009-11-14 09:46:40.000000000 +0000
+--- a/lib/libgeom/geom_stats.c
++++ b/lib/libgeom/geom_stats.c
@@ -34,11 +34,11 @@
#include <fcntl.h>
#include <stdlib.h>
@@ -50,10 +51,8 @@
#include <sys/types.h>
#include <sys/devicestat.h>
-Index: freebsd-libs/lib/libgeom/geom_xml2tree.c
-===================================================================
---- freebsd-libs.orig/lib/libgeom/geom_xml2tree.c 2009-11-14 09:46:20.000000000 +0000
-+++ freebsd-libs/lib/libgeom/geom_xml2tree.c 2009-11-14 09:46:40.000000000 +0000
+--- a/lib/libgeom/geom_xml2tree.c
++++ b/lib/libgeom/geom_xml2tree.c
@@ -43,7 +43,7 @@
#include <sys/sbuf.h>
#include <sys/sysctl.h>
Modified: trunk/freebsd-libs/debian/rules
===================================================================
--- trunk/freebsd-libs/debian/rules 2011-06-09 23:55:47 UTC (rev 3436)
+++ trunk/freebsd-libs/debian/rules 2011-06-12 01:42:27 UTC (rev 3437)
@@ -195,7 +195,7 @@
# dh_python
dh_makeshlibs -a
ifeq ($(kernel), kfreebsd)
- dh_makeshlibs -plibgeom0 --add-udeb=libgeom0-udeb
+ dh_makeshlibs -plibgeom1 --add-udeb=libgeom1-udeb
dh_makeshlibs -plibipx2 --add-udeb=libipx2-udeb
dh_makeshlibs -plibsbuf0 --add-udeb=libsbuf0-udeb
dh_makeshlibs -plibusb2 --add-udeb=libusb2-udeb
More information about the Glibc-bsd-commits
mailing list