[neon/kde/knavalbattle/Neon/unstable] debian: kf6ify

Scarlett Moore null at kde.org
Thu Sep 28 11:31:00 BST 2023


Git commit 98ee622b767c269816d9f35b42e482732845b226 by Scarlett Moore.
Committed on 28/09/2023 at 12:30.
Pushed by scarlettmoore into branch 'Neon/unstable'.

kf6ify

D  +0    -1    debian/compat
M  +13   -15   debian/control
D  +0    -1    debian/knavalbattle.manpages
D  +0    -110  debian/man/kdeopt.part
D  +0    -19   debian/man/knavalbattle.man
M  +5    -5    debian/rules

https://invent.kde.org/neon/kde/knavalbattle/-/commit/98ee622b767c269816d9f35b42e482732845b226

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 67ad9db..29b1dd7 100644
--- a/debian/control
+++ b/debian/control
@@ -10,19 +10,19 @@ Uploaders: Daniel Schepler <schepler at debian.org>,
            Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>,
            Maximiliano Curia <maxy at debian.org>,
 Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 11),
-               extra-cmake-modules (>= 5.30.0~),
-               libkf5config-dev (>= 5.30.0~),
-               libkf5crash-dev (>= 5.30.0~),
-               libkf5dbusaddons-dev (>= 5.30.0~),
-               libkf5dnssd-dev (>= 5.30.0~),
-               libkf5doctools-dev (>= 5.30.0~),
-               libkf5i18n-dev (>= 5.30.0~),
-               libkf5kdegames-dev (>= 4.9.0~),
-               libkf5textwidgets-dev (>= 5.30.0~),
-               libkf5xmlgui-dev (>= 5.30.0~),
-               pkg-kde-tools (>= 0.14),
-               qtbase5-dev (>= 5.7.0~),
+               debhelper-compat (= 12),
+               kf6-extra-cmake-modules,
+               kf6-kconfig-dev,
+               kf6-kcrash-dev,
+               kf6-kdbusaddons-dev,
+               kf6-kdnssd-dev,
+               kf6-kdoctools-dev,
+               kf6-ki18n-dev,
+               libkdegames6-dev,
+               kf6-ktextwidgets-dev,
+               kf6-kxmlgui-dev,
+               pkg-kde-tools-neon,
+               qt6-base-dev,
 Standards-Version: 4.1.4
 Homepage: http://games.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/knavalbattle
@@ -32,8 +32,6 @@ Package: knavalbattle
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: khelpcenter
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
 Description: battleship board game
  KNavalbattle is an implementation of the Battleship game, where two players
  take turns firing at the opponent's ships by guessing their coordinates.
