[neon/kde/kamera/Neon/unstable] debian: merge Neon/experimental into Neon/unstable

Carlos De Maine null at kde.org
Fri Sep 15 06:09:53 BST 2023


Git commit 9874b26102a025c4a363abf1eafec10ad4932c0a by Carlos De Maine.
Committed on 15/09/2023 at 07:09.
Pushed by carlosdem into branch 'Neon/unstable'.

merge Neon/experimental into Neon/unstable

D  +0    -1    debian/compat
M  +14   -15   debian/control
M  +4    -10   debian/rules

https://invent.kde.org/neon/kde/kamera/-/commit/9874b26102a025c4a363abf1eafec10ad4932c0a

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 7b75856..ffa17ad 100644
--- a/debian/control
+++ b/debian/control
@@ -5,20 +5,21 @@ Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
 Uploaders: Eshat Cakar <info at eshat.de>,
            Sune Vuorela <sune at debian.org>,
            Maximiliano Curia <maxy at debian.org>,
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 9),
-               extra-cmake-modules,
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kcmutils-dev,
+               kf6-kcolorscheme-dev,
+               kf6-kconfig-dev,
+               kf6-kconfigwidgets-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               kf6-kio-dev,
+               kf6-kxmlgui-dev,
                libgphoto2-dev,
-                libkf5kcmutils-dev,
-               libkf5config-dev,
-               libkf5configwidgets-dev,
-               libkf5doctools-dev,
-               libkf5i18n-dev,
-               libkf5kio-dev,
-               libkf5xmlgui-dev,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.3~),
-Standards-Version: 4.1.1
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/projects/kde/kdegraphics/kamera
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/kamera.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/kamera.git
@@ -27,8 +28,6 @@ Package: kamera
 Architecture: any
 Section: graphics
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
 Description: digital camera support for KDE applications
  This package allows any KDE application to access and manipulate pictures on
  a digital camera.
diff --git a/debian/rules b/debian/rules
index b1ea2e2..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,12 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-l10npkgs_firstversion_ok := 4:16.04.3-5~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-
-override_dh_auto_configure:
-	$(overridden_command) -- -DHAVE_GPHOTO2_5=1
-
-override_dh_strip:
-	$(overridden_command) --dbgsym-migration='kamera-dbg (<= 4:15.12.1-1~~)'
+%:
+	dh $@ --with kf6 --buildsystem kf6


More information about the Neon-commits mailing list