fma (4.3) unstable; urgency=medium

* New upstream snapshot
  * Updated debian/libtopo1.symbols: topo_node_child_walk@SUNWprivate
  * Link libtopo via GNU ld (libtopo-link-with-gnu-ld.patch)
  * Package all libtopo headers
  * Since libtopo headers are in /usr/include/fm, fix them to include
    <fm/topo*> instead of just <topo*> (sed in debian/rules, after dh_install)

fma/debian/changelog

@@ -1,3 +1,14 @@
+fma (4.3) unstable; urgency=medium
+
+  * New upstream snapshot
+  * Updated debian/libtopo1.symbols: topo_node_child_walk@SUNWprivate
+  * Link libtopo via GNU ld (libtopo-link-with-gnu-ld.patch)
+  * Package all libtopo headers
+  * Since libtopo headers are in /usr/include/fm, fix them to include
+    <fm/topo*> instead of just <topo*> (sed in debian/rules, after dh_install)
+
+ -- Igor Pashev <pashev.igor@gmail.com>  Wed, 16 Apr 2014 18:37:17 +0400
+
 fma (2.10-1) unstable; urgency=low
 
   * Initial release. Only libtopo and libfmevent.

fma/debian/control

@@ -1,11 +1,11 @@
 Source: fma
 Section: admin
-Priority: standard
+Priority: optional
 Maintainer: Igor Pashev <pashev.igor@gmail.com>
 Build-Depends:
  dh-illumos,
- gcc-multilib,
- illumos-source-2.10,
+ gcc-multilib [illumos-amd64],
+ illumos-source-4.3,
  libcfgadm1-dev   , lib32cfgadm1-dev [illumos-amd64]   , 
  libdevid1-dev    , lib32devid1-dev [illumos-amd64]    , 
  libdevinfo1-dev  , lib32devinfo1-dev [illumos-amd64]  , 
@@ -22,13 +22,12 @@ Build-Depends:
  libzfs1-dev      , lib32zfs1-dev [illumos-amd64]      , 
  quilt,
  symlinks,
-Standards-Version: 3.9.3
+Standards-Version: 3.9.5
 Homepage: https://www.illumos.org
 
 
 Package: libtopo1
 Section: libs
-Priority: optional
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Architecture: illumos-any
@@ -38,7 +37,6 @@ Description: hardware topology library
 
 Package: libtopo1-dev
 Section: libdevel
-Priority: optional
 Architecture: illumos-any
 Provides: libtopo-dev
 Depends: libtopo1 (= ${binary:Version}), ${misc:Depends},
@@ -49,7 +47,6 @@ Description: hardware topology library (development files)
 
 Package: lib32topo1
 Section: libs
-Priority: optional
 Architecture: illumos-amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description:  hardware topology library (32-bit)
@@ -59,7 +56,6 @@ Description:  hardware topology library (32-bit)
 
 Package: lib32topo1-dev
 Section: libdevel
-Priority: optional
 Architecture: illumos-amd64
 Provides: lib32topo-dev
 Depends: lib32topo1 (= ${binary:Version}), libtopo1-dev (= ${binary:Version}),
@@ -70,7 +66,6 @@ Description: hardware topology library (32-bit development files)
  
 Package: libfmevent1
 Section: libs
-Priority: optional
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
 Architecture: illumos-any
@@ -83,7 +78,6 @@ Description: fault management events library
 
 Package: libfmevent1-dev
 Section: libdevel
-Priority: optional
 Architecture: illumos-any
 Provides: libfmevent-dev
 Depends: libfmevent1 (= ${binary:Version}), ${misc:Depends},
@@ -97,7 +91,6 @@ Description: fault management events library (development files)
 
 Package: lib32fmevent1
 Section: libs
-Priority: optional
 Architecture: illumos-amd64
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Description: fault management events library (32-bit)
@@ -110,7 +103,6 @@ Description: fault management events library (32-bit)
 
 Package: lib32fmevent1-dev
 Section: libdevel
