[Glibc-bsd-commits] r3783 - trunk/zfsutils/debian

Robert Millan rmh at alioth.debian.org
Thu Oct 27 23:41:24 UTC 2011


Author: rmh
Date: 2011-10-27 23:41:24 +0000 (Thu, 27 Oct 2011)
New Revision: 3783

Added:
   trunk/zfsutils/debian/libnvpair1-udeb.install
   trunk/zfsutils/debian/libnvpair1.install
   trunk/zfsutils/debian/libumem1-udeb.install
   trunk/zfsutils/debian/libumem1.install
   trunk/zfsutils/debian/libuutil1-udeb.install
   trunk/zfsutils/debian/libuutil1.install
   trunk/zfsutils/debian/libzfs1-udeb.install
   trunk/zfsutils/debian/libzfs1.install
   trunk/zfsutils/debian/libzpool1-udeb.install
   trunk/zfsutils/debian/libzpool1.install
Removed:
   trunk/zfsutils/debian/libnvpair0-udeb.install
   trunk/zfsutils/debian/libnvpair0.install
   trunk/zfsutils/debian/libumem0-udeb.install
   trunk/zfsutils/debian/libumem0.install
   trunk/zfsutils/debian/libuutil0-udeb.install
   trunk/zfsutils/debian/libuutil0.install
   trunk/zfsutils/debian/libzfs0-udeb.install
   trunk/zfsutils/debian/libzfs0.install
   trunk/zfsutils/debian/libzpool0-udeb.install
   trunk/zfsutils/debian/libzpool0.install
Modified:
   trunk/zfsutils/debian/changelog
   trunk/zfsutils/debian/control
   trunk/zfsutils/debian/rules
