libefi (4.3) unstable; urgency=medium

* New upstream snapshot
  * Use system headers
  * Removed patch
  * Strip binaries

 -- Igor Pashev <pashev.igor@gmail.com>  Mon, 11 Aug 2014 14:10:00 +0400

libefi/debian/changelog

@@ -1,3 +1,12 @@
+libefi (4.3) unstable; urgency=medium
+
+  * New upstream snapshot
+  * Use system headers
+  * Removed patch
+  * Strip binaries
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Mon, 11 Aug 2014 14:10:00 +0400
+
 libefi (2.10-1) unstable; urgency=low
 
   * Initial release.

libefi/debian/control

@@ -5,7 +5,7 @@ Maintainer: Igor Pashev <pashev.igor@gmail.com>
 Build-Depends:
  dh-illumos,
  gcc-multilib,
- illumos-source-2.10,
+ illumos-source-4.3,
  libsunuuid1-dev, lib32sunuuid1-dev,
  quilt,
  symlinks,

libefi/debian/libefi1-dev.install

@@ -1,2 +1 @@
 usr/lib/*/libefi.so
-usr/include/sys/efi_partition.h

libefi/debian/patches/efi_partition.h.patch

@@ -1,33 +0,0 @@
-Description:
- 1. Allow other uuid libraries
- 2. Include sys/types.h for diskaddr_t
-Index: libefi/usr/src/uts/common/sys/efi_partition.h
-===================================================================
---- libefi.orig/usr/src/uts/common/sys/efi_partition.h	2012-10-08 00:25:59.000000000 +0000
-+++ libefi/usr/src/uts/common/sys/efi_partition.h	2012-11-10 19:57:17.425912213 +0000
-@@ -26,7 +26,8 @@
- #ifndef	_SYS_EFI_PARTITION_H
- #define	_SYS_EFI_PARTITION_H
- 
--#include <sys/uuid.h>
-+#include <sys/types.h>
-+#include <uuid/uuid.h>
- 
- #ifdef	__cplusplus
- extern "C" {
-@@ -231,7 +232,6 @@
-  */
- #define	EFI_NUMPAR	9
- 
--#ifndef _KERNEL
- extern	int	efi_alloc_and_init(int, uint32_t, struct dk_gpt **);
- extern	int	efi_alloc_and_read(int, struct dk_gpt **);
- extern	int	efi_write(int, struct dk_gpt *);
-@@ -240,7 +240,6 @@
- extern	void	efi_err_check(struct dk_gpt *);
- extern	int	efi_auto_sense(int fd, struct dk_gpt **);
- extern	int	efi_use_whole_disk(int fd);
--#endif
- 
- #ifdef __cplusplus
- }

libefi/debian/patches/series

@@ -1 +0,0 @@
-efi_partition.h.patch

libefi/debian/rules

@@ -17,8 +17,7 @@ unpack-stamp:
 	dh_testdir
 	dh_illumos_gate --build \
 		$(libs:%=usr/src/lib/%) \
-		usr/src/uts/common/sys/crc32.h \
-		usr/src/uts/common/sys/efi_partition.h
+
 	# Not used and buggy:
 	echo > usr/src/Makefile.msg.targ
 	touch $@
@@ -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,7 +43,6 @@ dirs-stamp:
 	touch $@
 
 headers-stamp: patch-stamp dirs-stamp
-	cp usr/src/uts/common/sys/*.h debian/tmp/usr/include/sys/
 	touch $@
 
 install build build-arch build-indep: build-stamp
@@ -79,6 +76,7 @@ binary-stamp: build-stamp
 	dh_compress
 	dh_fixperms
 	dh_makeshlibs -- -c4
+	dh_strip
 	dh_installdeb
 	dh_shlibdeps
 	dh_gencontrol
@@ -88,7 +86,6 @@ binary-stamp: build-stamp
 
 clean: unpatch
 	dh_testdir
-	dh_testroot
+	rm -rf usr .pc
 	dh_clean
-	rm -rf usr