[neon/extras/ktorrent/Neon/unstable] debian: kf6ify
Carlos De Maine
null at kde.org
Tue Nov 21 22:59:31 GMT 2023
Git commit e3aa07cc3c949b40a3b19711f3391c4bad8d1a38 by Carlos De Maine.
Committed on 21/11/2023 at 23:59.
Pushed by carlosdem into branch 'Neon/unstable'.
kf6ify
D +0 -33 debian/NEWS
D +0 -49 debian/README.source
D +0 -1 debian/compat
M +43 -49 debian/control
D +0 -6 debian/ktorrent-data.install
D +0 -1 debian/ktorrent-data.lintian-overrides
M +6 -0 debian/ktorrent.install
D +0 -31 debian/patches/upstream_QTimer-may-not-be-an-incomplete-type-as-it-is-used-a.patch
M +6 -12 debian/rules
https://invent.kde.org/neon/extras/ktorrent/-/commit/e3aa07cc3c949b40a3b19711f3391c4bad8d1a38
diff --git a/debian/NEWS b/debian/NEWS
deleted file mode 100644
index 4aa45e1a..00000000
--- a/debian/NEWS
+++ /dev/null
@@ -1,33 +0,0 @@
-ktorrent (3.1+dfsg.2-1) unstable; urgency=low
-
- Since there have been two stable KTorrent 3.x (for KDE4) releases by the time
- of writing and KTorrent 2.2.x (for KDE3) has not been updated much in the
- meantime, I decided to ship both versions in Debian Lenny choosing KTorrent
- 3.x as default. Therefore:
- - you can get the old KTorrent 2.2.x release by installing ktorrent2.2
- package if you don't want to install KDE4 runtime dependencies or new
- features are not important for you;
- - since ktorrent binary package provides KDE4 based release from now on, it
- will pull in KDE4 runtime dependencies. However, it is a newer KTorrent
- upstream release and has more features. It should work fine with KDE3
- desktop environment;
- - you cannot co-install both ktorrent2.2 and ktorrent. They conflict with
- each other and you can have only one of them on the system at the same
- time.
- - KTorrent 3.1 supports migration of torrents from KTorrent 2.2 but not
- vice-versa. Therefore, if you start downloading/uploading torrents with
- KTorrent 3.1, you will probably not be able to resume them with KTorrent
- 2.2 if you downgrade.
-
- -- Modestas Vainius <modestas at vainius.eu> Mon, 30 Jun 2008 22:46:56 +0300
-
-ktorrent (2.1.4.dfsg.1-1) unstable; urgency=low
-
- Now KTorrent uses system-wide GeoIP library (libgeoip1) and its default GeoIP
- Country database to determine countries, which BitTorrent peers originate
- from. The default free database provided by libgeoip is a bit outdated and
- not very accurate. If you wish to upgrade the database, please read
- /usr/share/doc/ktorrent/README.Debian and
- /usr/share/doc/libgeoip1/README.Debian.
-
- -- Modestas Vainius <modestas at vainius.eu> Sun, 03 Jun 2007 15:40:07 +0300
diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index c550c026..00000000
--- a/debian/README.source
+++ /dev/null
@@ -1,49 +0,0 @@
-Branches in the Git packaging repository
-----------------------------------------
-
-Packaging branches must NOT have any debian/patches/* applied. When diff'ing
-packaging and the respective upstream branch, there must NOT be any changes
-outside debian/ subdirectory.
-
-Repository layout is as follows:
-
-* master - the main packaging branch (upstream source and
- debian directory). Typically targets Debian unstable.
-* upstream - upstream source code for the master branch.
-* <suitename> - packaging branch targeting Debian <suite_name>
-* upstream-<suitename> - upstream source code for packaging in <suite_name>
- branch.
-* pristine-tar - a branch with pristine-tar deltas for original
- - upstream tarballs.
-* debian/<dversion> - annotated signed tags for package releases to Debian
- (based on master and <suitename> branches. ~ is
- replaced with -. Tag message should be of the form
- '<dversion>/<suitename>'.
-* upstream/<uversion> - annotated tags for upstream releases which had at least one
- debian package release (based on upstream and
- upstream-<suitename> branches). ~ is replaced with -.
-
-General rules for patches in debian/patches
--------------------------------------------
-
-- Patches are managed with `QUILT_PATCHES=debian/patches quilt`.
-* Highly recommended ~/.quiltrc settings are as follows:
- -------<--------->--------
- QUILT_NO_DIFF_INDEX=y
- QUILT_NO_DIFF_TIMESTAMPS=y
- QUILT_REFRESH_ARGS="-p ab"
- QUILT_DIFF_OPTS="-p"
- -------<--------->--------
-* All patches must have valid DEP-3 [1] headers with at least Description and
- Author/Origin fields.
-* Patches should follow these naming rules:
- - Each patch should be prefixed with either "debian_" for Debian specific
- changes, "general_" for distribution agnostic changes or "backport_" for
- changes backported from future releases.
- - Patch name should be rather short and meaningfully reflect nature of the
- changes. "_" should be used as a word separator.
- - It is recommended to suffix the patch name with either "_fix" for patches
- fixing bugs or with '_feature' for patches introducing new features.
-* All patches should have .diff extension.
-
-1. http://dep.debian.net/deps/dep3/
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28b..00000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 27116209..7ff58789 100644
--- a/debian/control
+++ b/debian/control
@@ -3,58 +3,57 @@ Section: net
Priority: optional
Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
Uploaders: Modestas Vainius <modax at debian.org>
-Build-Depends: cmake (>= 2.8.12),
- debhelper (>= 9~),
- extra-cmake-modules,
- kross-dev (>= 5.15),
+Build-Depends: cmake,
+ debhelper-compat (= 13),
+ kf6-extra-cmake-modules,
+ kf6-kcmutils-dev,
+ kf6-kcompletion-dev,
+ kf6-kconfig-dev,
+ kf6-kconfigwidgets-dev,
+ kf6-kcoreaddons-dev,
+ kf6-kcrash-dev,
+ kf6-kdbusaddons-dev,
+ kf6-kdnssd-dev,
+ kf6-kdoctools-dev,
+ kf6-kglobalaccel-dev
+ kf6-ki18n-dev,
+ kf6-kiconthemes-dev,
+ kf6-kitemviews-dev,
+ kf6-kio-dev,
+ kf6-knotifications-dev,
+ kf6-knotifyconfig-dev,
+ kf6-kparts-dev,
+ kf6-kplotting-dev,
+ kf6-kstatusnotifieritem-dev,
+ kf6-ktextwidgets-dev,
+ kf6-kwidgetsaddons-dev,
+ kf6-kwindowsystem-dev,
+ kf6-kxmlgui-dev,
+ kf6-solid-dev,
+ kf6-syndication-dev,
libboost-dev,
libgeoip-dev,
- libkf5archive-dev (>= 5.15),
- libkf5completion-dev (>= 5.15),
- libkf5config-dev (>= 5.15),
- libkf5configwidgets-dev (>= 5.15),
- libkf5coreaddons-dev (>= 5.15),
- libkf5crash-dev (>= 5.15),
- libkf5dbusaddons-dev (>= 5.15),
- libkf5dnssd-dev (>= 5.15),
- libkf5doctools-dev (>= 5.15),
- libkf5i18n-dev (>= 5.15),
- libkf5iconthemes-dev (>= 5.15),
- libkf5itemviews-dev (>= 5.15),
- libkf5kcmutils-dev (>= 5.15),
- libkf5kio-dev (>= 5.15),
- libkf5notifications-dev (>= 5.15),
- libkf5notifyconfig-dev (>= 5.15),
- libkf5parts-dev (>= 5.15),
- libkf5plotting-dev (>= 5.15),
- libkf5service-dev (>= 5.15),
- libkf5solid-dev (>= 5.15),
- libkf5syndication-dev,
- libkf5textwidgets-dev (>= 5.15),
- libkf5widgetsaddons-dev (>= 5.15),
- libkf5windowsystem-dev (>= 5.15),
- libkf5xmlgui-dev (>= 5.15),
- libktorrent-dev (>= 2.1),
- libphonon4qt5-dev,
- libphonon4qt5experimental-dev,
+ libktorrent-dev,
libtag1-dev,
- pkg-kde-tools (>= 0.15.16),
-# plasma-workspace-dev,
- qtbase5-dev (>= 5.7.0),
- qtscript5-dev (>= 5.7.0),
- qtwebengine5-dev
-Standards-Version: 4.1.4
+ qt6-phonon-dev,
+ qt6-phonon-experimental-dev,
+ pkg-kde-tools-neon,
+ plasma-workspace-dev,
+ qt6-5compat-dev,
+ qt6-base-dev,
+# qt6-multimedia-dev,
+ qt6-webengine-dev
+Standards-Version: 4.6.2
Homepage: https://www.kde.org/applications/internet/ktorrent/
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde-extras/ktorrent.git
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde-extras/ktorrent
Package: ktorrent
Architecture: any
-Depends: ktorrent-data (= ${source:Version}),
- libktorrent-l10n,
+Depends: libktorrent6-6,
${misc:Depends},
${shlibs:Depends}
-Suggests: geoip-database, krosspython
+Suggests: geoip-database
Description: BitTorrent client based on the KDE platform
This package contains KTorrent, a BitTorrent peer-to-peer network client, that
is based on the KDE platform. Obviously, KTorrent supports such basic features
@@ -82,11 +81,6 @@ Description: BitTorrent client based on the KDE platform
Package: ktorrent-data
Architecture: all
-Depends: ${misc:Depends}
-Recommends: ktorrent (>= ${source:Version})
-Replaces: ktorrent (<< 3.2~beta1+svn902175)
-Breaks: ktorrent (<< 3.2~beta1+svn902175)
-Description: KTorrent data and other architecture independent files
- This package contains architecture independent data files for KTorrent,
- a BitTorrent peer-to-peer network client. Unless you have ktorrent package
- installed, you probably won't find this package useful.
+Depends: ktorrent, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/ktorrent-data.install b/debian/ktorrent-data.install
deleted file mode 100644
index f1deef83..00000000
--- a/debian/ktorrent-data.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/share/doc/HTML/*/ktorrent/
-usr/share/icons/hicolor/*
-usr/share/knotifications5/
-usr/share/ktorrent/
-usr/share/kxmlgui5/ktorrent/
-usr/share/locale/*
diff --git a/debian/ktorrent-data.lintian-overrides b/debian/ktorrent-data.lintian-overrides
deleted file mode 100644
index 1d4df152..00000000
--- a/debian/ktorrent-data.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-ktorrent-data: unusual-interpreter
diff --git a/debian/ktorrent.install b/debian/ktorrent.install
index b0826e31..d3b16a38 100644
--- a/debian/ktorrent.install
+++ b/debian/ktorrent.install
@@ -5,3 +5,9 @@ usr/lib/*/libktcore.so.*
usr/lib/*/qt5/plugins/ktorrent_plugins/
usr/share/applications/org.kde.ktorrent.desktop
usr/share/metainfo/org.kde.ktorrent.appdata.xml
+usr/share/doc/HTML/*/ktorrent/
+usr/share/icons/hicolor/*
+usr/share/knotifications6/
+usr/share/ktorrent/
+usr/share/kxmlgui6/ktorrent/
+usr/share/locale/*
diff --git a/debian/patches/upstream_QTimer-may-not-be-an-incomplete-type-as-it-is-used-a.patch b/debian/patches/upstream_QTimer-may-not-be-an-incomplete-type-as-it-is-used-a.patch
deleted file mode 100644
index 4d44877e..00000000
--- a/debian/patches/upstream_QTimer-may-not-be-an-incomplete-type-as-it-is-used-a.patch
+++ /dev/null
@@ -1,31 +0,0 @@
-From 672c5076de7e3a526d9bdbb484a69e9386bc49f8 Mon Sep 17 00:00:00 2001
-From: Adriaan de Groot <groot at kde.org>
-Date: Tue, 24 Apr 2018 19:15:32 +0200
-Subject: [PATCH] QTimer may not be an incomplete type as it is used as a
- member variable. Add the #include to fully define the type. This problem
- shows up when this header is included in a context that doesn't already have
- QTimer included -- CMake 3.11 exposes that accidentally.
-
-Upstreamed from FreeBSD ports.
-
-(cherry picked from commit 6d7433d44c7f18cd84d2de105beb5c646ed0e355)
----
- ktorrent/dialogs/torrentcreatordlg.h | 2 ++
- 1 file changed, 2 insertions(+)
-
-diff --git a/ktorrent/dialogs/torrentcreatordlg.h b/ktorrent/dialogs/torrentcreatordlg.h
-index 68dde8ad..12a1a433 100644
---- a/ktorrent/dialogs/torrentcreatordlg.h
-+++ b/ktorrent/dialogs/torrentcreatordlg.h
-@@ -23,6 +23,8 @@
- #define KT_TORRENTCREATORDLG_HH
-
- #include <QDialog>
-+#include <QTimer>
-+
- #include "ui_torrentcreatordlg.h"
- #include <torrent/torrentcreator.h>
-
---
-2.17.0
-
diff --git a/debian/rules b/debian/rules
index 1d14f18c..53ad51a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,18 +1,12 @@
-#!/usr/bin/make -f
-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
override_dh_auto_configure:
dh_auto_configure -Skf5 -- -DWITH_SYSTEM_GEOIP:BOOL=ON \
-DBUILD_TESTING=OFF
-
-override_dh_missing:
- dh_missing --fail-missing
-
-override_dh_strip:
- dh_strip --dbgsym-migration='ktorrent-dbg (<< 4.3.1-5~)'
+#!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
%:
- dh $@ --parallel --with kf5
+ dh $@ --with kf6 --buildsystem kf6
-.PHONY: override_dh_auto_test
+override_dh_auto_configure:
+ dh_auto_configure -- -DWITH_SYSTEM_GEOIP:BOOL=ON -DBUILD_TESTING=OFF
More information about the Neon-commits
mailing list