[neon/extras/tellico/Neon/unstable_jammy] debian: kf6ify

Carlos De Maine null at kde.org
Wed Aug 28 04:27:12 BST 2024


Git commit fab580f85975fa16822eeabf769825807a6cafa0 by Carlos De Maine.
Committed on 28/08/2024 at 03:27.
Pushed by carlosdem into branch 'Neon/unstable_jammy'.

kf6ify

(cherry picked from commit 7c7bf9b3a09bf073112b878bed21e1136b21a148)

M  +50   -48   debian/control
M  +2    -23   debian/rules
D  +0    -7    debian/salsa-ci.yml

https://invent.kde.org/neon/extras/tellico/-/commit/fab580f85975fa16822eeabf769825807a6cafa0

diff --git a/debian/control b/debian/control
index fb1885f..2b4a3e8 100644
--- a/debian/control
+++ b/debian/control
@@ -3,46 +3,52 @@ Section: kde
 Priority: optional
 Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
 Uploaders: Pino Toscano <pino at debian.org>,
-Build-Depends: debhelper-compat (= 13),
- , cmake, extra-cmake-modules (>= 5.19.0~)
- , pkg-config, pkg-kde-tools, qtbase5-dev (>= 5.4.0~),
- , libqt5charts5-dev (>= 5.4.0~),
- , qtwebengine5-dev (>= 5.4.0~) [amd64 arm64 armhf i386 mipsel],
- , libkf5archive-dev
- , libkf5cddb-dev
- , libkf5codecs-dev
- , libkf5config-dev
- , libkf5configwidgets-dev
- , libkf5coreaddons-dev
- , libkf5crash-dev
- , libkf5doctools-dev
- , libkf5filemetadata-dev
- , libkf5guiaddons-dev
- , libkf5khtml-dev
- , libkf5i18n-dev
- , libkf5iconthemes-dev
- , libkf5itemmodels-dev
- , libkf5jobwidgets-dev
- , libkf5kio-dev
- , libkf5newstuff-dev
- , libkf5sane-dev
- , libkf5solid-dev
- , libkf5sonnet-dev
- , libkf5textwidgets-dev
- , libkf5wallet-dev
- , libkf5widgetsaddons-dev
- , libkf5windowsystem-dev
- , libkf5xmlgui-dev
- , libtag1-dev, libyaz-dev, libpoppler-qt5-dev
- , libexempi-dev, libcsv-dev, libbtparse-dev
- , libcdio-dev
- , gettext
- , xvfb <!nocheck>, xauth <!nocheck>, kio <!nocheck>
- , python3:any, dh-python
- , dbus <!nocheck>
- , tidy <!nocheck>
-# missing in libtag1-dev
- , zlib1g-dev
+Build-Depends: cmake,
+               dbus <!nocheck>,
+               debhelper-compat (= 13),
+               dh-python,
+               gettext,
+               kf6-extra-cmake-modules,
+               kf6-karchive-dev,
+               kf6-kcddb-dev,
+               kf6-kcodecs-dev,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-kdoctools-dev,
+               kf6-kfilemetadata-dev,
+               kf6-kguiaddons-dev,
+               kf6-ki18n-dev,
+               kf6-kiconthemes-dev,
+               kf6-kitemmodels-dev,
+               kf6-kjobwidgets-dev,
+               kf6-kio-dev,
+               kf6-knewstuff-dev,
+               kf6-solid-dev,
+               kf6-ksonnet-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kwallet-dev,
+               kf6-kwidgetsaddons-dev,
+               kf6-kwindowsystem-dev,
+               kf6-kxmlgui-dev,
+               libbtparse-dev,
+               libcdio-dev,
+               libcsv-dev,
+               libexempi-dev,
+               libpoppler-qt6-dev,
+               libtag1-dev,
+               libyaz-dev,
+               pkg-config,
+               pkg-kde-tools-neon,
+               python3:any,
+               qt6-base-dev,
+               qt6-charts-dev,
+               qt6-webengine-dev,
+               tidy <!nocheck>,
+               xvfb <!nocheck>,
+               xauth <!nocheck>,
+               zlib1g-dev,
 Standards-Version: 4.6.2
 Rules-Requires-Root: no
 Homepage: https://tellico-project.org/
