[SCM] okteta packaging branch, master, updated. debian/4.14.2-1-28-gdc9d937

[Maximiliano Curia]

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

The following commit has been merged in the master branch:
commit ca05f10e26181b8c9033d741813e068d2e6a8949
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Feb 20 10:10:48 2015 +0100

    Update install files.
---
 debian/libkasten3controllers3.install        |  2 +-
 debian/libkasten3core3.install               |  2 +-
 debian/libkasten3gui3.install                |  2 +-
 debian/libkasten3okteta1controllers1.install |  2 +-
 debian/libkasten3okteta1core1.install        |  2 +-
 debian/libkasten3okteta1gui1.install         |  2 +-
 debian/libokteta2core2.install               |  2 +-
 debian/libokteta2gui2.install                |  2 +-
 debian/okteta-dev.install                    |  5 ++++-
 debian/okteta.install                        | 18 ++++--------------
 debian/tests/acc                             |  8 ++++++++
 11 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/debian/libkasten3controllers3.install b/debian/libkasten3controllers3.install
index 8dc4336..dc0703a 100644
--- a/debian/libkasten3controllers3.install
+++ b/debian/libkasten3controllers3.install
@@ -1,2 +1,2 @@
-usr/lib/*/libkasten3controllers.so.0.3.0
+usr/lib/*/libkasten3controllers.so.0.*
 usr/lib/*/libkasten3controllers.so.3
diff --git a/debian/libkasten3core3.install b/debian/libkasten3core3.install
index 519be50..d83f964 100644
--- a/debian/libkasten3core3.install
+++ b/debian/libkasten3core3.install
@@ -1,2 +1,2 @@
-usr/lib/*/libkasten3core.so.0.3.0
+usr/lib/*/libkasten3core.so.0.*
 usr/lib/*/libkasten3core.so.3
diff --git a/debian/libkasten3gui3.install b/debian/libkasten3gui3.install
index f62f45a..e015938 100644
--- a/debian/libkasten3gui3.install
+++ b/debian/libkasten3gui3.install
@@ -1,2 +1,2 @@
-usr/lib/*/libkasten3gui.so.0.3.0
+usr/lib/*/libkasten3gui.so.0.*
 usr/lib/*/libkasten3gui.so.3
diff --git a/debian/libkasten3okteta1controllers1.install b/debian/libkasten3okteta1controllers1.install
index 7e2dc65..4f7fb64 100644
--- a/debian/libkasten3okteta1controllers1.install
+++ b/debian/libkasten3okteta1controllers1.install
@@ -1,2 +1,2 @@
-usr/lib/*/libkasten3okteta1controllers.so.0.3.0
+usr/lib/*/libkasten3okteta1controllers.so.0.*
 usr/lib/*/libkasten3okteta1controllers.so.1
diff --git a/debian/libkasten3okteta1core1.install b/debian/libkasten3okteta1core1.install
index 27dfe5a..35125ee 100644
--- a/debian/libkasten3okteta1core1.install
+++ b/debian/libkasten3okteta1core1.install
@@ -1,2 +1,2 @@
-usr/lib/*/libkasten3okteta1core.so.0.3.0
+usr/lib/*/libkasten3okteta1core.so.0.*
 usr/lib/*/libkasten3okteta1core.so.1
diff --git a/debian/libkasten3okteta1gui1.install b/debian/libkasten3okteta1gui1.install
index f124703..2953ea2 100644
--- a/debian/libkasten3okteta1gui1.install
+++ b/debian/libkasten3okteta1gui1.install
@@ -1,2 +1,2 @@
-usr/lib/*/libkasten3okteta1gui.so.0.3.0
+usr/lib/*/libkasten3okteta1gui.so.0.*
 usr/lib/*/libkasten3okteta1gui.so.1
diff --git a/debian/libokteta2core2.install b/debian/libokteta2core2.install
index da124df..935e0f0 100644
--- a/debian/libokteta2core2.install
+++ b/debian/libokteta2core2.install
@@ -1,2 +1,2 @@
-usr/lib/*/libokteta2core.so.0.9.0
+usr/lib/*/libokteta2core.so.0.*
 usr/lib/*/libokteta2core.so.2
diff --git a/debian/libokteta2gui2.install b/debian/libokteta2gui2.install
index dacbdaf..b63d0ab 100644
--- a/debian/libokteta2gui2.install
+++ b/debian/libokteta2gui2.install
@@ -1,2 +1,2 @@
-usr/lib/*/libokteta2gui.so.0.9.0
+usr/lib/*/libokteta2gui.so.0.*
 usr/lib/*/libokteta2gui.so.2
diff --git a/debian/okteta-dev.install b/debian/okteta-dev.install
index 41eed07..6584c44 100644
--- a/debian/okteta-dev.install
+++ b/debian/okteta-dev.install
@@ -1,4 +1,7 @@
-usr/include/
+usr/include/Kasten3/
+usr/include/Okteta/
+usr/include/kasten3/
+usr/include/okteta/
 usr/lib/*/libkasten3controllers.so
 usr/lib/*/libkasten3core.so
 usr/lib/*/libkasten3gui.so
diff --git a/debian/okteta.install b/debian/okteta.install
index 02bebfd..36ac019 100644
--- a/debian/okteta.install
+++ b/debian/okteta.install
@@ -6,19 +6,9 @@ usr/lib/*/qt5/plugins/oktetapart.so
 usr/share/appdata/okteta.appdata.xml
 usr/share/applications/org.kde.okteta.desktop
 usr/share/config.kcfg/structviewpreferences.kcfg
-usr/share/doc/HTML/en/okteta/index.cache.bz2
-usr/share/doc/HTML/en/okteta/index.docbook
-usr/share/icons/hicolor/16x16/apps/okteta.png
-usr/share/icons/hicolor/32x32/apps/okteta.png
-usr/share/icons/hicolor/48x48/apps/okteta.png
+usr/share/doc/HTML/*/okteta/
+usr/share/icons/hicolor/*/apps/okteta.png
 usr/share/kxmlgui5/okteta/oktetaui.rc
 usr/share/mime/packages/okteta.xml
-usr/share/okteta/structures/elf/main.osd
-usr/share/okteta/structures/elf/metadata.desktop
-usr/share/okteta/structures/gccxml-to-osd.xsl
-usr/share/okteta/structures/png/main.osd
-usr/share/okteta/structures/png/metadata.desktop
-usr/share/okteta/structures/uuid.js
-usr/share/oktetapart/oktetapartbrowserui.rc
-usr/share/oktetapart/oktetapartreadonlyui.rc
-usr/share/oktetapart/oktetapartreadwriteui.rc
+usr/share/okteta/
+usr/share/oktetapart/
diff --git a/debian/tests/acc b/debian/tests/acc
index ecd74f2..f8dc629 100755
--- a/debian/tests/acc
+++ b/debian/tests/acc
@@ -1,3 +1,11 @@
 #!/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_acc

-- 
okteta packaging