[SCM] marble packaging branch, master, updated. ubuntu/15.08.0-0ubuntu4-36-g97d384f

Maximiliano Curia maxy at moszumanska.debian.org
Fri Sep 11 11:31:53 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/marble.git;a=commitdiff;h=8c5f823

The following commit has been merged in the master branch:
commit 8c5f823b1c3bb0076e4e795dec1ed3c8b8730368
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Sep 10 15:54:11 2015 +0200

    Update acc test
---
 debian/libastro-dev.acc.in  | 21 +++++++++++++++++++++
 debian/libmarble-dev.acc.in | 21 +++++++++++++++++++++
 debian/tests/acc            | 15 +++++++++++++++
 3 files changed, 57 insertions(+)

diff --git a/debian/libastro-dev.acc.in b/debian/libastro-dev.acc.in
new file mode 100644
index 0000000..8fe6d2f
--- /dev/null
+++ b/debian/libastro-dev.acc.in
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<descriptor>
+
+<version>
+    15.07.90
+</version>
+
+<headers>
+    /usr/include/astro/
+</headers>
+
+<libs>
+    /usr/lib/libastro.so
+</libs>
+
+<gcc_options>
+    -fPIC
+    -std=c++11
+</gcc_options>
+
+</descriptor>
diff --git a/debian/libmarble-dev.acc.in b/debian/libmarble-dev.acc.in
new file mode 100644
index 0000000..5bfc269
--- /dev/null
+++ b/debian/libmarble-dev.acc.in
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<descriptor>
+
+<version>
+    15.07.90
+</version>
+
+<headers>
+    /usr/include/marble/
+</headers>
+
+<libs>
+    /usr/lib/libmarblewidget-qt5.so
+</libs>
+
+<gcc_options>
+    -fPIC
+    -std=c++11
+</gcc_options>
+
+</descriptor>
diff --git a/debian/tests/acc b/debian/tests/acc
index ecd74f2..28b8d41 100755
--- a/debian/tests/acc
+++ b/debian/tests/acc
@@ -1,3 +1,18 @@
 #!/bin/sh
 
+DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
+
+for in_file in debian/*.acc.in; do
+    out_file=${in_file%.in}
+    sed 's/@@DEB_HOST_MULTIARCH@@/'"${DEB_HOST_MULTIARCH}"'/' \
+        "${in_file}" > "${out_file}"
+done
+
+DH_VERBOSE=1
+
 dh_acc
+ret=$?
+if [ 0 -ne $ret ]; then
+    cp -r logs "${ADT_ARTIFACTS}"/acc.logs
+fi
+exit $ret

-- 
marble packaging



More information about the pkg-kde-commits mailing list