[SCM] kiten packaging branch, master, updated. debian/14.12.3-1-10-gf9c015e

Sun Jun 14 17:27:59 UTC 2015

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

The following commit has been merged in the master branch:
commit 32a27b035b5ca34eabfe8bda126223a8b5688a98
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Thu May 28 09:06:15 2015 +0200

    Migrated to kf
---
 debian/control                                      | 16 ++++------------
 debian/{libkiten4abi1.acc => libkiten-dev.acc.in}   |  4 ++--
 debian/libkiten-dev.install                         |  2 +-
 debian/libkiten4abi1.install                        |  2 --
 debian/libkiten5.install                            |  2 ++
 debian/{libkiten4abi1.symbols => libkiten5.symbols} |  2 +-
 debian/patches/enable_debianabimanager.diff         | 19 -------------------
 debian/patches/series                               |  1 -
 8 files changed, 10 insertions(+), 38 deletions(-)

diff --git a/debian/control b/debian/control
index b3c8d98..54c0ecc 100644
--- a/debian/control
+++ b/debian/control
@@ -9,8 +9,6 @@ Build-Depends: cmake (>= 2.8.12~),
                debhelper (>= 9),
                extra-cmake-modules,
                imagemagick,
-               kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev,
                kdoctools-dev,
                libkf5archive-dev,
                libkf5completion-dev,
@@ -20,7 +18,7 @@ Build-Depends: cmake (>= 2.8.12~),
                libkf5i18n-dev,
                libkf5khtml-dev,
                libkf5xmlgui-dev,
-               pkg-kde-tools (>= 0.12),
+               pkg-kde-tools (>> 0.15.15),
                qtbase5-dev (>= 5.4)
 Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest
@@ -40,13 +38,10 @@ Description: Japanese reference and study aid for KDE
  .
  This package is part of the KDE education module.
 
-Package: libkiten4abi1
+Package: libkiten5
 Architecture: any
 Section: libs
-X-Debian-ABI: 1
 Depends: edict, kanjidic, ${misc:Depends}, ${shlibs:Depends}
-Replaces: libkiten1
-Breaks: libkiten1
 Description: libraries for the Kiten Japanese reference and study aid
  This package contains shared libraries, language data, and resources used by
  the Kiten Japanese reference and study aid.  Portions of this library,
@@ -58,7 +53,7 @@ Description: libraries for the Kiten Japanese reference and study aid
 Package: libkiten-dev
 Architecture: any
 Section: libdevel
-Depends: kdelibs5-dev, libkiten4abi1 (= ${binary:Version}), ${misc:Depends}
+Depends: libkiten5 (= ${binary:Version}), ${misc:Depends}
 Description: development files for the Kiten Japanese reference libraries
  This package contains development files for building software that uses the
  Kiten Japanese reference libraries.
@@ -69,10 +64,7 @@ Package: kiten-dbg
 Architecture: any
 Section: debug
 Priority: extra
-Depends: kde-runtime-dbg, libkiten4abi1 (= ${binary:Version}), ${misc:Depends}
-Breaks: kdeedu-dbg (<< 4:4.7.2)
-Replaces: kdeedu-dbg (<< 4:4.7.2)
-Recommends: kiten (= ${binary:Version})
+Depends: kiten (= ${binary:Version}), ${misc:Depends}
 Description: debugging symbols for Kiten
  This package contains debugging files used to investigate problems with
  libraries and binaries of Kiten.
diff --git a/debian/libkiten4abi1.acc b/debian/libkiten-dev.acc.in
similarity index 71%
rename from debian/libkiten4abi1.acc
rename to debian/libkiten-dev.acc.in
index a9e32c7..4ae303e 100644
--- a/debian/libkiten4abi1.acc
+++ b/debian/libkiten-dev.acc.in
@@ -2,7 +2,7 @@
 <descriptor>
 
 <version>
-    4.11.3
+    15.04.1
 </version>
 
 <headers>
@@ -10,7 +10,7 @@
 </headers>
 
 <libs>
-    /usr/lib/libkiten.so
+    /usr/lib/@@DEB_HOST_MULTIARCH@@/libkiten.so
 </libs>
 
 </descriptor>
diff --git a/debian/libkiten-dev.install b/debian/libkiten-dev.install
index 5150e32..31f8cd0 100644
--- a/debian/libkiten-dev.install
+++ b/debian/libkiten-dev.install
@@ -1,2 +1,2 @@
 usr/include/libkiten/
-usr/lib/libkiten.so
+usr/lib/*/libkiten.so
diff --git a/debian/libkiten4abi1.install b/debian/libkiten4abi1.install
deleted file mode 100644
index 1f8c3bd..0000000
--- a/debian/libkiten4abi1.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/libkiten.so.4.*.*.abi1
-usr/lib/libkiten.so.4abi1
diff --git a/debian/libkiten5.install b/debian/libkiten5.install
new file mode 100644
index 0000000..b8f193f
--- /dev/null
+++ b/debian/libkiten5.install
@@ -0,0 +1,2 @@
+usr/lib/*/libkiten.so.5.*
+usr/lib/*/libkiten.so.5
diff --git a/debian/libkiten4abi1.symbols b/debian/libkiten5.symbols
similarity index 99%
rename from debian/libkiten4abi1.symbols
rename to debian/libkiten5.symbols
index 71d20c6..b6564e4 100644
--- a/debian/libkiten4abi1.symbols
+++ b/debian/libkiten5.symbols
@@ -1,5 +1,5 @@
 # SymbolsHelper-Confirmed: 4:14.12.3 hppa
-libkiten.so.4abi1 libkiten4abi1 #MINVER#
+libkiten.so.5 libkiten5 #MINVER#
 * Build-Depends-Package: libkiten-dev
  ABI_4_1 at ABI_4_1 4:4.8.4
  _ZN10EntryEdict9loadEntryERK7QString at ABI_4_1 4:4.8.4
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
deleted file mode 100644
index e1ae907..0000000
--- a/debian/patches/enable_debianabimanager.diff
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Modestas Vainius <modax at debian.org>
-From: Pino Toscano <pino at debian.org>
-Subject: Use DebianABIManager for this source package. It's Debian-specific.
-Forwarded: not-needed
-Last-Update: 2012-06-16
-
-For more information about DebianABIManager, refer to
-/usr/share/doc/pkg-kde-tools/README.DebianABIManager (pkg-kde-tools (>= 0.12)).
-
-Index: kiten/CMakeLists.txt
-===================================================================
---- kiten.orig/CMakeLists.txt	2014-08-19 23:14:39.142352102 +0200
-+++ kiten/CMakeLists.txt	2014-08-19 23:14:39.138352266 +0200
-@@ -37,3 +37,5 @@
- 
- ## Install our datafiles
- install( FILES data/edict data/kanjidic data/radkfile data/vconj data/romkana.cnv DESTINATION ${DATA_INSTALL_DIR}/kiten )
-+
-+include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
diff --git a/debian/patches/series b/debian/patches/series
index 41029b5..a042211 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
-enable_debianabimanager.diff
 remove_skip_codes
 avoid_installing_incomplete_header

-- 
kiten packaging

