[neon/neon-packaging/glaxnimate/Neon/unstable] debian: kf6ify

[Carlos De Maine]

Git commit dade38271f81f830b504fa25e40abba9df1f4d97 by Carlos De Maine.
Committed on 27/01/2025 at 08:36.
Pushed by carlosdem into branch 'Neon/unstable'.

kf6ify

M  +12   -11   debian/control
D  +0    -39   debian/patches/disable_git.patch
M  +5    -9    debian/rules
M  +1    -3    debian/watch

https://invent.kde.org/neon/neon-packaging/glaxnimate/-/commit/dade38271f81f830b504fa25e40abba9df1f4d97

diff --git a/debian/control b/debian/control
index e90395d..829fee5 100644
--- a/debian/control
+++ b/debian/control
@@ -11,22 +11,23 @@ Build-Depends: cmake,
                libavcodec-dev,
                libavformat-dev,
                libavutil-dev,
-               libkf5archive-dev,
-               libkf5completion-dev,
-               libkf5coreaddons-dev,
-               libkf5crash-dev,
-               libkf5xmlgui-dev,
-               libkf5widgetsaddons-dev,
+               kf6-karchive-dev,
+               kf6-kcompletion-dev,
+               kf6-kcoreaddons-dev,
+               kf6-kcrash-dev,
+               kf6-ki18n-dev,
+               kf6-kxmlgui-dev,
+               kf6-kwidgetsaddons-dev,
                libpotrace-dev,
                libpython3-dev,
-               libqt5svg5-dev,
                libswscale-dev,
-               pkg-kde-tools,
+               pkg-kde-tools-neon,
                pybind11-dev,
                python3-pybind11,
-               qt5-image-formats-plugins,
-               qtbase5-dev,
-               qttools5-dev,
+               qt6-base-dev,
+               qt6-imageformats-dev,
+               qt6-svg-dev,
+               qt6-tools-dev,
                zlib1g-dev,
 Standards-Version: 4.6.2
 Homepage: https://glaxnimate.mattbas.org
diff --git a/debian/patches/disable_git.patch b/debian/patches/disable_git.patch
deleted file mode 100644
index 44ce352..0000000
--- a/debian/patches/disable_git.patch
+++ /dev/null
@@ -1,39 +0,0 @@
---- a/CMakeLists.txt	2023-09-09 12:08:27.000000000 -0700
-+++ b/CMakeLists.txt	2023-09-29 06:08:38.124019407 -0700
-@@ -50,21 +50,21 @@
- set(CMAKE_CXX_STANDARD_REQUIRED ON)
- 
- # Git
--set(VERSION_NAKED ${PROJECT_VERSION})
--set(VERSION_SUFFIX "-git-" CACHE STRING "")
--
--if (VERSION_SUFFIX STREQUAL "-git-")
--    git_describe(GIT_DESC --tags)
--    if ( NOT ${GIT_DESC} MATCHES ".*NOTFOUND" )
--        set(PROJECT_VERSION ${GIT_DESC})
--    endif()
--elseif(VERSION_SUFFIX MATCHES "^\\..*")
--    set(PROJECT_VERSION "${PROJECT_VERSION}${VERSION_SUFFIX}")
--elseif(NOT VERSION_SUFFIX STREQUAL "")
--    set(PROJECT_VERSION "${PROJECT_VERSION}+${VERSION_SUFFIX}")
--endif()
--
--message(STATUS "Building ${PROJECT_NAME} ${PROJECT_VERSION}")
-+# set(VERSION_NAKED ${PROJECT_VERSION})
-+# set(VERSION_SUFFIX "-git-" CACHE STRING "")
-+#
-+# if (VERSION_SUFFIX STREQUAL "-git-")
-+#     git_describe(GIT_DESC --tags)
-+#     if ( NOT ${GIT_DESC} MATCHES ".*NOTFOUND" )
-+#         set(PROJECT_VERSION ${GIT_DESC})
-+#     endif()
-+# elseif(VERSION_SUFFIX MATCHES "^\\..*")
-+#     set(PROJECT_VERSION "${PROJECT_VERSION}${VERSION_SUFFIX}")
-+# elseif(NOT VERSION_SUFFIX STREQUAL "")
-+#     set(PROJECT_VERSION "${PROJECT_VERSION}+${VERSION_SUFFIX}")
-+# endif()
-+#
-+# message(STATUS "Building ${PROJECT_NAME} ${PROJECT_VERSION}")
- 
- # Snapcraft stuff here because we don't care if cmake fails on CI
- configure_file(
diff --git a/debian/rules b/debian/rules
index 35076c2..939a0c4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,10 @@
 #!/usr/bin/make -f
-# You must remove unused comment lines for the released package.
-#export DH_VERBOSE = 1
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-#export DEB_CFLAGS_MAINT_APPEND  = -Wall -pedantic
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
 %:
-	dh $@ --with kde
+	dh $@ --with kf6 --buildsystem kf6
+
 
 override_dh_auto_configure:
-	dh_auto_configure -- \
-	-DINSTALL_TRANSLATIONS=OFF 
-#	-DMOBILE_UI=ON 
\ No newline at end of file
+	dh_auto_configure -- -DMOBILE_UI=ON 
\ No newline at end of file
diff --git a/debian/watch b/debian/watch
index a5cd3c5..6e3fb73 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,2 @@
 version=4
-opts=filenamemangle=s/.*\/archive\/(\d\S+)\/glaxnimate.*\.tar\.gz/glaxnimate-$1\.tar\.gz/g \
-  https://gitlab.com/mattbas/glaxnimate/tags?sort=updated_desc .*/archive/(\d\S+)/.*\.tar\.gz.*
-
+opts=pgpsigurlmangle=s/$/.sig/ http://download.kde.org/stable/release-service/([\d.]+)/src/@PACKAGE at -([\d.]+).tar.xz