[Pkg-zfsonlinux-devel] [SCM] zfs branch, master, updated. upstream/0.6.4.2-639-g0b24fb4

[Aron Xu]

The following commit has been merged in the master branch:
commit 0b24fb47c5041827d14f4526678c05b48c2ba2e3
Author: Aron Xu <aron at debian.org>
Date:   Tue Nov 3 00:41:28 2015 +0800

    Update shlib versions in rules

diff --git a/debian/rules b/debian/rules
index 9029b63..7a73bd4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,6 @@ VERSION := $(shell dpkg-parsechangelog \
 DKMSFILES := module include config zfs.release.in autogen.sh META AUTHORS \
 		DISCLAIMER COPYRIGHT OPENSOLARIS.LICENSE README.markdown
 
-export SHLIB_MAJOR = 1
-
 ifndef BUILD_UDEB
 BUILD_UDEB=false
 endif
@@ -102,20 +100,20 @@ override_dh_dkms:
 override_dh_makeshlibs:
 	dh_makeshlibs -a
 ifeq ($(BUILD_UDEB), true)
-	dh_makeshlibs -plibnvpair$(SHLIB_MAJOR)linux --add-udeb=libnvpair$(SHLIB_MAJOR)-udeb
-	dh_makeshlibs -plibuutil$(SHLIB_MAJOR)linux --add-udeb=libuutil$(SHLIB_MAJOR)-udeb
-	dh_makeshlibs -plibzfs$(SHLIB_MAJOR)linux --add-udeb=libzfs$(SHLIB_MAJOR)-udeb
-	dh_makeshlibs -plibzpool$(SHLIB_MAJOR)linux --add-udeb=libzpool$(SHLIB_MAJOR)-udeb
+	dh_makeshlibs -plibnvpair1linux --add-udeb=libnvpair1-udeb
+	dh_makeshlibs -plibuutil1linux --add-udeb=libuutil1-udeb
+	dh_makeshlibs -plibzfs2linux --add-udeb=libzfs2-udeb
+	dh_makeshlibs -plibzpool2linux --add-udeb=libzpool2-udeb
 	dh_makeshlibs -pzfsutils-linux --add-udeb=zfsutils-udeb
    endif
 
 override_dh_strip:
 	dh_strip --dbg-package=zfs-dbg
 ifeq ($(BUILD_UDEB), true)
-	dh_strip -plibnvpair$(SHLIB_MAJOR)-udeb
-	dh_strip -plibuutil$(SHLIB_MAJOR)-udeb
-	dh_strip -plibzfs$(SHLIB_MAJOR)-udeb
-	dh_strip -plibzpool$(SHLIB_MAJOR)-udeb
+	dh_strip -plibnvpair1-udeb
+	dh_strip -plibuutil1-udeb
+	dh_strip -plibzfs2-udeb
+	dh_strip -plibzpool2-udeb
 	dh_strip -pzfsutils-udeb
 endif
 

-- 
OpenZFS on Linux