[SCM] kdesdk-kioslaves packaging branch, master, updated. debian/16.04.0-1-1-gd255fc5

Jonathan Riddell jriddell-guest at moszumanska.debian.org
Fri Apr 7 10:57:12 UTC 2017 

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

The following commit has been merged in the master branch:
commit d255fc5fe3a1ef3be80ba7b78fefb563f811dae8
Author: Jonathan Riddell <jr at jriddell.org>
Date:   Fri Apr 7 11:57:10 2017 +0100

    update packaging for kf5 build
---
 debian/control                    | 18 ++++-------
 debian/copyright                  | 65 +--------------------------------------
 debian/kdesdk-kio-plugins.install | 57 ----------------------------------
 debian/rules                      |  8 +----
 debian/upstream/signing-key.asc   | 52 +++++++++++++++++++++++++++++++
 debian/watch                      |  4 +--
 6 files changed, 62 insertions(+), 142 deletions(-)

diff --git a/debian/control b/debian/control
index 9df7d57..cad112e 100644
--- a/debian/control
+++ b/debian/control
@@ -7,25 +7,19 @@ Uploaders: Sune Vuorela <sune at debian.org>,
            Modestas Vainius <modax at debian.org>,
            George Kiagiadakis <kiagiadakis.george at gmail.com>,
            Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.6~),
-               debhelper (>= 9),
-               kde-sc-dev-latest (>= 4:4.12),
-               kdelibs5-dev,
-               libsvn-dev,
-               pkg-kde-tools (>= 0.12)
+Build-Depends: cmake (>= 2.6~), debhelper (>= 9), pkg-kde-tools (>= 0.12)
 Standards-Version: 3.9.8
 Homepage: http://www.kde.org/
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kdesdk-kioslaves.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kdesdk-kioslaves.git
 
-Package: kdesdk-kio-plugins
+Package: kio-perldoc
 Architecture: any
 Section: devel
-Depends: subversion, ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
+Depends: ${misc:Depends}, ${perl:Depends}, ${shlibs:Depends}
 Suggests: perl-doc
-Description: transparent Subversion access and Perl documentation KIO slaves
- This package includes the svn and svn+ssh KIO plugins, which allows KDE
- applications to browse remote Subversion repositories, and the perldoc KIO
- plugin, which can be used to browse the Perl documentation within Konqueror.
+Description: Perl documentation KIO slave
+ This package includes the perldoc KIO plugin, which can be used to
+ browse the Perl documentation within Konqueror.
  .
  This package is part of the KDE Software Development Kit module.
diff --git a/debian/copyright b/debian/copyright
index 6deee48..c32348a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,31 +5,13 @@ Upstream-Contact: Jeremy Paul Whiting <jpwhiting at kde.org>
 Source: http://www.kde.org/download/
 
 Files: *
-Copyright: 2003-2005, Mickael Marchand <marchand at kde.org>
+Copyright: 2007, Michael Pyne <michael.pyne at kdemail.net>
 License: GPL-2+
 
-Files: svn/svn.cpp
-       svn/svn.h
-       svn/svnhelper/kio_svn_helper.cpp
-       svn/svnhelper/kio_svn_helper.h
-Copyright: 2003-2005, Mickael Marchand <marchand at kde.org>
-License: LGPL-2+
-
 Files: perldoc/perldoc.cpp
        perldoc/perldoc.h
 Copyright: 2007, Michael Pyne <michael.pyne at kdemail.net>
 License: GPL-2+
- * Borrowed from KDevelop's perldoc ioslave, and improved.
- * Copyright 2007 Michael Pyne <michael.pyne at kdemail.net>
- *
- * No copyright header was present in KDevelop's perldoc io slave source
- * code.  However, source code revision history indicates it was written and
- * imported by Bernd Gehrmann <bernd at mail.berlios.de>.  KDevelop is distributed
- * under the terms of the GNU General Public License v2.  Therefore, so is
- * this software.
- *
- * All changes made by Michael Pyne are licensed under the terms of the GNU
- * GPL version 2 or (at your option) any later version.
 
 Files: perldoc/pod2html.pl
 Copyright: 2004, Graciliano M. P
