[Debian-iot-packaging] [alljoyn-services-1504] 01/02: Imported Debian patch 15.04-3

[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 06de52cee223b9063af3ab310356bcd3b19f16fb
Author: Thorsten Alteholz <debian at alteholz.de>
Date:   Tue Jun 14 19:28:32 2016 +0200

    Imported Debian patch 15.04-3
---
 debian/changelog              | 16 ++++++++++++++++
 debian/control                |  2 ++
 debian/patches/spelling.patch |  2 +-
 debian/rules                  | 18 ++++++++++++++++--
 4 files changed, 35 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a855883..63bb195 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,19 @@
+alljoyn-services-1504 (15.04-3) unstable; urgency=medium
+
+  * debian/rules: take CPU mapping from alljoyn-core-1504
+  * debian/rules: remove arm directory from build-core 
+    (Closes: #826765)
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Tue, 14 Jun 2016 19:28:32 +0200
+
+alljoyn-services-1504 (15.04-2) unstable; urgency=medium
+
+  * debian/rules: add CPU mapping from alljoyn-core-1504 
+  * debian/control: add VCS URLs
+  * combine all ReleaseNotes.txt to create upstream changelog
+
+ -- Thorsten Alteholz <debian at alteholz.de>  Tue, 07 Jun 2016 20:28:32 +0200
+
 alljoyn-services-1504 (15.04-1) unstable; urgency=medium
 
   * Initial release (Closes: #826354)
diff --git a/debian/control b/debian/control
index 76493a7..7efb686 100644
--- a/debian/control
+++ b/debian/control
@@ -19,6 +19,8 @@ Build-Depends: dh-exec (>=0.3)
 #               , libcap-dev
 Standards-Version: 3.9.8
 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
 
 Package: liballjoynservices1504
 Architecture: any
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
index 4920a47..2e2b8c8 100644
--- a/debian/patches/spelling.patch
+++ b/debian/patches/spelling.patch
@@ -1,5 +1,5 @@
 Author: Thorsten Alteholz <debian at alteholz.de>
-Description: fix spelling errors that lintian complained about
+Description: fix spelling errors that lintian complained about (applied upstream)
 Index: alljoyn-services-1504/config/ios/samples/sampleApp/ConfigSetupViewController.m
 ===================================================================
 --- alljoyn-services-1504.orig/config/ios/samples/sampleApp/ConfigSetupViewController.m	2015-06-05 22:59:30.000000000 +0200
diff --git a/debian/rules b/debian/rules
index 8b0eb80..9d10b5e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,10 +10,13 @@ export GTEST_DIR=/usr/src/gtest
 
 DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
 
-CPU=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU)
+# mapping all i.86 to x86 for Alljoyn
+CPU=$(shell dpkg-architecture -qDEB_HOST_GNU_CPU | sed -e 's/i.86/x86/')
+BUILDARCH=$(shell dpkg-architecture -qDEB_BUILD_ARCH)
 OS=linux
 
-export VERSION := 15.04b
+
+export VERSION := 15.04
 export SONAME := 1504
 export VARIANT := release
 export SCONS_ARGS := CPU=$(CPU) OS=$(OS) VARIANT=$(VARIANT) V=1 GTEST_DIR=$(GTEST_DIR)
@@ -59,6 +62,11 @@ override_dh_auto_build:
 	dh_auto_build
 
 override_dh_auto_clean:
+	# see explanation of -I for dpkg-source
+	# as this dir contains an {arch}, dpkg-source ignores it
+	# "arm" in Alljoyn world means openWRT+cross compiling
+	# so this is not needed for Debian
+	rm -rf build_core/conf/linux/arm
 	rm -f sample_apps/.sconsign.dblite
 	rm -rf sample_apps/.sconf_temp
 	rm -f services_common/.sconsign.dblite
@@ -88,3 +96,9 @@ override_dh_install:
 	dh_install
 	# improve stuff
 	chmod 644 debian/alljoyn-services-1504/etc/alljoyn/*.conf
+
+override_dh_installchangelogs:
+	cat */ReleaseNotes.txt > ReleaseNotes.txt
+	dh_installchangelogs ReleaseNotes.txt
+	rm ReleaseNotes.txt
+	dh_installchangelogs 

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