[Debian-iot-packaging] [alljoyn-core-1604] 01/01: add liballjoyn_config.so to this package

[Thorsten Alteholz]

This is an automated email from the git hooks/post-receive script.

alteholz pushed a commit to branch master
in repository alljoyn-core-1604.

commit 638f8ef0e8e9c7ca932671ccb5d6c9b5821ff2f6
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Mon Oct 17 19:41:10 2016 +0200

    add liballjoyn_config.so to this package
---
 debian/changelog                   |  6 ++++++
 debian/liballjoyn-dev-1604.install |  3 ++-
 debian/liballjoyn1604.install      |  1 +
 debian/patches/soname.patch        | 30 +++++++++++++++++++++---------
 4 files changed, 30 insertions(+), 10 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 89c3aab..2425d8c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+alljoyn-core-1604 (16.04a-2) unstable; urgency=medium
+
+  * add liballjoyn_config to this package
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Mon, 17 Oct 2016 18:31:37 +0200
+
 alljoyn-core-1604 (16.04a-1) unstable; urgency=medium
 
   * new upstream version
diff --git a/debian/liballjoyn-dev-1604.install b/debian/liballjoyn-dev-1604.install
index 7ff7051..64e118d 100755
--- a/debian/liballjoyn-dev-1604.install
+++ b/debian/liballjoyn-dev-1604.install
@@ -2,7 +2,8 @@
 build/*/*/*/dist/cpp/inc/a* /usr/include/${DEB_HOST_MULTIARCH}
 build/*/*/*/obj/alljoyn_core/liballjoyn.so /usr/lib/${DEB_HOST_MULTIARCH}
 build/*/*/*/obj/alljoyn_core/liballjoyn.a /usr/lib/${DEB_HOST_MULTIARCH}
-#build/*/*/*/dist/cpp/lib/liballjoyn_about.so /usr/lib/${DEB_HOST_MULTIARCH}
 build/*/*/*/obj/about/cpp/src/liballjoyn_about.so /usr/lib/${DEB_HOST_MULTIARCH}
 build/*/*/*/dist/cpp/lib/liballjoyn_about.a /usr/lib/${DEB_HOST_MULTIARCH}
+build/*/*/*/obj/config/cpp/src/liballjoyn_config.so /usr/lib/${DEB_HOST_MULTIARCH}
+build/*/*/*/dist/cpp/lib/liballjoyn_config.a /usr/lib/${DEB_HOST_MULTIARCH}
 build/*/*/*/dist/cpp/lib/libajrouter.a /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/liballjoyn1604.install b/debian/liballjoyn1604.install
index 59e5c4a..b833938 100755
--- a/debian/liballjoyn1604.install
+++ b/debian/liballjoyn1604.install
@@ -1,4 +1,5 @@
 #! /usr/bin/dh-exec
 build/*/*/*/obj/alljoyn_core/liballjoyn.so.* /usr/lib/${DEB_HOST_MULTIARCH}
 build/*/*/*/dist/cpp/lib/liballjoyn_about.so.* /usr/lib/${DEB_HOST_MULTIARCH}
