libsysevent (2.10+1) unstable; urgency=medium

  * Use native version
  * Strip binaries
  * Removed sys/sysevent_impl.h (installed by uts-dev)
  * Removed libsysevent-no-id_space.h.patch
  * Build depends on uts-dev (>= 4.3+3)

5 files changed, 17 insertions, 23 deletions

diff --git a/libsysevent/debian/changelog b/libsysevent/debian/changelog
index a8fd1d8..d109241 100644
--- a/libsysevent/debian/changelog
+++ b/libsysevent/debian/changelog
@@ -1,3 +1,13 @@
+libsysevent (2.10+1) unstable; urgency=medium
+
+  * Use native version
+  * Strip binaries
+  * Removed sys/sysevent_impl.h (installed by uts-dev)
+  * Removed libsysevent-no-id_space.h.patch
+  * Build depends on uts-dev (>= 4.3+3)
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Tue, 15 Apr 2014 13:33:16 +0400
+
 libsysevent (2.10-2) unstable; urgency=low
 
   * Use headers from uts-dev
diff --git a/libsysevent/debian/control b/libsysevent/debian/control
index b9950dd..56133d4 100644
--- a/libsysevent/debian/control
+++ b/libsysevent/debian/control
@@ -4,9 +4,10 @@ Priority: optional
 Maintainer: Igor Pashev <pashev.igor@gmail.com>
 Build-Depends:
  dh-illumos,
- gcc-multilib,
+ gcc-multilib [illumos-amd64],
  illumos-source-2.10,
- libnvpair1-dev, lib32nvpair1-dev, 
+ libnvpair1-dev, lib32nvpair1-dev [illumos-amd64],
+ uts-dev (>= 4.3+3),
  quilt,
  symlinks,
 Standards-Version: 3.9.3
@@ -33,7 +34,7 @@ Section: libdevel
 Priority: optional
 Architecture: illumos-any
 Provides: libsysevent-dev
-Depends: libsysevent1 (= ${binary:Version}), ${misc:Depends}, libc1-dev,
+Depends: libsysevent1 (= ${binary:Version}), ${misc:Depends},
  libnvpair1-dev
 Description: system event interface library (development files)
  This package contains the header files and symlinks needed
diff --git a/libsysevent/debian/patches/libsysevent-no-id_space.h.patch b/libsysevent/debian/patches/libsysevent-no-id_space.h.patch
deleted file mode 100644
index 8a8fc7e..0000000
--- a/libsysevent/debian/patches/libsysevent-no-id_space.h.patch
+++ /dev/null
@@ -1,13 +0,0 @@
-Description: this header is required only in kernel
-Index: libsysevent/usr/src/uts/common/sys/sysevent_impl.h
-===================================================================
---- libsysevent.orig/usr/src/uts/common/sys/sysevent_impl.h	2012-10-08 04:26:00.000000000 +0400
-+++ libsysevent/usr/src/uts/common/sys/sysevent_impl.h	2012-11-01 03:32:56.098703609 +0400
-@@ -27,7 +27,6 @@
- #define	_SYS_SYSEVENT_IMPL_H
- 
- #include <sys/nvpair.h>
--#include <sys/id_space.h>
- #include <sys/door.h>
- 
- #ifdef	__cplusplus
diff --git a/libsysevent/debian/patches/series b/libsysevent/debian/patches/series
index 13b08ef..278be07 100644
--- a/libsysevent/debian/patches/series
+++ b/libsysevent/debian/patches/series
@@ -1,3 +1,2 @@
 libsysevent-NULL-0.patch
-libsysevent-no-id_space.h.patch
 #libsysevent-split-sys_sysevent.h.patch
diff --git a/libsysevent/debian/rules b/libsysevent/debian/rules
index 794d09c..fe046f7 100755
--- a/libsysevent/debian/rules
+++ b/libsysevent/debian/rules
@@ -16,8 +16,7 @@ unpack: unpack-stamp
 unpack-stamp:
 	dh_testdir
 	dh_illumos_gate --build \
-		$(libs:%=usr/src/lib/%) \
-		usr/src/uts/common/sys/sysevent_impl.h
+		$(libs:%=usr/src/lib/%)
 
 	# Not used and buggy:
 	echo > usr/src/Makefile.msg.targ
@@ -37,7 +36,6 @@ unpatch:
 dirs-stamp:
 	. usr/env.sh; mkdir -p \
 		debian/tmp/usr/include \
-		debian/tmp/usr/include/sys \
 		debian/tmp$$DEB_LIBDIR_32 \
 		debian/tmp$$DEB_LIBDIR_64 \
 		debian/tmp$$DEB_USRLIBDIR_32 \
@@ -45,8 +43,6 @@ dirs-stamp:
 
 headers-stamp: patch-stamp dirs-stamp
 	dh_illumos_make $(libs_headers:%=usr/src/lib/%) -t install_h
-	cp usr/src/uts/common/sys/sysevent*.h \
-		debian/tmp/usr/include/sys/
 	touch $@
 
 install build build-arch build-indep: build-stamp
@@ -77,6 +73,7 @@ binary-stamp: build-stamp
 	dh_installexamples
 	dh_installchangelogs
 	dh_link
+	dh_strip
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -- -c4
@@ -90,6 +87,6 @@ binary-stamp: build-stamp
 clean: unpatch
 	dh_testdir
 	dh_testroot
+	rm -rf usr .pc
 	dh_clean
-	rm -rf usr