diff --git a/debian/knavalbattle.manpages b/debian/knavalbattle.manpages
deleted file mode 100644
index 914e160..0000000
--- a/debian/knavalbattle.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/out/knavalbattle.6
diff --git a/debian/man/kdeopt.part b/debian/man/kdeopt.part
deleted file mode 100644
index 5557afa..0000000
--- a/debian/man/kdeopt.part
+++ /dev/null
@@ -1,110 +0,0 @@
-.\" This portion of the manual page is from kdeopt.man, from the
-.\" kdegames Debian package.
-.SH GENERIC OPTIONS
-.TP
-.B \-\-help
-Show help about options.
-.TP
-.B \-\-help-qt
-Show Qt specific options.
-.TP
-.B \-\-help-kde
-Show KDE specific options.
-.TP
-.B \-\-help-all
-Show all options.
-.TP
-.B \-\-author
-Show author information.
-.TP
-.B \-v, \-\-version
-Show version information.
-.TP
-.B \-\-license
-Show license information.
-.TP
-.B \-\-
-End of options.
-.SH QT OPTIONS
-.TP
-.B \-\-display \fI<displayname>\fB
-Use the X-server display `displayname'.
-.TP
-.B \-\-session \fI<sessionId>\fB
-Restore the application for the given `sessionId'.
-.TP
-.B \-\-cmap
-Causes the application to install a private color map on an 8\-bit
-display.
-.TP
-.B \-\-ncols \fI<count>\fB
-Limits the number of colors allocated in the color cube on an 8\-bit
-display, if the application is using the QApplication::ManyColor color
-specification.
-.TP
-.B \-\-nograb
-Tells Qt to never grab the mouse or the keyboard.
-.TP
-.B \-\-dograb
-Running under a debugger can cause an implicit \-nograb, use \-dograb
-to override.
-.TP
-.B \-\-sync
-Switches to synchronous mode for debugging.
-.TP
-.B \-\-fn, \-\-font \fI<fontname>\fB
-Defines the application font.
-.TP
-.B \-\-bg, \-\-background \fI<color>\fB
-Sets the default background color and an application palette (light
-and dark shades are calculated).
-.TP
-.B \-\-fg, \-\-foreground \fI<color>\fB
-Sets the default foreground color.
-.TP
-.B \-\-btn, \-\-button \fI<color>\fB
-Sets the default button color.
-.TP
-.B \-\-name \fI<name>\fB
-Sets the application name.
-.TP
-.B \-\-title \fI<title>\fB
-Sets the application title (caption).
-.TP
-.B \-\-visual TrueColor
-Forces the application to use a TrueColor visual on an 8-bit display.
-.TP
-.B \-\-inputstyle \fI<inputstyle>\fB
-Sets XIM (X Input Method) input style. Possible values are
-\fIonthespot\fP, \fIoverthespot\fP, \fIoffthespot\fP and \fIroot\fP.
-.TP
-.B \-\-im \fI<XIM server>\fB
-Set XIM server.
-.TP
-.B \-\-noxim
-Disable XIM.
-.TP
-.B \-\-reverse
-Mirrors the whole layout of widgets.
-.SH KDE OPTIONS
-.TP
-.B \-\-caption \fI<caption>\fB
-Use `caption' as name in the titlebar.
-.TP
-.B \-\-icon \fI<icon>\fB
-Use `icon' as the application icon.
-.TP
-.B \-\-config \fI<filename>\fB
-Use alternative configuration file.
-.TP
-.B \-\-nocrashhandler
-Disable crash handler, to get core dumps.
-.TP
-.B \-\-waitforwm
-Waits for a WM_NET compatible windowmanager.
-.TP
-.B \-\-style \fI<style>\fB
-Sets the application GUI style.
-.TP
-.B \-\-geometry \fI<geometry>\fB
-Sets the client geometry of the main widget.
diff --git a/debian/man/knavalbattle.man b/debian/man/knavalbattle.man
deleted file mode 100644
index f68091b..0000000
--- a/debian/man/knavalbattle.man
+++ /dev/null
@@ -1,19 +0,0 @@
-.TH KNAVALBATTLE 6
-.SH NAME
-knavalbattle \- The KDE Battleship clone
-.SH SYNOPSIS
-.B knavalbattle
-.I [Qt-options] [KDE-options] [url]
-.SH DESCRIPTION
-.B knavalbattle
-is a network-enabled implementation of the famous `Battle Ship' game
-for KDE.
-.TP
-.B url
-URL of a Naval Battle game server to connect to after startup
-.so kdeopt.part
-.SH SEE ALSO
-More detailed user documentation is available from
-.BR help:/kbattleship
-(either enter this URL into \fBkonqueror\fP, or run `khelpcenter
-help:/knavalbattle).
diff --git a/debian/rules b/debian/rules
index 79c1042..773c786 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,9 +1,9 @@
 #!/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-4~
-
-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
+%:
+	dh $@ --with kf6 --buildsystem kf6
 
 override_dh_auto_configure:
-	$(overridden_command) -- -DBIN_INSTALL_DIR=/usr/games
+	dh_auto_configure -- -DBIN_INSTALL_DIR=/usr/games


More information about the Neon-commits mailing list