Merge ~tsimonq2/kubuntu-packaging/+git/kubuntu-prison:kubuntu_unstable into ~kubuntu-packagers/kubuntu-packaging/+git/prison:kubuntu_unstable

[Simon Quigley]

As discussed on IRC, update the symbols and remove the enabledebianabi patch.

[Achim Bohnet (allee)]

Nit picking: changelog entries should not contain what was does (that the job of the diff) but why it was done. Achim

diff --git a/debian/changelog b/debian/changelog
index cb401fd..43732ec 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -12,6 +12,7 @@ prison-kf5 (1.2.2~git20160726-0ubuntu1) UNRELEASED; urgency=medium
   * Fix missing files
   * Bump Standards-version to 3.9.7, no changes needed
   * Fix insecure Git URI
+  * Bump symbols and remove debianabimanager patch
 
  -- Clive Johnston <[e-mail]>  Tue, 26 Jul 2016 12:59:36 +0100
 
diff --git a/debian/control b/debian/control
index 2bcebec..0d5b3e9 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Vcs-Git: https://git.launchpad.net/~kubuntu-packagers/kubuntu-packaging/+git/pri
 Package: libkf5prison-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5prison1abi1 (= ${binary:Version}), ${misc:Depends}
+Depends: libkf5prison5 (= ${binary:Version}), ${misc:Depends}
 Description: barcode API for Qt - development files
  prison is a barcode API currently offering a nice Qt API to produce QRCode
  barcodes and DataMatrix barcodes, and can easily be made support more.
@@ -25,10 +25,9 @@ Description: barcode API for Qt - development files
  This package contains the development headers and files needed to create
  applications that use the prison library.
 
-Package: libkf5prison1abi1
+Package: libkf5prison5
 Architecture: any
 Multi-Arch: same
-X-Debian-ABI: 1
 X-CMake-Target: KF5Prison
 Pre-Depends: ${misc:Pre-Depends}
 Depends: ${misc:Depends}, ${shlibs:Depends}
@@ -43,7 +42,7 @@ Section: debug
 Priority: extra
 Architecture: any
 Multi-Arch: same
-Depends: libkf5prison1abi1 (= ${binary:Version}), ${misc:Depends}
+Depends: libkf5prison5 (= ${binary:Version}), ${misc:Depends}
 Description: barcode API for Qt - debugging symbols
  prison is a barcode API currently offering a nice Qt API to produce QRCode
  barcodes and DataMatrix barcodes, and can easily be made support more.