@@ -51,10 +57,10 @@ Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/tellico.git
 
 Package: tellico
 Architecture: any
-Depends: tellico-data (= ${source:Version})
- , tellico-scripts (>= ${source:Version})
- , ${shlibs:Depends}, ${misc:Depends}
-Recommends: tellico-doc, kio-extras
+Depends: tellico-data (= ${source:Version}),
+         tellico-scripts (>= ${source:Version}),
+${shlibs:Depends}, ${misc:Depends}
+Recommends: tellico-doc, kio-extras,
 Description: Collection manager for books, videos, music, etc
  Tellico is a collection manager for KDE. It includes default collections for
  books, bibliographies, comic books, videos, music, coins, stamps, trading
@@ -78,8 +84,6 @@ Section: doc
 Architecture: all
 Depends: ${misc:Depends}
 Recommends: khelpcenter, tellico
-Replaces: tellico (<< 3.1.2-2)
-Breaks: tellico (<< 3.1.2-2)
 Description: Collection manager for books, videos, music, etc [doc]
  Tellico is a collection manager for KDE. It includes default collections for
  books, bibliographies, comic books, videos, music, coins, stamps, trading
@@ -104,8 +108,6 @@ Package: tellico-data
 Architecture: all
 Depends: ${misc:Depends}, ${perl:Depends}
 Recommends: tellico
-Replaces: tellico (<< 3.1.2-2)
-Breaks: tellico (<< 3.1.2-2)
 Description: Collection manager for books, videos, music, etc [data]
  Tellico is a collection manager for KDE. It includes default collections for
  books, bibliographies, comic books, videos, music, coins, stamps, trading
diff --git a/debian/rules b/debian/rules
index f72e776..b4caa8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,31 +1,10 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# GNU copyright 1997 to 1999 by Joey Hess.
 
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
-
-# The fixfilepath feature causes a build failure, disable it.
-export DEB_BUILD_MAINT_OPTIONS = reproducible=-fixfilepath
-# do not use kdeinit for kio
-export KDE_FORK_SLAVES=1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@ --with kf5,python3
-
-override_dh_auto_configure:
-	dh_auto_configure -Skf5 -- \
-		-DENABLE_WEBCAM=false
+	dh $@ --with kf6 --buildsystem kf6
 
-override_dh_auto_test:
-ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
-	cd obj-* && $(MAKE) install DESTDIR=$(CURDIR)/test_root
-	$(eval TESTS_HOME := $(shell mktemp -d --tmpdir tellico-home.XXXXXX))
-	mkdir -p "$(TESTS_HOME)/tmp"
-	mkdir -p -m 700 "$(TESTS_HOME)/runtime"
-	xvfb-run -a --server-args="-screen 0 1024x768x24+32" dbus-run-session dh_auto_test --no-parallel -- XDG_DATA_DIRS=$(CURDIR)/test_root/usr/share:/usr/local/share:/usr/share HOME="$(TESTS_HOME)" TMPDIR="$(TESTS_HOME)/tmp" XDG_RUNTIME_DIR="$(TESTS_HOME)/runtime"
-	rm -rf "$(TESTS_HOME)"
-endif
 
 execute_after_dh_auto_install:
 	# extra copyright notices
diff --git a/debian/salsa-ci.yml b/debian/salsa-ci.yml
deleted file mode 100644
index f71bdf3..0000000
--- a/debian/salsa-ci.yml
+++ /dev/null
@@ -1,7 +0,0 @@
-include:
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/salsa-ci.yml
-  - https://salsa.debian.org/salsa-ci-team/pipeline/raw/master/pipeline-jobs.yml
-variables:
-  SALSA_CI_DISABLE_MISSING_BREAKS: 'no'
-  SALSA_CI_DISABLE_RC_BUGS: 'no'
-  SALSA_CI_REPROTEST_ARGS: '--variations=-build-path'


More information about the Neon-commits mailing list