libinetutil (2.10-2) unstable

* Strip libraries
  * Fix function prototypes: uint_t -> size_t for buffer sizes
    (library consumers really use size_t)

libinetutil/debian/changelog

@@ -1,3 +1,11 @@
+libinetutil (2.10-2) unstable; urgency=low
+
+  * Strip libraries 
+  * Fix function prototypes: uint_t -> size_t for buffer sizes
+    (library consumers really use size_t)
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Fri, 08 Mar 2013 20:48:36 +0000
+
 libinetutil (2.10-1) unstable; urgency=low
 
   * Initial release.

libinetutil/debian/patches/libinetutil-fix-prototypes.patch

@@ -0,0 +1,36 @@
+Description: These functions are used with size_t
+Index: libinetutil/usr/src/lib/libinetutil/common/ofmt.h
+===================================================================
+--- libinetutil.orig/usr/src/lib/libinetutil/common/ofmt.h	2012-10-08 00:25:39.000000000 +0000
++++ libinetutil/usr/src/lib/libinetutil/common/ofmt.h	2013-03-08 20:45:09.756125463 +0000
+@@ -161,7 +161,7 @@
+  * ofmt callback function that provides a string representation of the value to
+  * be printed for the field.
+  */
+-typedef boolean_t ofmt_cb_t(ofmt_arg_t *, char *, uint_t);
++typedef boolean_t ofmt_cb_t(ofmt_arg_t *, char *, size_t);
+ typedef struct ofmt_field_s {
+ 	char	*of_name;	/* column name */
+ 	uint_t	of_width;	/* output column width */
+@@ -201,7 +201,7 @@
+ /*
+  * ofmt_strerror() provides error diagnostics in the buffer that it is passed.
+  */
+-extern char *ofmt_strerror(ofmt_handle_t, ofmt_status_t, char *, uint_t);
++extern char *ofmt_strerror(ofmt_handle_t, ofmt_status_t, char *, size_t);
+ 
+ #ifdef __cplusplus
+ }
+Index: libinetutil/usr/src/lib/libinetutil/common/ofmt.c
+===================================================================
+--- libinetutil.orig/usr/src/lib/libinetutil/common/ofmt.c	2012-10-08 00:25:39.000000000 +0000
++++ libinetutil/usr/src/lib/libinetutil/common/ofmt.c	2013-03-08 20:46:50.451323320 +0000
+@@ -537,7 +537,7 @@
+  * Return error diagnostics using the information in the ofmt_handle_t
+  */
+ char *
+-ofmt_strerror(ofmt_handle_t ofmt, ofmt_status_t err, char *buf, uint_t bufsize)
++ofmt_strerror(ofmt_handle_t ofmt, ofmt_status_t err, char *buf, size_t bufsize)
+ {
+ 	ofmt_state_t *os = ofmt;
+ 	int i;

libinetutil/debian/patches/series

@@ -1,2 +1,3 @@
 libinetutil-avoid-inetutil.h.patch
 libinetutil-add-prototypes.patch
+libinetutil-fix-prototypes.patch

libinetutil/debian/rules

@@ -47,9 +47,8 @@ headers-stamp: patch-stamp dirs-stamp
 	dh_illumos_make $(libs_headers:%=usr/src/lib/%) -t install_h
 	touch $@
 
-install build build-arch build-indep: build-stamp
-build-stamp: patch-stamp dirs-stamp headers-stamp
-	dh_illumos_make $(libs:%=usr/src/lib/%)
+install install-arch install-indep: install-stamp
+install-stamp: build-stamp
 	# Move dev symlink from /lib into /usr/lib:
 	for l in `find debian/tmp/lib32 -maxdepth 1 -type l -name \*.so`; do \
 		ln -sf `readlink -f $$l` debian/tmp/usr/lib32/`basename $$l`; \
@@ -64,8 +63,13 @@ build-stamp: patch-stamp dirs-stamp headers-stamp
 	symlinks -c debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)
 	touch $@
 
+build build-arch build-indep: build-stamp
+build-stamp: patch-stamp dirs-stamp headers-stamp
+	dh_illumos_make $(libs:%=usr/src/lib/%)
+	touch $@
+
 binary binary-arch binary-indep: binary-stamp
-binary-stamp: build-stamp
+binary-stamp: install-stamp
 	dh_testdir
 	dh_testroot
 	dh_installdirs
@@ -80,6 +84,7 @@ binary-stamp: build-stamp
 	dh_makeshlibs -- -c4
 	dh_installdeb
 	dh_shlibdeps
+	dh_strip
 	dh_gencontrol
 	dh_md5sums
 	dh_builddeb
@@ -89,5 +94,5 @@ clean: unpatch
 	dh_testdir
 	dh_testroot
 	dh_clean
-	rm -rf usr
+	rm -rf usr .pc