[SCM] libkmahjongg packaging branch, master, updated. ubuntu/4%15.08.0-0ubuntu1-20-g1ca6708

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit c7645ef887b53726fbeef5b10516cf79bed268a1
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu Sep 10 13:37:05 2015 +0200

    Update acc test
---
 debian/libkf5kmahjongglib-dev.acc.in | 21 +++++++++++++++++++++
 debian/libkf5kmahjongglib5.acc       | 19 -------------------
 debian/tests/acc                     | 10 +++++++---
 3 files changed, 28 insertions(+), 22 deletions(-)

diff --git a/debian/libkf5kmahjongglib-dev.acc.in b/debian/libkf5kmahjongglib-dev.acc.in
new file mode 100644
index 0000000..6c91242
--- /dev/null
+++ b/debian/libkf5kmahjongglib-dev.acc.in
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="utf-8"?>
+<descriptor>
+
+<version>
+    15.07.90
+</version>
+
+<headers>
+    /usr/include/KF5/KF5KMahjongg/
+</headers>
+
+<libs>
+    /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5KMahjongglib.so
+</libs>
+
+<gcc_options>
+    -fPIC
+    -std=c++11
+</gcc_options>
+
+</descriptor>
diff --git a/debian/libkf5kmahjongglib5.acc b/debian/libkf5kmahjongglib5.acc
deleted file mode 100644
index 271659b..0000000
--- a/debian/libkf5kmahjongglib5.acc
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
-    4.11.3
-</version>
-
-<headers>
-    /usr/include/libkmahjongg_export.h
-    /usr/include/kmahjonggbackground.h
-    /usr/include/kmahjonggtileset.h
-    /usr/include/kmahjonggconfigdialog.h
-</headers>
-
-<libs>
-    /usr/lib/libkmahjongglib.so
-</libs>
-
-</descriptor>
diff --git a/debian/tests/acc b/debian/tests/acc
index 85b5b21..28b8d41 100755
--- a/debian/tests/acc
+++ b/debian/tests/acc
@@ -3,12 +3,16 @@
 DEB_HOST_MULTIARCH=$(dpkg-architecture -qDEB_HOST_MULTIARCH)
 
 for in_file in debian/*.acc.in; do
-    if ! [ -e "$in_file" ]; then
-        continue
-    fi
     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

-- 
libkmahjongg packaging