summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--libuutil/debian/changelog8
-rw-r--r--libuutil/debian/control4
-rw-r--r--libuutil/debian/libuutil1-dev.install2
-rw-r--r--libuutil/debian/patches/libumem-use-libsunavl.patch14
-rw-r--r--libuutil/debian/patches/series1
-rwxr-xr-xlibuutil/debian/rules3
6 files changed, 28 insertions, 4 deletions
diff --git a/libuutil/debian/changelog b/libuutil/debian/changelog
index b6bc8b8..8943e95 100644
--- a/libuutil/debian/changelog
+++ b/libuutil/debian/changelog
@@ -1,3 +1,11 @@
+libuutil (2.10-2) unstable; urgency=low
+
+ * Install libuutil_impl.h (for mdb)
+ * Strip libraries
+ * Built against libsunavl2
+
+ -- Igor Pashev <pashev.igor@gmail.com> Sun, 28 Apr 2013 18:35:52 +0400
+
libuutil (2.10-1) unstable; urgency=low
* Initial release.
diff --git a/libuutil/debian/control b/libuutil/debian/control
index 3406bc6..e96075f 100644
--- a/libuutil/debian/control
+++ b/libuutil/debian/control
@@ -4,9 +4,9 @@ Priority: optional
Maintainer: Igor Pashev <pashev.igor@gmail.com>
Build-Depends:
dh-illumos,
- gcc-multilib,
+ gcc-multilib [illumos-amd64],
illumos-source-2.10,
- lib32sunavl1-dev, libsunavl1-dev,
+ libsunavl-dev, lib32sunavl-dev [illumos-amd64],
quilt,
symlinks,
Standards-Version: 3.9.3
diff --git a/libuutil/debian/libuutil1-dev.install b/libuutil/debian/libuutil1-dev.install
index 7718587..6f5ad40 100644
--- a/libuutil/debian/libuutil1-dev.install
+++ b/libuutil/debian/libuutil1-dev.install
@@ -1,2 +1,2 @@
usr/lib/*/libuutil.so
-usr/include/libuutil.h
+usr/include/libuutil*.h
diff --git a/libuutil/debian/patches/libumem-use-libsunavl.patch b/libuutil/debian/patches/libumem-use-libsunavl.patch
new file mode 100644
index 0000000..d11e7f4
--- /dev/null
+++ b/libuutil/debian/patches/libumem-use-libsunavl.patch
@@ -0,0 +1,14 @@
+Index: libuutil/usr/src/lib/libuutil/common/libuutil_impl.h
+===================================================================
+--- libuutil.orig/usr/src/lib/libuutil/common/libuutil_impl.h 2012-10-08 04:25:42.000000000 +0400
++++ libuutil/usr/src/lib/libuutil/common/libuutil_impl.h 2013-04-28 18:38:19.117433503 +0400
+@@ -31,8 +31,8 @@
+
+ #include <libuutil.h>
+ #include <pthread.h>
++#include <libsunavl.h>
+
+-#include <sys/avl_impl.h>
+ #include <sys/byteorder.h>
+
+ #ifdef __cplusplus
diff --git a/libuutil/debian/patches/series b/libuutil/debian/patches/series
index fbcebda..e4b91c7 100644
--- a/libuutil/debian/patches/series
+++ b/libuutil/debian/patches/series
@@ -1 +1,2 @@
libuutil-use-libsunavl.patch
+libumem-use-libsunavl.patch
diff --git a/libuutil/debian/rules b/libuutil/debian/rules
index 308285b..f4a45d9 100755
--- a/libuutil/debian/rules
+++ b/libuutil/debian/rules
@@ -79,6 +79,7 @@ binary-stamp: build-stamp
dh_makeshlibs -- -c4
dh_installdeb
dh_shlibdeps
+ dh_strip
dh_gencontrol
dh_md5sums
dh_builddeb
@@ -88,5 +89,5 @@ clean: unpatch
dh_testdir
dh_testroot
dh_clean
- rm -rf usr
+ rm -rf usr .pc