update package for changes in master, now merges from frameworks

8 files changed, 38 insertions, 64 deletions

diff --git a/debian/changelog b/debian/changelog
index ec2f3e2..adc1e9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,8 @@
-prison-kf5 (1.2~git20150223-0ubuntu3) UNRELEASED; urgency=medium
+prison-kf5 (5.25.0~git20160810-0) UNRELEASED; urgency=medium
 
-  * Debian merge. No remaining changes. 
+  * Update for changes and frameworks branch merged into master
 
- -- Scarlett Clark <sgclark@kubuntu.org>  Wed, 02 Dec 2015 13:45:28 -0800
+ -- Jonathan Riddell <jriddell@ubuntu.com>  Wed, 10 Aug 2016 15:19:47 +0100
 
 prison-kf5 (1.2~git20150223-0ubuntu2) vivid; urgency=medium
 
diff --git a/debian/control b/debian/control
index 458c895..c067e7e 100644
--- a/debian/control
+++ b/debian/control
@@ -17,7 +17,7 @@ Vcs-Git: git://anonscm.debian.org/pkg-kde/frameworks/prison.git
 Package: libkf5prison-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5prison1 (= ${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,7 +25,7 @@ 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: libkf5prison1
+Package: libkf5prison5
 Architecture: any
 Multi-Arch: same
 Pre-Depends: ${misc:Pre-Depends}
@@ -41,7 +41,7 @@ Section: debug
 Priority: extra
 Architecture: any
 Multi-Arch: same
-Depends: libkf5prison1 (= ${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/libkf5prison-dev.install b/debian/libkf5prison-dev.install
index 8c17a95..0b5e26d 100644
--- a/debian/libkf5prison-dev.install
+++ b/debian/libkf5prison-dev.install
@@ -1,4 +1,4 @@
-usr/include/KF5/PRISON/prison
+usr/include/KF5/prison/
 usr/include/KF5/prison_version.h
 usr/lib/*/cmake/KF5Prison/*
 usr/lib/*/libKF5Prison.so
diff --git a/debian/libkf5prison1.install b/debian/libkf5prison1.install
deleted file mode 100644
index d261cf1..0000000
--- a/debian/libkf5prison1.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/libKF5Prison.so.1*
diff --git a/debian/libkf5prison1.symbols b/debian/libkf5prison1.symbols
deleted file mode 100644
index 28172d2..0000000
--- a/debian/libkf5prison1.symbols
+++ /dev/null
@@ -1,55 +0,0 @@
-# SymbolsHelper-Confirmed: 1.2~ amd64
-libKF5Prison.so.1 libkf5prison1 #MINVER#
- _ZN6prison13Code39Barcode10paintImageERK6QSizeF@Base 1.2~
- _ZN6prison13Code39BarcodeC1Ev@Base 1.2~
- _ZN6prison13Code39BarcodeC2Ev@Base 1.2~
- _ZN6prison13Code39BarcodeD0Ev@Base 1.2~
- _ZN6prison13Code39BarcodeD1Ev@Base 1.2~
- _ZN6prison13Code39BarcodeD2Ev@Base 1.2~
- _ZN6prison13Code93Barcode10paintImageERK6QSizeF@Base 1.2~
- _ZN6prison13Code93BarcodeC1Ev@Base 1.2~
- _ZN6prison13Code93BarcodeC2Ev@Base 1.2~
- _ZN6prison13Code93BarcodeD0Ev@Base 1.2~
- _ZN6prison13Code93BarcodeD1Ev@Base 1.2~
- _ZN6prison13Code93BarcodeD2Ev@Base 1.2~
- _ZN6prison13QRCodeBarcode10paintImageERK6QSizeF@Base 1.2~
- _ZN6prison13QRCodeBarcodeC1Ev@Base 1.2~
- _ZN6prison13QRCodeBarcodeC2Ev@Base 1.2~
- _ZN6prison13QRCodeBarcodeD0Ev@Base 1.2~
- _ZN6prison13QRCodeBarcodeD1Ev@Base 1.2~
- _ZN6prison13QRCodeBarcodeD2Ev@Base 1.2~
- _ZN6prison15AbstractBarcode14setMinimumSizeERK6QSizeF@Base 1.2~
- _ZN6prison15AbstractBarcode18setBackgroundColorERK6QColor@Base 1.2~
- _ZN6prison15AbstractBarcode18setForegroundColorERK6QColor@Base 1.2~
- _ZN6prison15AbstractBarcode7setDataERK7QString@Base 1.2~
- _ZN6prison15AbstractBarcode7toImageERK6QSizeF@Base 1.2~
- _ZN6prison15AbstractBarcodeC1Ev@Base 1.2~
- _ZN6prison15AbstractBarcodeC2Ev@Base 1.2~
- _ZN6prison15AbstractBarcodeD0Ev@Base 1.2~
- _ZN6prison15AbstractBarcodeD1Ev@Base 1.2~
- _ZN6prison15AbstractBarcodeD2Ev@Base 1.2~
- _ZN6prison17DataMatrixBarcode10paintImageERK6QSizeF@Base 1.2~
- _ZN6prison17DataMatrixBarcodeC1Ev@Base 1.2~
- _ZN6prison17DataMatrixBarcodeC2Ev@Base 1.2~
- _ZN6prison17DataMatrixBarcodeD0Ev@Base 1.2~
- _ZN6prison17DataMatrixBarcodeD1Ev@Base 1.2~
- _ZN6prison17DataMatrixBarcodeD2Ev@Base 1.2~
- _ZNK6prison15AbstractBarcode11minimumSizeEv@Base 1.2~
- _ZNK6prison15AbstractBarcode15backgroundColorEv@Base 1.2~
- _ZNK6prison15AbstractBarcode15foregroundColorEv@Base 1.2~
- _ZNK6prison15AbstractBarcode4dataEv@Base 1.2~
- _ZTIN6prison13Code39BarcodeE@Base 1.2~
- _ZTIN6prison13Code93BarcodeE@Base 1.2~
- _ZTIN6prison13QRCodeBarcodeE@Base 1.2~
- _ZTIN6prison15AbstractBarcodeE@Base 1.2~
- _ZTIN6prison17DataMatrixBarcodeE@Base 1.2~
- _ZTSN6prison13Code39BarcodeE@Base 1.2~
- _ZTSN6prison13Code93BarcodeE@Base 1.2~
- _ZTSN6prison13QRCodeBarcodeE@Base 1.2~
- _ZTSN6prison15AbstractBarcodeE@Base 1.2~
- _ZTSN6prison17DataMatrixBarcodeE@Base 1.2~
- _ZTVN6prison13Code39BarcodeE@Base 1.2~
- _ZTVN6prison13Code93BarcodeE@Base 1.2~
- _ZTVN6prison13QRCodeBarcodeE@Base 1.2~
- _ZTVN6prison15AbstractBarcodeE@Base 1.2~
- _ZTVN6prison17DataMatrixBarcodeE@Base 1.2~
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/source/format b/debian/source/format
index 163aaf8..89ae9db 100644
--- a/debian/source/format
+++ b/debian/source/format
@@ -1 +1 @@
-3.0 (quilt)
+3.0 (native)