@@ -48,32 +30,6 @@ License: GPL-1+ or Artistic
  License version 1 can be found in `/usr/share/common-licenses/GPL-1' and the
  Artistic Licence in `/usr/share/common-licenses/Artistic'.
 
-Files: cmake/*
-Copyright: 2006, Laurent Montel, <montel at kde.org>
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without
- modification, are permitted provided that the following conditions
- are met:
- .
- 1. Redistributions of source code must retain the copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
- (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
- THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
-
 Files: debian/*
 Copyright: 2007-2013, Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 License: GPL-2+
@@ -94,22 +50,3 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General Public
  License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-License: LGPL-2+
- This program is free software; you can redistribute it and/or
- modify it under the terms of the GNU Library General Public
- License as published by the Free Software Foundation; either
- version 2 of the License, or (at your option) any later version.
- .
- This program is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
- Library General Public License for more details.
- .
- You should have received a copy of the GNU Library General Public License
- along with this program; see the file COPYING.  If not, write to
- the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301, USA.
- .
- On Debian systems, the complete text of the GNU Library General Public
- License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
diff --git a/debian/kdesdk-kio-plugins.install b/debian/kdesdk-kio-plugins.install
deleted file mode 100644
index 426ca0d..0000000
--- a/debian/kdesdk-kio-plugins.install
+++ /dev/null
@@ -1,57 +0,0 @@
-# usr/bin/kio_svn_helper
-# usr/lib/kde4/kded_ksvnd.so
-usr/lib/kde4/kio_perldoc.so
-# usr/lib/kde4/kio_svn.so
-# usr/share/dbus-1/interfaces/org.kde.ksvnd.xml
-# usr/share/icons/hicolor/128x128/actions/vcs-add-svn-kiosvn.png
-# usr/share/icons/hicolor/128x128/actions/vcs-branch-svn-kiosvn.png
-# usr/share/icons/hicolor/128x128/actions/vcs-merge-svn-kiosvn.png
-# usr/share/icons/hicolor/128x128/actions/vcs-remove-svn-kiosvn.png
-# usr/share/icons/hicolor/128x128/actions/vcs-status-svn-kiosvn.png
-# usr/share/icons/hicolor/128x128/actions/vcs-switch-svn-kiosvn.png
-# usr/share/icons/hicolor/16x16/actions/vcs-add-svn-kiosvn.png
-# usr/share/icons/hicolor/16x16/actions/vcs-branch-svn-kiosvn.png
-# usr/share/icons/hicolor/16x16/actions/vcs-merge-svn-kiosvn.png
-# usr/share/icons/hicolor/16x16/actions/vcs-remove-svn-kiosvn.png
-# usr/share/icons/hicolor/16x16/actions/vcs-status-svn-kiosvn.png
-# usr/share/icons/hicolor/16x16/actions/vcs-switch-svn-kiosvn.png
-# usr/share/icons/hicolor/22x22/actions/vcs-add-svn-kiosvn.png
-# usr/share/icons/hicolor/22x22/actions/vcs-branch-svn-kiosvn.png
-# usr/share/icons/hicolor/22x22/actions/vcs-merge-svn-kiosvn.png
-# usr/share/icons/hicolor/22x22/actions/vcs-remove-svn-kiosvn.png
-# usr/share/icons/hicolor/22x22/actions/vcs-status-svn-kiosvn.png
-# usr/share/icons/hicolor/22x22/actions/vcs-switch-svn-kiosvn.png
-# usr/share/icons/hicolor/32x32/actions/vcs-add-svn-kiosvn.png
-# usr/share/icons/hicolor/32x32/actions/vcs-branch-svn-kiosvn.png
-# usr/share/icons/hicolor/32x32/actions/vcs-merge-svn-kiosvn.png
-# usr/share/icons/hicolor/32x32/actions/vcs-remove-svn-kiosvn.png
-# usr/share/icons/hicolor/32x32/actions/vcs-status-svn-kiosvn.png
-# usr/share/icons/hicolor/32x32/actions/vcs-switch-svn-kiosvn.png
-# usr/share/icons/hicolor/48x48/actions/vcs-add-svn-kiosvn.png
-# usr/share/icons/hicolor/48x48/actions/vcs-branch-svn-kiosvn.png
-# usr/share/icons/hicolor/48x48/actions/vcs-merge-svn-kiosvn.png
-# usr/share/icons/hicolor/48x48/actions/vcs-remove-svn-kiosvn.png
-# usr/share/icons/hicolor/48x48/actions/vcs-status-svn-kiosvn.png
-# usr/share/icons/hicolor/48x48/actions/vcs-switch-svn-kiosvn.png
-# usr/share/icons/hicolor/64x64/actions/vcs-add-svn-kiosvn.png
-# usr/share/icons/hicolor/64x64/actions/vcs-branch-svn-kiosvn.png
-# usr/share/icons/hicolor/64x64/actions/vcs-merge-svn-kiosvn.png
-# usr/share/icons/hicolor/64x64/actions/vcs-remove-svn-kiosvn.png
-# usr/share/icons/hicolor/64x64/actions/vcs-status-svn-kiosvn.png
-# usr/share/icons/hicolor/64x64/actions/vcs-switch-svn-kiosvn.png
-# usr/share/icons/hicolor/scalable/actions/vcs-add-svn-kiosvn.svgz
-# usr/share/icons/hicolor/scalable/actions/vcs-branch-svn-kiosvn.svgz
-# usr/share/icons/hicolor/scalable/actions/vcs-merge-svn-kiosvn.svgz
-# usr/share/icons/hicolor/scalable/actions/vcs-remove-svn-kiosvn.svgz
-# usr/share/icons/hicolor/scalable/actions/vcs-status-svn-kiosvn.svgz
-# usr/share/icons/hicolor/scalable/actions/vcs-switch-svn-kiosvn.svgz
-usr/share/kde4/apps/kio_perldoc/pod2html.pl
-# usr/share/kde4/services/ServiceMenus/subversion.desktop
-# usr/share/kde4/services/ServiceMenus/subversion_toplevel.desktop
-# usr/share/kde4/services/kded/ksvnd.desktop
-usr/share/kde4/services/perldoc.protocol
-# usr/share/kde4/services/svn+file.protocol
-# usr/share/kde4/services/svn+http.protocol
-# usr/share/kde4/services/svn+https.protocol
-# usr/share/kde4/services/svn+ssh.protocol
-# usr/share/kde4/services/svn.protocol
diff --git a/debian/rules b/debian/rules
index 38e512b..96743ba 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,6 @@
 #!/usr/bin/make -f
 
-include /usr/share/pkg-kde-tools/qt-kde-team/2/debian-qt-kde.mk
-
-override_dh_auto_configure:
-	$(overridden_command) -- -DBUILD_svn=FALSE
-
-override_dh_auto_install:
-	$(overridden_command) --destdir=debian/tmp
+include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
 
 override_dh_strip:
 	$(overridden_command) --dbgsym-migration='kdesdk-kioslaves-dbg (<= 4:15.08.3-2~1.gbpeb13b4~)'
diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc
new file mode 100644
index 0000000..eeba72e
--- /dev/null
+++ b/debian/upstream/signing-key.asc
@@ -0,0 +1,52 @@
+-----BEGIN PGP PUBLIC KEY BLOCK-----
+Version: GnuPG v1
+
+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
+hC+sXh0NMOq4pxE=
+=Wqdv
+-----END PGP PUBLIC KEY BLOCK-----
diff --git a/debian/watch b/debian/watch
index 850014e..0f2618f 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
-http://download.kde.org/stable/applications/([\d.]+)/src/kdesdk-kioslaves-([\d.]+).tar.xz
+version=4
+opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/applications/([\d.]+)/src/umbrello-([\d.]+).tar.xz

-- 
kdesdk-kioslaves packaging

More information about the pkg-kde-commits mailing list