[Debian-iot-packaging] [alljoyn-services-1504] 01/01: Import Debian changes 15.04-7

[Thorsten Alteholz]

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

alteholz pushed a commit to branch master
in repository alljoyn-services-1504.

commit 81098cce44120cc1f54e4118a70e0ce30ad956af
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Tue Aug 15 19:28:32 2017 +0200

    Import Debian changes 15.04-7
    
    alljoyn-services-1504 (15.04-7) unstable; urgency=medium
    
      * add gcc7 patch (Closes: #853307)
      * debian/control: change priority: from extra to optional
      * debian/control: bump standard to 4.0.1 (no changes)
    
    alljoyn-services-1504 (15.04-6) unstable; urgency=medium
    
      * take care of broken symlinks (Closes: #861506)
---
 debian/changelog                      | 14 ++++++++++++++
 debian/control                        |  4 ++--
 debian/liballjoynservices1504.install |  2 ++
 debian/patches/gcc7.patch             | 15 +++++++++++++++
 debian/patches/series                 |  1 +
 5 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a7cafe3..9c0d998 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+alljoyn-services-1504 (15.04-7) unstable; urgency=medium
+
+  * add gcc7 patch (Closes: #853307)
+  * debian/control: change priority: from extra to optional
+  * debian/control: bump standard to 4.0.1 (no changes)
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Tue, 15 Aug 2017 19:28:32 +0200
+
+alljoyn-services-1504 (15.04-6) unstable; urgency=medium
+
+  * take care of broken symlinks (Closes: #861506)
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Sat, 20 May 2017 18:28:32 +0200
+
 alljoyn-services-1504 (15.04-5) unstable; urgency=medium
 
   * move package to debian-iot-maintainer
diff --git a/debian/control b/debian/control
index fabdd23..388aa81 100644
--- a/debian/control
+++ b/debian/control
@@ -1,6 +1,6 @@
 Source: alljoyn-services-1504
 Section: net
-Priority: extra
+Priority: optional
 Maintainer: Debian IoT Maintainers <debian-iot-maintainers at lists.alioth.debian.org>
 Uploaders: Thorsten Alteholz <debian at alteholz.de>
 Build-Depends: dh-exec (>=0.3)
@@ -18,7 +18,7 @@ Build-Depends: dh-exec (>=0.3)
 #	       , libitext-java
 #               , ant
 #               , libcap-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.0.1
 Homepage: https://allseenalliance.org/framework
 Vcs-Browser: https://anonscm.debian.org/cgit/debian-iot/alljoyn-services-1504.git
 Vcs-Git: https://anonscm.debian.org/git/debian-iot/alljoyn-services-1504.git
diff --git a/debian/liballjoynservices1504.install b/debian/liballjoynservices1504.install
index 30ab97c..5fd0c9b 100755
--- a/debian/liballjoynservices1504.install
+++ b/debian/liballjoynservices1504.install
@@ -5,3 +5,5 @@ services_common/build/*/*/*/dist/services_common/lib/liballjoyn_services_common.
 controlpanel/build/*/*/*/dist/controlpanel/lib/liballjoyn_controlpanel.so.* /usr/lib/${DEB_HOST_MULTIARCH}
 notification/build/*/*/*/dist/notification/lib/liballjoyn_notification.so.* /usr/lib/${DEB_HOST_MULTIARCH}
 onboarding/build/*/*/*/dist/onboarding/lib/liballjoyn_onboarding.so.* /usr/lib/${DEB_HOST_MULTIARCH}
+time/build/*/*/*/dist/time/lib/liballjoyn_time.so.* /usr/lib/${DEB_HOST_MULTIARCH}
+config/build/*/*/*/dist/config/lib/liballjoyn_config.so.* /usr/lib/${DEB_HOST_MULTIARCH}
diff --git a/debian/patches/gcc7.patch b/debian/patches/gcc7.patch
new file mode 100644
index 0000000..6845038
--- /dev/null
+++ b/debian/patches/gcc7.patch
@@ -0,0 +1,15 @@
+Description: fix gcc-7 issues
+Author: Thorsten Alteholz <debian at alteholz.de>
+Index: alljoyn-services-1504/sample_apps/cpp/samples/ACServerSample/provided/ControlPanelProvided.cc
+===================================================================
+--- alljoyn-services-1504.orig/sample_apps/cpp/samples/ACServerSample/provided/ControlPanelProvided.cc	2015-06-05 22:59:30.000000000 +0200
++++ alljoyn-services-1504/sample_apps/cpp/samples/ACServerSample/provided/ControlPanelProvided.cc	2017-08-16 08:55:13.045632407 +0200
+@@ -36,7 +36,7 @@
+ static char statusText[150] = "Unit is off \0";
+ static char* statusString = statusText;
+ static uint16_t triggerAnUpdate = 0;
+-static char notificationText[50] = "Notification text goes here";
++static char notificationText[150] = "Notification text goes here";
+ static char* notificationString = notificationText;
+ static uint16_t sendANotification = 0;
+ static uint8_t signalsToSend = 0;
diff --git a/debian/patches/series b/debian/patches/series
index 78b7e3e..bd1b441 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -4,3 +4,4 @@ add-linux-pthread.patch
 hardening.patch
 spelling.patch
 no-bsymbolic.patch
+gcc7.patch

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