[SCM] ark packaging branch, kubuntu_wily_archive, updated. debian/4.14.2-1-21-gc2931aa

[Jonathan Riddell]

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

The following commit has been merged in the kubuntu_wily_archive branch:
commit c2931aaa5edb325700a2f78ec8594f7c849a1f6f
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Tue Aug 11 13:14:54 2015 +0200

    Ported to KF5
---
 debian/.gitattributes |  1 +
 debian/changelog      |  8 ++++++--
 debian/control        | 25 ++++++++++++++++++-------
 debian/rules          |  4 ++--
 4 files changed, 27 insertions(+), 11 deletions(-)

diff --git a/debian/.gitattributes b/debian/.gitattributes
new file mode 100644
index 0000000..6a03163
--- /dev/null
+++ b/debian/.gitattributes
@@ -0,0 +1 @@
+changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index e33d400..b3ad0fd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,14 @@
-ark (4:15.04.3-0ubuntu1) UNRELEASED; urgency=medium
+ark (4:15.07.80-1ubuntu1) UNRELEASED; urgency=medium
 
+  [ Jonathan Riddell ]
   * New upstream release
   * Remove Debian patch use_libarchive_for_zip_files, it causes problems
     LP: #1404239
 
- -- Jonathan Riddell <jriddell at ubuntu.com>  Thu, 02 Jul 2015 16:54:44 +0000
+  [ Aaron Honeycutt ]
+  * Ported to KF5
+
+ -- Aaron Honeycutt <aaronhoneycutt at kubuntu.org>  Fri, 07 Aug 2015 13:23:05 +0000
 
 ark (4:15.04.2-0ubuntu1) wily; urgency=medium
 
diff --git a/debian/control b/debian/control
index 7169ec5..f16714e 100644
--- a/debian/control
+++ b/debian/control
@@ -10,20 +10,31 @@ Uploaders: Fathi Boudra <fabo at debian.org>,
            Maximiliano Curia <maxy at debian.org>
 Build-Depends: cmake,
                debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev,
+               extra-cmake-modules,
+               kdoctools-dev,
+               kio-dev,
                libarchive-dev,
                libbz2-dev,
-               libkonq5-dev (>= 4:15.04.2),
+               libkf5archive-dev,
+               libkf5config-dev,
+               libkf5crash-dev,
+               libkf5dbusaddons-dev,
+               libkf5i18n-dev,
+               libkf5iconthemes-dev,
+               libkf5khtml-dev,
+               libkf5pty-dev,
+               libkf5service-dev,
+               libkf5widgetsaddons-dev,
                liblzma-dev,
                libqjson-dev,
-               pkg-kde-tools (>= 0.12),
+               pkg-kde-tools (>= 0.15.15ubuntu1~),
+               qtbase5-dev,
                zlib1g-dev
-Standards-Version: 3.9.5
+Standards-Version: 3.9.6
 XS-Testsuite: autopkgtest
 Homepage: http://www.kde.org/
-Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/kde-applications/ark.git/
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-applications/ark.git
+Vcs-Browser: http://anonscm.debian.org/cgit/pkg-kde/applications/ark.git
+Vcs-Git: git://anonscm.debian.org/pkg-kde/applications/ark.git
 
 Package: ark
 Section: utils
diff --git a/debian/rules b/debian/rules
index 74244eb..de001e8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,10 +1,10 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
 	$(overridden_command) --dbg-package=ark-dbg
 
 override_dh_auto_install:
 	dh_auto_install --destdir=debian/ark
-	rm  debian/ark/usr/lib/libkerfuffle.so
+	rm  debian/ark/usr/lib/*/libkerfuffle.so

-- 
ark packaging