[neon/kde/kolourpaint/Neon/experimental] debian: kf6ify

Carlos De Maine null at kde.org
Tue Aug 1 08:00:30 BST 2023


Git commit a4c15bcb9dd0f1972889871d72965732cb4b4086 by Carlos De Maine.
Committed on 01/08/2023 at 09:00.
Pushed by carlosdem into branch 'Neon/experimental'.

kf6ify

D  +0    -1    debian/compat
M  +13   -20   debian/control
M  +7    -7    debian/rules

https://invent.kde.org/neon/kde/kolourpaint/-/commit/a4c15bcb9dd0f1972889871d72965732cb4b4086

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 1c533bf..a899a1b 100644
--- a/debian/control
+++ b/debian/control
@@ -5,15 +5,20 @@ 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 (>= 11~),
-               extra-cmake-modules (>= 1.3.0~),
-               libkf5kdelibs4support-dev,
-               libkf5sane-dev,
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               kf6-kdoctools-dev,
+               kf6-kio-dev,
+               kf6-kjobwidgets-dev,
+               kf6-ki8n-dev
+               kf6-ktextwidgets-dev,
+               kf6-kxmlgui-dev,
+               libkf6sane-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.5.0~),
-Standards-Version: 4.1.4
+               pkg-kde-tools-kde,
+               qt6-base-dev,
+Standards-Version: 4.6.2
 Homepage: http://www.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/kolourpaint
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/kolourpaint.git
@@ -22,8 +27,6 @@ Package: kolourpaint
 Section: graphics
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kolourpaint4 (<< 4:17.04), ${kde-l10n:all}
-Replaces: kolourpaint4 (<< 4:17.04), ${kde-l10n:all}
 Description: simple image editor and drawing application
  KolourPaint is a simple drawing and image editing application for KDE.
  It aims to be easy to use, providing a level of functionality targeted towards
@@ -31,13 +34,3 @@ Description: simple image editor and drawing application
  and touching-up photos.
  .
  This package is part of the KDE graphics module.
-
-Package: kolourpaint4
-Section: oldlibs
-Architecture: all
-Depends: kolourpaint (>= ${source:Version}), ${misc:Depends}
-Description: transitional package for kolourpaint
- This is a transitional package to migrate to kolourpaint.  It can be safely
- removed after the upgrade.
- .
- This package is part of the KDE graphics module.
diff --git a/debian/rules b/debian/rules
index bbea435..9a87f04 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,11 +1,11 @@
 #!/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-6~
+%:
+	dh $@ --with kf6 --buildsystem kf6
 
-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_install:
-	$(overridden_command) --destdir=debian/kolourpaint
+#override_dh_auto_install:
+	#$(overridden_command) --destdir=debian/kolourpaint
 	# remove shlib symlink as this isn't a dev package
-	rm debian/kolourpaint/usr/lib/*/libkolourpaint_lgpl.so
+	#rm debian/kolourpaint/usr/lib/*/libkolourpaint_lgpl.so


More information about the Neon-commits mailing list