+build/*/*/*/dist/cpp/lib/liballjoyn_config.so.* /usr/lib/${DEB_HOST_MULTIARCH}
 build/*/*/*/dist/cpp/bin/* /usr/lib/${DEB_HOST_MULTIARCH}/alljoyn/1604/bin
diff --git a/debian/patches/soname.patch b/debian/patches/soname.patch
index c1f34a3..f531323 100644
--- a/debian/patches/soname.patch
+++ b/debian/patches/soname.patch
@@ -1,9 +1,9 @@
 Description: add SONAME to libraries
 Author: Thorsten Alteholz <debian at alteholz.de>
-Index: alljoyn-core-1604-16.04/alljoyn_c/src/SConscript
+Index: alljoyn-core-1604/alljoyn_c/src/SConscript
 ===================================================================
---- alljoyn-core-1604-16.04.orig/alljoyn_c/src/SConscript	2016-06-14 13:13:09.000000000 +0200
-+++ alljoyn-core-1604-16.04/alljoyn_c/src/SConscript	2016-06-14 13:13:09.000000000 +0200
+--- alljoyn-core-1604.orig/alljoyn_c/src/SConscript	2016-10-17 19:39:38.000000000 +0200
++++ alljoyn-core-1604/alljoyn_c/src/SConscript	2016-10-17 19:39:38.000000000 +0200
 @@ -38,6 +38,6 @@
      liballjoyn_c_static = env.StaticLibrary('alljoyn_c_static', objs)
  else:
@@ -12,10 +12,10 @@ Index: alljoyn-core-1604-16.04/alljoyn_c/src/SConscript
 +liballjoyn_c_shared = env.SharedLibrary('alljoyn_c', objs_shared,SHLIBVERSION='1604')
  
  Return('liballjoyn_c_static', 'liballjoyn_c_shared', 'objs_shared')
-Index: alljoyn-core-1604-16.04/alljoyn_core/src/SConscript
+Index: alljoyn-core-1604/alljoyn_core/src/SConscript
 ===================================================================
---- alljoyn-core-1604-16.04.orig/alljoyn_core/src/SConscript	2016-06-14 13:13:09.000000000 +0200
-+++ alljoyn-core-1604-16.04/alljoyn_core/src/SConscript	2016-06-14 13:13:09.000000000 +0200
+--- alljoyn-core-1604.orig/alljoyn_core/src/SConscript	2016-10-17 19:39:38.000000000 +0200
++++ alljoyn-core-1604/alljoyn_core/src/SConscript	2016-10-17 19:39:38.000000000 +0200
 @@ -53,6 +53,6 @@
  # AllJoyn Static Library
  libs = libenv.StaticLibrary('alljoyn', static_objs)
@@ -24,10 +24,10 @@ Index: alljoyn-core-1604-16.04/alljoyn_core/src/SConscript
 +    libs.append(libenv.SharedLibrary('alljoyn', shared_objs, SHLIBVERSION='1604'))
  
  Return ('libs', 'static_objs', 'shared_objs')
-Index: alljoyn-core-1604-16.04/services/about/cpp/src/SConscript
+Index: alljoyn-core-1604/services/about/cpp/src/SConscript
 ===================================================================
---- alljoyn-core-1604-16.04.orig/services/about/cpp/src/SConscript	2016-06-14 13:13:09.000000000 +0200
-+++ alljoyn-core-1604-16.04/services/about/cpp/src/SConscript	2016-06-14 13:13:09.000000000 +0200
+--- alljoyn-core-1604.orig/services/about/cpp/src/SConscript	2016-10-17 19:39:38.000000000 +0200
++++ alljoyn-core-1604/services/about/cpp/src/SConscript	2016-10-17 19:39:38.000000000 +0200
 @@ -40,6 +40,6 @@
  # Shared library
  if about_env.get('LIBTYPE', 'static') != 'static':
@@ -36,3 +36,15 @@ Index: alljoyn-core-1604-16.04/services/about/cpp/src/SConscript
 +    libs.append(about_env.SharedLibrary('alljoyn_about', shobjs, SHLIBVERSION='1604'))
  
  Return ('libs')
+Index: alljoyn-core-1604/services/config/cpp/src/SConscript
+===================================================================
+--- alljoyn-core-1604.orig/services/config/cpp/src/SConscript	2016-10-13 19:43:09.000000000 +0200
++++ alljoyn-core-1604/services/config/cpp/src/SConscript	2016-10-17 19:40:21.000000000 +0200
+@@ -38,6 +38,6 @@
+ # Shared library
+ if config_env.get('LIBTYPE', 'static') != 'static':
+     shobjs = config_env.SharedObject(srcs)
+-    libs.append(config_env.SharedLibrary('alljoyn_config', shobjs))
++    libs.append(config_env.SharedLibrary('alljoyn_config', shobjs, SHLIBVERSION='1604'))
+ 
+ Return ('libs')

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-iot/alljoyn-core-1604.git