[neon/kf6/kf6-kinit/Neon/unstable] debian: kf sixy
Carlos De Maine
null at kde.org
Sun Feb 19 06:01:18 GMT 2023
Git commit 0b11ca574508ea1c1b4c7a204a231d069bbdcf6c by Carlos De Maine.
Committed on 19/02/2023 at 06:01.
Pushed by carlosdem into branch 'Neon/unstable'.
kf sixy
D +0 -1 debian/compat
M +24 -21 debian/control
A +2 -0 debian/kf6-kinit-dev.install
A +13 -0 debian/kf6-kinit.install
D +0 -2 debian/kinit-dev.install
D +0 -13 debian/kinit.install
M +9 -9 debian/kinit.lintian-overrides
M +1 -1 debian/kinit.postinst.in
M +2 -2 debian/not-installed
M +1 -13 debian/rules
M +1 -1 debian/setcap.yaml
M +2 -3 debian/upstream/metadata
M +1 -1 debian/watch [INFRASTRUCTURE]
https://invent.kde.org/neon/kf6/kf6-kinit/commit/0b11ca574508ea1c1b4c7a204a231d069bbdcf6c
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 885dcd2..a587014 100644
--- a/debian/control
+++ b/debian/control
@@ -1,31 +1,33 @@
-Source: kinit
+Source: kf6-kinit
Section: libs
Priority: optional
-Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 3.0~),
- debhelper (>= 11~),
- extra-cmake-modules (>= 5.51.0~),
+Maintainer: Jonathan Esk-Riddell <jr at jriddell.org>
+Build-Depends: cmake,
+ debhelper (= 13),
libcap-dev [linux-any],
libcap2-bin [linux-any],
- libkf5config-dev (>= 5.51.0~),
- libkf5crash-dev (>= 5.51.0~),
- libkf5doctools-dev (>= 5.51.0~),
- libkf5i18n-dev (>= 5.51.0~),
- libkf5kio-dev (>= 5.51.0~),
- libkf5service-dev (>= 5.51.0~),
- libkf5windowsystem-dev (>= 5.51.0~),
+ kf6-extra-cmake-modules,
+ kf6-kconfig-dev (>= 5.51.0~),
+ kf6-kcrash-dev (>= 5.51.0~),
+ kf6-kdoctools-dev (>= 5.51.0~),
+ libkf6i18n-dev (>= 5.51.0~),
+ libkf6kio-dev (>= 5.51.0~),
+ libkf6service-dev (>= 5.51.0~),
+ libkf6windowsystem-dev (>= 5.51.0~),
pkg-config,
- pkg-kde-tools (>= 0.15.15ubuntu1~),
- qtbase5-dev (>= 5.8.0~)
+ qt6-5compat-dev,
+ qt6-base-dev
+
Standards-Version: 4.1.4
Homepage: https://projects.kde.org/projects/frameworks/kinit
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kinit
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kinit.git
-Package: kinit
+Package: kf6-kinit
Architecture: any
-Depends: libcap2-bin [linux-any], ${misc:Depends}, ${shlibs:Depends}
+Section: kde
+X-Neon-MergedPackage: true
+Depends: ${misc:Depends}, ${shlibs:Depends}
Description: process launcher to speed up launching KDE applications
kdeinit is a process launcher somewhat similar to the
famous init used for booting UNIX.
@@ -39,10 +41,12 @@ Description: process launcher to speed up launching KDE applications
instead of 250ms on a P-III 500) It reduces memory
consumption by approx. 350Kb per application.
-Package: kinit-dev
-Section: libdevel
+Package: kf6-kinit-dev
Architecture: any
-Depends: kinit (= ${binary:Version}), ${misc:Depends}, ${shlibs:Depends}
+Section: kde
+X-Neon-MergedPackage: true
+Depends: kf6-kinit (= ${binary:Version}),
+ ${misc:Depends}
Description: process launcher to speed up launching KDE applications
kdeinit is a process launcher somewhat similar to the
famous init used for booting UNIX.
@@ -57,4 +61,3 @@ Description: process launcher to speed up launching KDE applications
consumption by approx. 350Kb per application.
.
Contains development files for kinit.
-Breaks: libkf5kdelibs4support-dev (<< 5.51)
diff --git a/debian/kf6-kinit-dev.install b/debian/kf6-kinit-dev.install
new file mode 100644
index 0000000..d779a0c
--- /dev/null
+++ b/debian/kf6-kinit-dev.install
@@ -0,0 +1,2 @@
+usr/lib/*/cmake/KF6Init/
+usr/share/dbus-1/interfaces/kf6_org.kde.KLauncher.xml
diff --git a/debian/kf6-kinit.install b/debian/kf6-kinit.install
new file mode 100644
index 0000000..cd3a9c3
--- /dev/null
+++ b/debian/kf6-kinit.install
@@ -0,0 +1,13 @@
+usr/bin/kdeinit
+usr/bin/kdeinit6_shutdown
+usr/bin/kdeinit6_wrapper
+usr/bin/kshell6
+usr/bin/kwrapper6
+usr/lib/*/libexec/kf6/klauncher
+usr/lib/*/libexec/kf6/start_kdeinit
+usr/lib/*/libexec/kf6/start_kdeinit_wrapper
+usr/lib/*/libkdeinit6_klauncher.so
+usr/share/locale/*/*/kinit6.mo
+usr/share/man/*/man8/kdeinit6.8
+usr/share/man/man8/kdeinit6.8
+usr/share/qlogging-categories6/
diff --git a/debian/kinit-dev.install b/debian/kinit-dev.install
deleted file mode 100644
index 97b5435..0000000
--- a/debian/kinit-dev.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/cmake/KF5Init/
-usr/share/dbus-1/interfaces/kf5_org.kde.KLauncher.xml
diff --git a/debian/kinit.install b/debian/kinit.install
deleted file mode 100644
index dba41df..0000000
--- a/debian/kinit.install
+++ /dev/null
@@ -1,13 +0,0 @@
-usr/bin/kdeinit5
-usr/bin/kdeinit5_shutdown
-usr/bin/kdeinit5_wrapper
-usr/bin/kshell5
-usr/bin/kwrapper5
-usr/lib/*/libexec/kf5/klauncher
-usr/lib/*/libexec/kf5/start_kdeinit
-usr/lib/*/libexec/kf5/start_kdeinit_wrapper
-usr/lib/*/libkdeinit5_klauncher.so
-usr/share/locale/*/*/kinit5.mo
-usr/share/man/*/man8/kdeinit5.8
-usr/share/man/man8/kdeinit5.8
-usr/share/qlogging-categories5/
diff --git a/debian/kinit.lintian-overrides b/debian/kinit.lintian-overrides
index da4e9bc..f298c2a 100644
--- a/debian/kinit.lintian-overrides
+++ b/debian/kinit.lintian-overrides
@@ -1,9 +1,9 @@
-kinit: package-name-doesnt-match-sonames libkdeinit5-klauncher
-kinit: binary-without-manpage usr/bin/kdeinit5_shutdown
-kinit: binary-without-manpage usr/bin/kdeinit5_wrapper
-kinit: binary-without-manpage usr/bin/kshell5
-kinit: binary-without-manpage usr/bin/kwrapper5
-kinit: shlib-without-versioned-soname usr/lib/*/libkdeinit5_klauncher.so libkdeinit5_klauncher.so
-kinit: postinst-must-call-ldconfig usr/lib/*/libkdeinit5_klauncher.so
-kinit: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit5_klauncher.so usr/lib/*/libkdeinit5_klauncher.so
-kinit: package-must-activate-ldconfig-trigger usr/lib/*/libkdeinit5_klauncher.so
+kinit: package-name-doesnt-match-sonames libkdeinit6-klauncher
+kinit: binary-without-manpage usr/bin/kdeinit6_shutdown
+kinit: binary-without-manpage usr/bin/kdeinit6_wrapper
+kinit: binary-without-manpage usr/bin/kshell6
+kinit: binary-without-manpage usr/bin/kwrapper6
+kinit: shlib-without-versioned-soname usr/lib/*/libkdeinit6_klauncher.so libkdeinit6_klauncher.so
+kinit: postinst-must-call-ldconfig usr/lib/*/libkdeinit6_klauncher.so
+kinit: dev-pkg-without-shlib-symlink usr/lib/*/libkdeinit6_klauncher.so usr/lib/*/libkdeinit6_klauncher.so
+kinit: package-must-activate-ldconfig-trigger usr/lib/*/libkdeinit6_klauncher.so
diff --git a/debian/kinit.postinst.in b/debian/kinit.postinst.in
index a93f91f..3b9a817 100644
--- a/debian/kinit.postinst.in
+++ b/debian/kinit.postinst.in
@@ -6,7 +6,7 @@ if [ "$1" = configure ]; then
# Set the capabilities
if command -v setcap > /dev/null && \
setcap "CAP_SYS_RESOURCE=+ep" \
- "/usr/lib/#DEB_HOST_MULTIARCH#/libexec/kf5/start_kdeinit"; then
+ "/usr/lib/#DEB_HOST_MULTIARCH#/libexec/kf6/start_kdeinit"; then
echo "Sucessfully set capabilities for start_kdeinit"
else
echo "Failed to set capabilities for start_kdeinit" >&2
diff --git a/debian/not-installed b/debian/not-installed
index 77a6785..b16d0de 100644
--- a/debian/not-installed
+++ b/debian/not-installed
@@ -1,3 +1,3 @@
# manpages are gzipped and generate false positives in the test
-usr/share/man/man8/kdeinit5.8
-usr/share/man/*/man8/kdeinit5.8
+usr/share/man/man8/kdeinit6.8
+usr/share/man/*/man8/kdeinit6.8
diff --git a/debian/rules b/debian/rules
index 4b24030..5bd7734 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,5 @@
#!/usr/bin/make -f
# -*- makefile -*-
-export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
-
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
%:
- dh $@ --with kf5,pkgkde_symbolshelper --buildsystem kf5 --without build_stamp
-
-override_dh_strip:
- dh_strip --dbgsym-migration='kinit-dbg (<= 5.19.0-1~~)'
-
-override_dh_installdeb:
- sed 's/#DEB_HOST_MULTIARCH#/$(DEB_HOST_MULTIARCH)/' \
- debian/kinit.postinst.in > debian/kinit.postinst
- dh_installdeb
+ dh $@ --with kf6 --buildsystem kf6
diff --git a/debian/setcap.yaml b/debian/setcap.yaml
index 34029a8..db84e9b 100644
--- a/debian/setcap.yaml
+++ b/debian/setcap.yaml
@@ -2,4 +2,4 @@
# Being whitelisted means they will pass the build without problems.
# A whitelisted call needs to have a corresponding setcap/setuid call in
# postinst so it actually gets applied.
-- ["CAP_SYS_RESOURCE=+ep", "*/usr/lib/*/libexec/kf5/start_kdeinit"]
+- ["CAP_SYS_RESOURCE=+ep", "*/usr/lib/*/libexec/kf6/start_kdeinit"]
diff --git a/debian/upstream/metadata b/debian/upstream/metadata
index 8e67122..7138805 100644
--- a/debian/upstream/metadata
+++ b/debian/upstream/metadata
@@ -1,7 +1,6 @@
Name: kinit
-Changelog: https://cgit.kde.org/kinit.git/log
Contact: kde-frameworks-devel at kde.org
Donation: https://www.kde.org/community/donations/index.php
-Repository: https://anongit.kde.org/kinit.git
-Repository-Browse: https://cgit.kde.org/kinit.git
+Repository: https://invent.kde.org/frameworks/kinit.git
+Repository-Browse: https://invent.kde.org/frameworks/kinit
Security-Contact: security at kde.org
diff --git a/debian/watch b/debian/watch
index 92c6dc3..a989172 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
version=4
-opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/frameworks/([\d.]+)/kinit-([\d.]+)\.tar\.xz
+opts=pgpsigurlmangle=s/$/.sig/ https://download.kde.org/stable/frameworks/([\d.]+)/kinit6-([\d.]+)\.tar\.xz
More information about the Neon-commits
mailing list