Log:
Soname bump.  (Closes: #645305)

Modified: trunk/zfsutils/debian/changelog
===================================================================
--- trunk/zfsutils/debian/changelog	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/changelog	2011-10-27 23:41:24 UTC (rev 3783)
@@ -21,8 +21,9 @@
   * Add Breaks on GRUB versions that don't support ZFS v28.  Also improve
     documentation of this issue in 14_bootloader_advice.diff.
   * Link libmd statically untill a proper libmd package is available.
+  * Soname bump.  (Closes: #645305)
 
- -- Robert Millan <rmh at debian.org>  Fri, 28 Oct 2011 00:49:03 +0200
+ -- Robert Millan <rmh at debian.org>  Fri, 28 Oct 2011 01:41:03 +0200
 
 zfsutils (8.2-4) unstable; urgency=high
 

Modified: trunk/zfsutils/debian/control
===================================================================
--- trunk/zfsutils/debian/control	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/control	2011-10-27 23:41:24 UTC (rev 3783)
@@ -10,7 +10,7 @@
 Vcs-Svn: svn://svn.debian.org/glibc-bsd/trunk/zfsutils/
 Standards-Version: 3.9.2
 
-Package: libuutil0
+Package: libuutil1
 Section: libs
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -25,7 +25,7 @@
  This package contains the header files and static library needed to
  compile applications that use libuutil.
 
-Package: libuutil0-udeb
+Package: libuutil1-udeb
 XC-Package-Type: udeb
 Section: debian-installer
 Architecture: kfreebsd-any
@@ -35,7 +35,7 @@
  .
  This is a minimal package for use in debian-installer.
 
-Package: libnvpair0
+Package: libnvpair1
 Section: libs
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -51,7 +51,7 @@
  This package contains the header files and static library needed to
  compile applications that use libnvpair, a library to manage name-value pairs.
 
-Package: libnvpair0-udeb
+Package: libnvpair1-udeb
 Package-Type: udeb
 Section: debian-installer
 Architecture: kfreebsd-any
@@ -62,7 +62,7 @@
  .
  This is a minimal package for use in debian-installer.
 
-Package: libzfs0
+Package: libzfs1
 Section: libs
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -82,7 +82,7 @@
  This package contains the header files and static library needed to
  compile applications that use libzfs.
 
-Package: libzfs0-udeb
+Package: libzfs1-udeb
 Package-Type: udeb
 Section: debian-installer
 Architecture: kfreebsd-any
@@ -123,7 +123,7 @@
  This is a minimal package for use in debian-installer.
 
 
-Package: libumem0
+Package: libumem1
 Section: libs
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -139,7 +139,7 @@
  This package contains the header files and static library needed to
  compile applications that use libumem.
 
-Package: libumem0-udeb
+Package: libumem1-udeb
 XC-Package-Type: udeb
 Section: debian-installer
 Architecture: kfreebsd-any
@@ -149,7 +149,7 @@
  memory management bugs in applications
 
 
-Package: libzpool0
+Package: libzpool1
 Section: libs
 Architecture: kfreebsd-any
 Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -166,7 +166,7 @@
  This package contains the header files and static library needed to
  compile applications that use libzpool.
 
-Package: libzpool0-udeb
+Package: libzpool1-udeb
 XC-Package-Type: udeb
 Section: debian-installer
 Architecture: kfreebsd-any

Deleted: trunk/zfsutils/debian/libnvpair0-udeb.install
===================================================================
--- trunk/zfsutils/debian/libnvpair0-udeb.install	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/libnvpair0-udeb.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -1 +0,0 @@
-cddl/lib/libnvpair/libnvpair.so.0	lib

Deleted: trunk/zfsutils/debian/libnvpair0.install
===================================================================
--- trunk/zfsutils/debian/libnvpair0.install	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/libnvpair0.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -1 +0,0 @@
-cddl/lib/libnvpair/libnvpair.so.0	lib

Copied: trunk/zfsutils/debian/libnvpair1-udeb.install (from rev 3775, trunk/zfsutils/debian/libnvpair0-udeb.install)
===================================================================
--- trunk/zfsutils/debian/libnvpair1-udeb.install	                        (rev 0)
+++ trunk/zfsutils/debian/libnvpair1-udeb.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -0,0 +1 @@
+cddl/lib/libnvpair/libnvpair.so.*	lib

Copied: trunk/zfsutils/debian/libnvpair1.install (from rev 3775, trunk/zfsutils/debian/libnvpair0.install)
===================================================================
--- trunk/zfsutils/debian/libnvpair1.install	                        (rev 0)
+++ trunk/zfsutils/debian/libnvpair1.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -0,0 +1 @@
+cddl/lib/libnvpair/libnvpair.so.*	lib

Deleted: trunk/zfsutils/debian/libumem0-udeb.install
===================================================================
--- trunk/zfsutils/debian/libumem0-udeb.install	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/libumem0-udeb.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -1 +0,0 @@
-cddl/lib/libumem/libumem.so.0	lib

Deleted: trunk/zfsutils/debian/libumem0.install
===================================================================
--- trunk/zfsutils/debian/libumem0.install	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/libumem0.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -1 +0,0 @@
-cddl/lib/libumem/libumem.so.0	lib

Copied: trunk/zfsutils/debian/libumem1-udeb.install (from rev 3775, trunk/zfsutils/debian/libumem0-udeb.install)
===================================================================
--- trunk/zfsutils/debian/libumem1-udeb.install	                        (rev 0)
+++ trunk/zfsutils/debian/libumem1-udeb.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -0,0 +1 @@
+cddl/lib/libumem/libumem.so.*	lib

Copied: trunk/zfsutils/debian/libumem1.install (from rev 3775, trunk/zfsutils/debian/libumem0.install)
===================================================================
--- trunk/zfsutils/debian/libumem1.install	                        (rev 0)
+++ trunk/zfsutils/debian/libumem1.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -0,0 +1 @@
+cddl/lib/libumem/libumem.so.*	lib

Deleted: trunk/zfsutils/debian/libuutil0-udeb.install
===================================================================
--- trunk/zfsutils/debian/libuutil0-udeb.install	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/libuutil0-udeb.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -1 +0,0 @@
-cddl/lib/libuutil/libuutil.so.0	lib

Deleted: trunk/zfsutils/debian/libuutil0.install
===================================================================
--- trunk/zfsutils/debian/libuutil0.install	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/libuutil0.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -1 +0,0 @@
-cddl/lib/libuutil/libuutil.so.0	lib

Copied: trunk/zfsutils/debian/libuutil1-udeb.install (from rev 3775, trunk/zfsutils/debian/libuutil0-udeb.install)
===================================================================
--- trunk/zfsutils/debian/libuutil1-udeb.install	                        (rev 0)
+++ trunk/zfsutils/debian/libuutil1-udeb.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -0,0 +1 @@
+cddl/lib/libuutil/libuutil.so.*	lib

Copied: trunk/zfsutils/debian/libuutil1.install (from rev 3775, trunk/zfsutils/debian/libuutil0.install)
===================================================================
--- trunk/zfsutils/debian/libuutil1.install	                        (rev 0)
+++ trunk/zfsutils/debian/libuutil1.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -0,0 +1 @@
+cddl/lib/libuutil/libuutil.so.*	lib

Deleted: trunk/zfsutils/debian/libzfs0-udeb.install
===================================================================
--- trunk/zfsutils/debian/libzfs0-udeb.install	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/libzfs0-udeb.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -1 +0,0 @@
-cddl/lib/libzfs/libzfs.so.0	lib

Deleted: trunk/zfsutils/debian/libzfs0.install
===================================================================
--- trunk/zfsutils/debian/libzfs0.install	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/libzfs0.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -1 +0,0 @@
-cddl/lib/libzfs/libzfs.so.0	lib

Copied: trunk/zfsutils/debian/libzfs1-udeb.install (from rev 3775, trunk/zfsutils/debian/libzfs0-udeb.install)
===================================================================
--- trunk/zfsutils/debian/libzfs1-udeb.install	                        (rev 0)
+++ trunk/zfsutils/debian/libzfs1-udeb.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -0,0 +1 @@
+cddl/lib/libzfs/libzfs.so.*	lib

Copied: trunk/zfsutils/debian/libzfs1.install (from rev 3775, trunk/zfsutils/debian/libzfs0.install)
===================================================================
--- trunk/zfsutils/debian/libzfs1.install	                        (rev 0)
+++ trunk/zfsutils/debian/libzfs1.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -0,0 +1 @@
+cddl/lib/libzfs/libzfs.so.*	lib

Deleted: trunk/zfsutils/debian/libzpool0-udeb.install
===================================================================
--- trunk/zfsutils/debian/libzpool0-udeb.install	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/libzpool0-udeb.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -1 +0,0 @@
-cddl/lib/libzpool/libzpool.so.0	lib

Deleted: trunk/zfsutils/debian/libzpool0.install
===================================================================
--- trunk/zfsutils/debian/libzpool0.install	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/libzpool0.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -1 +0,0 @@
-cddl/lib/libzpool/libzpool.so.0	lib

Copied: trunk/zfsutils/debian/libzpool1-udeb.install (from rev 3775, trunk/zfsutils/debian/libzpool0-udeb.install)
===================================================================
--- trunk/zfsutils/debian/libzpool1-udeb.install	                        (rev 0)
+++ trunk/zfsutils/debian/libzpool1-udeb.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -0,0 +1 @@
+cddl/lib/libzpool/libzpool.so.*	lib

Copied: trunk/zfsutils/debian/libzpool1.install (from rev 3775, trunk/zfsutils/debian/libzpool0.install)
===================================================================
--- trunk/zfsutils/debian/libzpool1.install	                        (rev 0)
+++ trunk/zfsutils/debian/libzpool1.install	2011-10-27 23:41:24 UTC (rev 3783)
@@ -0,0 +1 @@
+cddl/lib/libzpool/libzpool.so.*	lib

Modified: trunk/zfsutils/debian/rules
===================================================================
--- trunk/zfsutils/debian/rules	2011-10-27 23:31:01 UTC (rev 3782)
+++ trunk/zfsutils/debian/rules	2011-10-27 23:41:24 UTC (rev 3783)
@@ -39,7 +39,7 @@
 DESTDIR = $(CURDIR)/debian/tmp
 PMAKE = COPTS="$(CFLAGS)" CFLAGS="$(CFLAGS)" NO_WERROR=1 NOGCCERROR=1 \
         NOSHARED=NO NO_SHARED=NO DESTDIR=$(DESTDIR) make
-export SHLIB_MAJOR = 0
+export SHLIB_MAJOR = 1
 export SHLIBDIR = ./
 
 get-orig-source:
@@ -187,11 +187,11 @@
 #	dh_perl
 #	dh_python
 	dh_makeshlibs -a
-	dh_makeshlibs -plibnvpair0 --add-udeb=libnvpair0-udeb
-	dh_makeshlibs -plibuutil0 --add-udeb=libuutil0-udeb
-	dh_makeshlibs -plibzfs0 --add-udeb=libzfs0-udeb
-	dh_makeshlibs -plibzpool0 --add-udeb=libzpool0-udeb
-	dh_makeshlibs -plibumem0 --add-udeb=libumem0-udeb
+	dh_makeshlibs -plibnvpair$(SHLIB_MAJOR) --add-udeb=libnvpair$(SHLIB_MAJOR)-udeb
+	dh_makeshlibs -plibuutil$(SHLIB_MAJOR) --add-udeb=libuutil$(SHLIB_MAJOR)-udeb
+	dh_makeshlibs -plibzfs$(SHLIB_MAJOR) --add-udeb=libzfs$(SHLIB_MAJOR)-udeb
+	dh_makeshlibs -plibzpool$(SHLIB_MAJOR) --add-udeb=libzpool$(SHLIB_MAJOR)-udeb
+	dh_makeshlibs -plibumem$(SHLIB_MAJOR) --add-udeb=libumem$(SHLIB_MAJOR)-udeb
 	dh_makeshlibs -pzfsutils --add-udeb=zfsutils-udeb
 	dh_installdeb -a
 	dh_shlibdeps -a




More information about the Glibc-bsd-commits mailing list