diff --git a/debian/libkf5prison1abi1.install b/debian/libkf5prison1abi1.install
deleted file mode 100644
index c5b5502..0000000
--- a/debian/libkf5prison1abi1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libKF5Prison.so.*
diff --git a/debian/libkf5prison1abi1.symbols b/debian/libkf5prison1abi1.symbols
deleted file mode 100644
index f7b221f..0000000
--- a/debian/libkf5prison1abi1.symbols
+++ /dev/null
@@ -1,29 +0,0 @@
-# SymbolsHelper-Confirmed: 1.2.2+p16.10+git20160822.0347 amd64
-libKF5Prison.so.1 libkf5prison1abi1 #MINVER#
- _ZN6Prison13QRCodeBarcode10paintImageERK6QSizeF@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison13QRCodeBarcodeC1Ev@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison13QRCodeBarcodeC2Ev@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison13QRCodeBarcodeD0Ev@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison13QRCodeBarcodeD1Ev@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison13QRCodeBarcodeD2Ev@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison13createBarcodeENS_11BarcodeTypeE@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison15AbstractBarcode14setMinimumSizeERK6QSizeF@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison15AbstractBarcode18setBackgroundColorERK6QColor@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison15AbstractBarcode18setForegroundColorERK6QColor@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison15AbstractBarcode7setDataERK7QString@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison15AbstractBarcode7toImageERK6QSizeF@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison15AbstractBarcodeC1Ev@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison15AbstractBarcodeC2Ev@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison15AbstractBarcodeD0Ev@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison15AbstractBarcodeD1Ev@Base 1.2.2+p16.10+git20160726.1146
- _ZN6Prison15AbstractBarcodeD2Ev@Base 1.2.2+p16.10+git20160726.1146
- _ZNK6Prison15AbstractBarcode11minimumSizeEv@Base 1.2.2+p16.10+git20160726.1146
- _ZNK6Prison15AbstractBarcode15backgroundColorEv@Base 1.2.2+p16.10+git20160726.1146
- _ZNK6Prison15AbstractBarcode15foregroundColorEv@Base 1.2.2+p16.10+git20160726.1146
- _ZNK6Prison15AbstractBarcode4dataEv@Base 1.2.2+p16.10+git20160726.1146
- _ZTIN6Prison13QRCodeBarcodeE@Base 1.2.2+p16.10+git20160726.1146
- _ZTIN6Prison15AbstractBarcodeE@Base 1.2.2+p16.10+git20160726.1146
- _ZTSN6Prison13QRCodeBarcodeE@Base 1.2.2+p16.10+git20160726.1146
- _ZTSN6Prison15AbstractBarcodeE@Base 1.2.2+p16.10+git20160726.1146
- _ZTVN6Prison13QRCodeBarcodeE@Base 1.2.2+p16.10+git20160726.1146
- _ZTVN6Prison15AbstractBarcodeE@Base 1.2.2+p16.10+git20160726.1146
diff --git a/debian/libkf5prison5.install b/debian/libkf5prison5.install
new file mode 100644
index 0000000..ad22c70
--- /dev/null
+++ b/debian/libkf5prison5.install
@@ -0,0 +1 @@
+usr/lib/*/libKF5Prison.so.5*
diff --git a/debian/libkf5prison5.symbols b/debian/libkf5prison5.symbols
new file mode 100644
index 0000000..b1d3254
--- /dev/null
+++ b/debian/libkf5prison5.symbols
@@ -0,0 +1,29 @@
+# SymbolsHelper-Confirmed: 5.25.0~ amd64
+libKF5Prison.so.5 libkf5prison5 #MINVER#
+ _ZN6Prison13QRCodeBarcode10paintImageERK6QSizeF@Base 5.25.0~
+ _ZN6Prison13QRCodeBarcodeC1Ev@Base 5.25.0~
+ _ZN6Prison13QRCodeBarcodeC2Ev@Base 5.25.0~
+ _ZN6Prison13QRCodeBarcodeD0Ev@Base 5.25.0~
+ _ZN6Prison13QRCodeBarcodeD1Ev@Base 5.25.0~
+ _ZN6Prison13QRCodeBarcodeD2Ev@Base 5.25.0~
+ _ZN6Prison13createBarcodeENS_11BarcodeTypeE@Base 5.25.0~
+ _ZN6Prison15AbstractBarcode14setMinimumSizeERK6QSizeF@Base 5.25.0~
+ _ZN6Prison15AbstractBarcode18setBackgroundColorERK6QColor@Base 5.25.0~
+ _ZN6Prison15AbstractBarcode18setForegroundColorERK6QColor@Base 5.25.0~
+ _ZN6Prison15AbstractBarcode7setDataERK7QString@Base 5.25.0~
+ _ZN6Prison15AbstractBarcode7toImageERK6QSizeF@Base 5.25.0~
+ _ZN6Prison15AbstractBarcodeC1Ev@Base 5.25.0~
+ _ZN6Prison15AbstractBarcodeC2Ev@Base 5.25.0~
+ _ZN6Prison15AbstractBarcodeD0Ev@Base 5.25.0~
+ _ZN6Prison15AbstractBarcodeD1Ev@Base 5.25.0~
+ _ZN6Prison15AbstractBarcodeD2Ev@Base 5.25.0~
+ _ZNK6Prison15AbstractBarcode11minimumSizeEv@Base 5.25.0~
+ _ZNK6Prison15AbstractBarcode15backgroundColorEv@Base 5.25.0~
+ _ZNK6Prison15AbstractBarcode15foregroundColorEv@Base 5.25.0~
+ _ZNK6Prison15AbstractBarcode4dataEv@Base 5.25.0~
+ _ZTIN6Prison13QRCodeBarcodeE@Base 5.25.0~
+ _ZTIN6Prison15AbstractBarcodeE@Base 5.25.0~
+ _ZTSN6Prison13QRCodeBarcodeE@Base 5.25.0~
+ _ZTSN6Prison15AbstractBarcodeE@Base 5.25.0~
+ _ZTVN6Prison13QRCodeBarcodeE@Base 5.25.0~
+ _ZTVN6Prison15AbstractBarcodeE@Base 5.25.0~
diff --git a/debian/patches/enable_debianabimanager.diff b/debian/patches/enable_debianabimanager.diff
deleted file mode 100644
index 74d8ea5..0000000
--- a/debian/patches/enable_debianabimanager.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-Description: Use DebianABIManager for this source package.
-Forwarded: not-needed
-Origin: vendor
-Author: Clive Johnston <[e-mail]>
-
-Index: prison/CMakeLists.txt
-===================================================================
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -37,6 +37,10 @@
- 
- add_subdirectory(lib)
- add_subdirectory(tools)
-+
-+# Add support for DebianABIManager
-+include(/usr/share/pkg-kde-tools/cmake/DebianABIManager.cmake)
-+
- if(BUILD_TESTING)
-     find_package(Qt5 ${REQUIRED_QT_VERSION} CONFIG REQUIRED Test Widgets)
-     add_subdirectory(tests)
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index ba161c0..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-enable_debianabimanager.diff