-Priority: optional
 Architecture: illumos-amd64
 Provides: lib32fmevent-dev
 Depends: lib32fmevent1 (= ${binary:Version}), libfmevent1-dev (= ${binary:Version}),

fma/debian/libtopo1-dev.install

@@ -1,3 +1,3 @@
-usr/include/fm/libtopo.h
-usr/include/fm/topo_*.h
+usr/src/lib/fm/topo/libtopo/common/libtopo.h usr/include/fm
+usr/src/lib/fm/topo/libtopo/common/topo_*.h usr/include/fm
 usr/lib/*/libtopo.so

fma/debian/libtopo1.symbols

@@ -87,6 +87,7 @@ libtopo.so.1 libtopo1 #MINVER#
  topo_node_asru@SUNWprivate 2.10-1
  topo_node_asru_set@SUNWprivate 2.10-1
  topo_node_bind@SUNWprivate 2.10-1
+ topo_node_child_walk@SUNWprivate 4.3
  topo_node_facbind@SUNWprivate 2.10-1
  topo_node_facility@SUNWprivate 2.10-1
  topo_node_flags@SUNWprivate 2.10-1

fma/debian/patches/libtopo-link-with-gnu-ld.patch

@@ -0,0 +1,39 @@
+Description: use GNU ld, because of libxml2.
+ illumos ld inserts invalid base version for some symbols
+Index: fma/usr/src/lib/fm/topo/libtopo/common/mapfile-vers
+===================================================================
+--- fma.orig/usr/src/lib/fm/topo/libtopo/common/mapfile-vers	2014-03-01 16:18:09.000000000 +0400
++++ fma/usr/src/lib/fm/topo/libtopo/common/mapfile-vers	2014-04-16 17:59:27.705489570 +0400
+@@ -36,9 +36,8 @@
+ # MAPFILE HEADER END
+ #
+ 
+-$mapfile_version 2
+ 
+-SYMBOL_VERSION SUNWprivate {
++SUNWprivate {
+     global:
+ 	topo_close;
+ 	topo_debug_set;
+Index: fma/usr/src/lib/fm/topo/libtopo/Makefile.com
+===================================================================
+--- fma.orig/usr/src/lib/fm/topo/libtopo/Makefile.com	2014-03-01 16:18:09.000000000 +0400
++++ fma/usr/src/lib/fm/topo/libtopo/Makefile.com	2014-04-16 18:06:15.807842700 +0400
+@@ -22,6 +22,8 @@
+ # Copyright (c) 2006, 2010, Oracle and/or its affiliates. All rights reserved.
+ #
+ 
++unexport LD_ALTEXEC
++
+ LIBRARY = libtopo.a
+ VERS = .1
+ 
+@@ -67,6 +69,8 @@
+ include ../../../../Makefile.lib
+ include ../../../Makefile.lib
+ 
++override DYNFLAGS=	$(HSONAME) $(ZTEXT) $(ZDEFS) $(MAPFILES:%=-Wl,--version-script=%)
++
+ SRCS = $(BUILTINSRCS:%.c=../common/%.c) $(LIBSRCS:%.c=../common/%.c)
+ LIBS = $(DYNLIB) $(LINTLIB)
+ 

fma/debian/patches/series

@@ -1,3 +1,4 @@
 lib-fm-libdiskstatus-ds_scsi_uscsi.c-MIN.patch
 lib-fm-topo-modules-gnu-install.patch
 libfmevent-localtime_r.patch
+libtopo-link-with-gnu-ld.patch

fma/debian/rules

@@ -63,6 +63,8 @@ binary-stamp: build-stamp
 	dh_testroot
 	dh_installdirs
 	dh_install
+	sed -r -i 's,#include *<topo,#include <fm/topo,' \
+		debian/libtopo1-dev/usr/include/fm/*
 	dh_installman
 	dh_installdocs
 	dh_installexamples
@@ -81,6 +83,6 @@ binary-stamp: build-stamp
 clean: unpatch
 	dh_testdir
 	dh_testroot
+	rm -rf usr .pc
 	dh_clean
-	rm -rf usr