[SCM] okular packaging branch, master, updated. debian/15.08.3-1-4-g1246ef9

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit 41b1a37f68985e1cd099ddd43de991c7a62b4575
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Wed Jan 27 15:52:36 2016 +0100

    Follow upstream library rename.
---
 debian/control                                            |  8 ++++----
 debian/libokularcore6.install                             |  2 --
 debian/libokularcore7.install                             |  2 ++
 debian/{libokularcore6.symbols => libokularcore7.symbols} |  2 +-
 debian/{libokularcore6.acc => okular-dev.acc.in}          |  2 +-
 debian/tests/acc                                          | 15 +++++++++++++++
 6 files changed, 23 insertions(+), 8 deletions(-)

diff --git a/debian/control b/debian/control
index 644e881..48c4001 100644
--- a/debian/control
+++ b/debian/control
@@ -31,7 +31,7 @@ Homepage: http://www.kde.org/
 Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/okular.git
 Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/okular.git
 
-Package: libokularcore6
+Package: libokularcore7
 Section: libs
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -43,7 +43,7 @@ Description: libraries for the Okular document viewer
 Package: okular
 Section: graphics
 Architecture: any
-Depends: libokularcore6 (= ${binary:Version}),
+Depends: libokularcore7 (= ${binary:Version}),
          ${misc:Depends},
          ${shlibs:Depends}
 Recommends: cups-bsd
@@ -74,9 +74,9 @@ Description: universal document viewer
 Package: okular-dev
 Section: libdevel
 Architecture: any
-Depends: libokularcore6 (= ${binary:Version}),
+Depends: libokularcore7 (= ${binary:Version}),
          ${misc:Depends},
-         ${sameVersionDep:kdelibs5-dev:libokularcore6}
+         ${sameVersionDep:kdelibs5-dev:libokularcore7}
 Description: development files for the Okular libraries
  This package contains development files for building Okular document format
  backends.
diff --git a/debian/libokularcore6.install b/debian/libokularcore6.install
deleted file mode 100644
index 513bc0d..0000000
--- a/debian/libokularcore6.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libokularcore.so.6
-usr/lib/libokularcore.so.6.*
diff --git a/debian/libokularcore7.install b/debian/libokularcore7.install
new file mode 100644
index 0000000..8f601a2
--- /dev/null
+++ b/debian/libokularcore7.install
@@ -0,0 +1,2 @@
+usr/lib/libokularcore.so.7
+usr/lib/libokularcore.so.7.*
diff --git a/debian/libokularcore6.symbols b/debian/libokularcore7.symbols
similarity index 99%
rename from debian/libokularcore6.symbols
rename to debian/libokularcore7.symbols
index d46c46a..764991a 100644
--- a/debian/libokularcore6.symbols
+++ b/debian/libokularcore7.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:15.08 amd64
-libokularcore.so.6 libokularcore6 #MINVER#
+libokularcore.so.7 libokularcore7 #MINVER#
  _ZN6Okular10Annotation11setContentsERK7QString at Base 4:14.12.0
  _ZN6Okular10Annotation11setNativeIdERK8QVariant at Base 4:14.12.0
  _ZN6Okular10Annotation13setUniqueNameERK7QString at Base 4:14.12.0
diff --git a/debian/libokularcore6.acc b/debian/okular-dev.acc.in
similarity index 93%
rename from debian/libokularcore6.acc
rename to debian/okular-dev.acc.in
index 8502b21..1b96883 100644
--- a/debian/libokularcore6.acc
+++ b/debian/okular-dev.acc.in
@@ -2,7 +2,7 @@
 <descriptor>
 
 <version>
-    4.14.0
+    15.12.0
 </version>
 
 <headers>
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

-- 
okular packaging