[Glibc-bsd-commits] r3830 - trunk/zfsutils/debian
Arno Töll
atoell-guest at alioth.debian.org
Tue Nov 8 19:20:40 UTC 2011
Author: atoell-guest
Date: 2011-11-08 19:20:40 +0000 (Tue, 08 Nov 2011)
New Revision: 3830
Removed:
trunk/zfsutils/debian/libnvpair-dev.install
trunk/zfsutils/debian/libnvpair-dev.links
trunk/zfsutils/debian/libumem-dev.install
trunk/zfsutils/debian/libumem-dev.links
trunk/zfsutils/debian/libuutil-dev.install
trunk/zfsutils/debian/libuutil-dev.links
trunk/zfsutils/debian/libzfs-dev.install
trunk/zfsutils/debian/libzfs-dev.links
trunk/zfsutils/debian/libzpool-dev.install
trunk/zfsutils/debian/libzpool-dev.links
Modified:
trunk/zfsutils/debian/control
Log:
Convert my name to UTF-8, remove XC- prefix from udebs, remove -dev packages, improve package descriptions, add versioned library dependencies. WARNING: This commit breaks grub for the time being, do not upload it yet.
Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control 2011-11-06 20:43:59 UTC (rev 3829)
+++ trunk/zfsutils/debian/control 2011-11-08 19:20:40 UTC (rev 3830)
@@ -2,7 +2,7 @@
Section: admin
Priority: optional
Maintainer: GNU/kFreeBSD Maintainers <debian-bsd at lists.debian.org>
-Uploaders: Aurelien Jarno <aurel32 at debian.org>, Robert Millan <rmh at debian.org>, Arno Töll <debian at toell.net>
+Uploaders: Aurelien Jarno <aurel32 at debian.org>, Robert Millan <rmh at debian.org>, Arno Töll <debian at toell.net>
Dm-Upload-Allowed: yes
Build-Depends: debhelper (>= 7.0.50~), freebsd-buildutils, libbsd-dev (>= 0.1.4),
libc0.1-dev (>= 2.10), kfreebsd-kernel-headers (>= 0.51), libgeom-dev, libsbuf-dev,
@@ -18,20 +18,12 @@
Description: OpenSolaris userland utility library
This package contains the OpenSolaris userland utility library.
-Package: libuutil-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libuutil0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
-Description: Development files for libuutil
- This package contains the header files and static library needed to
- compile applications that use libuutil.
-
Package: libuutil1-udeb
-XC-Package-Type: udeb
+Package-Type: udeb
Section: debian-installer
Architecture: kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris userland utility library
+Description: OpenSolaris userland utility library (debian-installer version)
This package contains the OpenSolaris userland utility library.
.
This is a minimal package for use in debian-installer.
@@ -44,20 +36,12 @@
This package contains the OpenSolaris libnvpair library, for managing
name-value pairs.
-Package: libnvpair-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libnvpair0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
-Description: Development files for libnvpair
- This package contains the header files and static library needed to
- compile applications that use libnvpair, a library to manage name-value pairs.
-
Package: libnvpair1-udeb
Package-Type: udeb
Section: debian-installer
Architecture: kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris name-value pair library (udeb version)
+Description: OpenSolaris name-value pair library (debian-installer version)
This package contains the OpenSolaris libnvpair library, for managing
name-value pairs.
.
@@ -73,22 +57,12 @@
.
The ZFS library provides support for managing ZFS filesystems.
-Package: libzfs-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libzfs0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
-Description: Development files for libzfs
- The ZFS library provides support for managing ZFS filesystems.
- .
- This package contains the header files and static library needed to
- compile applications that use libzfs.
-
Package: libzfs1-udeb
Package-Type: udeb
Section: debian-installer
Architecture: kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris ZFS library (udeb version)
+Description: OpenSolaris ZFS library (debian-installer version)
The Z file system is a pooled filesystem designed for maximum data integrity,
supporting data snapshots, multiple copies, and data checksums.
.
@@ -98,7 +72,15 @@
Package: zfsutils
Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+# We really need to declare those dependencies manually. Upstream adds happily symbols
+# without providing any version informations for symbols or bumping SONAMES Since those libraries are
+# supposed to used within this source package only, we declare a hard dependency to come
+# over problems like #645305.
+# dpkg-shlibdeps can't help us here, because it only can create unversioned
+# dependencies.
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libuutil1 (= ${binary:Version}), libnvpair1 (= ${binary:Version}),
+ libzfs1 (= ${binary:Version}), libumem1 (= ${binary:Version}), libzpool1 (= ${binary:Version})
# Require GRUB with ZFS v28 support to ensure "zpool upgrade" doesn't render
# system unbootable.
Breaks: grub-common (<< 1.99~20101210-1~)
@@ -113,8 +95,10 @@
Package-Type: udeb
Section: debian-installer
Architecture: kfreebsd-any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: command-line tools to manage ZFS filesystems (udeb version)
+Depends: ${shlibs:Depends}, ${misc:Depends},
+ libuutil1 (= ${binary:Version}), libnvpair1 (= ${binary:Version}),
+ libzfs1 (= ${binary:Version}), libumem1 (= ${binary:Version}), libzpool1 (= ${binary:Version})
+Description: command-line tools to manage ZFS filesystems (debian-installer version)
The Z file system is a pooled filesystem designed for maximum data integrity,
supporting data snapshots, multiple copies, and data checksums.
.
@@ -128,51 +112,34 @@
Section: libs
Architecture: kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris name-value pair library
+Description: OpenSolaris memory-management library
This package contains the OpenSolaris libumem library, to detect
memory management bugs in applications
-Package: libumem-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libumem0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
-Description: Development files for libnvpair
- This package contains the header files and static library needed to
- compile applications that use libumem.
-
Package: libumem1-udeb
-XC-Package-Type: udeb
+Package-Type: udeb
Section: debian-installer
Architecture: kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris name-value pair library
+Description: OpenSolaris memory-management library (debian-installer version)
This package contains the OpenSolaris libumem library, to detect
memory management bugs in applications
+ .
+ This is a minimal package for use in debian-installer.
-
Package: libzpool1
Section: libs
Architecture: kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris name-value pair library
+Description: OpenSolaris interface library to manage ZFS storage pools
This package contains the OpenSolaris libzpool library.
- .
- This is a minimal package for use in debian-installer.
-Package: libzpool-dev
-Section: libdevel
-Architecture: kfreebsd-any
-Depends: libzpool0 (= ${binary:Version}), ${misc:Depends}, libc0.1-dev | libc-dev
-Description: Development files for libnvpair
- This package contains the header files and static library needed to
- compile applications that use libzpool.
-
Package: libzpool1-udeb
-XC-Package-Type: udeb
+Package-Type: udeb
Section: debian-installer
Architecture: kfreebsd-any
Depends: ${shlibs:Depends}, ${misc:Depends}
-Description: OpenSolaris name-value pair library
+Description: OpenSolaris interface library to manage ZFS storage pools (debian-installer version)
This package contains the OpenSolaris libzpool library.
.
This is a minimal package for use in debian-installer.
Deleted: trunk/zfsutils/debian/libnvpair-dev.install
===================================================================
--- trunk/zfsutils/debian/libnvpair-dev.install 2011-11-06 20:43:59 UTC (rev 3829)
+++ trunk/zfsutils/debian/libnvpair-dev.install 2011-11-08 19:20:40 UTC (rev 3830)
@@ -1 +0,0 @@
-cddl/lib/libnvpair/libnvpair.a usr/lib
Deleted: trunk/zfsutils/debian/libnvpair-dev.links
===================================================================
--- trunk/zfsutils/debian/libnvpair-dev.links 2011-11-06 20:43:59 UTC (rev 3829)
+++ trunk/zfsutils/debian/libnvpair-dev.links 2011-11-08 19:20:40 UTC (rev 3830)
@@ -1 +0,0 @@
-lib/libnvpair.so.0 usr/lib/libnvpair.so
Deleted: trunk/zfsutils/debian/libumem-dev.install
===================================================================
--- trunk/zfsutils/debian/libumem-dev.install 2011-11-06 20:43:59 UTC (rev 3829)
+++ trunk/zfsutils/debian/libumem-dev.install 2011-11-08 19:20:40 UTC (rev 3830)
@@ -1 +0,0 @@
-cddl/lib/libumem/libumem.a usr/lib
Deleted: trunk/zfsutils/debian/libumem-dev.links
===================================================================
--- trunk/zfsutils/debian/libumem-dev.links 2011-11-06 20:43:59 UTC (rev 3829)
+++ trunk/zfsutils/debian/libumem-dev.links 2011-11-08 19:20:40 UTC (rev 3830)
@@ -1 +0,0 @@
-lib/libumem.so.0 usr/lib/libumem.so
Deleted: trunk/zfsutils/debian/libuutil-dev.install
===================================================================
--- trunk/zfsutils/debian/libuutil-dev.install 2011-11-06 20:43:59 UTC (rev 3829)
+++ trunk/zfsutils/debian/libuutil-dev.install 2011-11-08 19:20:40 UTC (rev 3830)
@@ -1 +0,0 @@
-cddl/lib/libuutil/libuutil.a usr/lib
Deleted: trunk/zfsutils/debian/libuutil-dev.links
===================================================================
--- trunk/zfsutils/debian/libuutil-dev.links 2011-11-06 20:43:59 UTC (rev 3829)
+++ trunk/zfsutils/debian/libuutil-dev.links 2011-11-08 19:20:40 UTC (rev 3830)
@@ -1 +0,0 @@
-lib/libuutil.so.0 usr/lib/libuutil.so
Deleted: trunk/zfsutils/debian/libzfs-dev.install
===================================================================
--- trunk/zfsutils/debian/libzfs-dev.install 2011-11-06 20:43:59 UTC (rev 3829)
+++ trunk/zfsutils/debian/libzfs-dev.install 2011-11-08 19:20:40 UTC (rev 3830)
@@ -1 +0,0 @@
-cddl/lib/libzfs/libzfs.a usr/lib
Deleted: trunk/zfsutils/debian/libzfs-dev.links
===================================================================
--- trunk/zfsutils/debian/libzfs-dev.links 2011-11-06 20:43:59 UTC (rev 3829)
+++ trunk/zfsutils/debian/libzfs-dev.links 2011-11-08 19:20:40 UTC (rev 3830)
@@ -1 +0,0 @@
-lib/libzfs.so.0 usr/lib/libzfs.so
Deleted: trunk/zfsutils/debian/libzpool-dev.install
===================================================================
--- trunk/zfsutils/debian/libzpool-dev.install 2011-11-06 20:43:59 UTC (rev 3829)
+++ trunk/zfsutils/debian/libzpool-dev.install 2011-11-08 19:20:40 UTC (rev 3830)
@@ -1 +0,0 @@
-cddl/lib/libzpool/libzpool.a usr/lib
Deleted: trunk/zfsutils/debian/libzpool-dev.links
===================================================================
--- trunk/zfsutils/debian/libzpool-dev.links 2011-11-06 20:43:59 UTC (rev 3829)
+++ trunk/zfsutils/debian/libzpool-dev.links 2011-11-08 19:20:40 UTC (rev 3830)
@@ -1 +0,0 @@
-lib/libzpool.so.0 usr/lib/libzpool.so
More information about the Glibc-bsd-commits
mailing list