[neon/kde/libksane/Neon/experimental] debian: k6ify
Carlos De Maine
null at kde.org
Tue Aug 1 09:36:20 BST 2023
Git commit 36cce45e77f807e7b75fabe6cd4148917de52215 by Carlos De Maine.
Committed on 01/08/2023 at 10:36.
Pushed by carlosdem into branch 'Neon/experimental'.
k6ify
D +0 -1 debian/compat
M +17 -19 debian/control
D +0 -21 debian/libkf5sane-dev.acc.in
D +0 -4 debian/libkf5sane-dev.install
D +0 -2 debian/libkf5sane5.install
D +0 -47 debian/libkf5sane5.symbols
R +0 -0 debian/libkf6sane-data.install [from: debian/libkf5sane-data.install - 100% similarity]
A +4 -0 debian/libkf6sane-dev.install
A +2 -0 debian/libkf6sane6.install
M +3 -11 debian/rules
https://invent.kde.org/neon/kde/libksane/-/commit/36cce45e77f807e7b75fabe6cd4148917de52215
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 0f92ba5..e24114c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,43 +1,41 @@
-Source: libkf5sane
+Source: libkf6sane
Section: libs
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Sune Vuorela <sune at debian.org>,
Maximiliano Curia <maxy at debian.org>,
Scarlett Moore <sgmoore at kde.org>
-Build-Depends: cmake (>= 3.0.0~),
- debhelper (>= 11~),
- extra-cmake-modules (>= 5.30.0~),
- libkf5i18n-dev (>= 5.37.0~),
- libkf5textwidgets-dev (>= 5.37.0~),
- libkf5wallet-dev (>= 5.37.0~),
- libkf5widgetsaddons-dev (>= 5.37.0~),
+Build-Depends: cmake,
+ debhelper-compat (= 13),
+ kf6-extra-cmake-modules,
+ kf6-ki18n-dev,
+ kf6-ktextwidgets-dev,
+ kf6-kwallet-dev,
+ kf6-kwidgetsaddons-dev,
libksanecore-dev,
libsane-dev,
libx11-dev,
- pkg-kde-tools (>= 0.12),
- qtbase5-dev (>= 5.7.0~)
-Standards-Version: 4.3.0
+ pkg-kde-tools-neon,
+ qt6-base-dev
+Standards-Version: 4.6.2
Homepage: https://phabricator.kde.org/source/libksane/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libksane
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libksane.git
-Package: libkf5sane-data
+Package: libkf6sane-data
Architecture: all
Depends: ${misc:Depends}
-Breaks: libksane-data, ${kde-l10n:all}
-Replaces: libksane-data, ${kde-l10n:all}
Description: scanner library (data files)
The KDE scanner library provides an API and widgets for using scanners and
other imaging devices supported by SANE.
.
This package contains data files used by the library.
-Package: libkf5sane-dev
+Package: libkf6sane-dev
Section: libdevel
Architecture: any
-Depends: libkf5sane5 (= ${binary:Version}),
- qtbase5-dev (>= 5.7.0~),
+Depends: libkf6sane5 (= ${binary:Version}),
+ qt6-base-dev,
${misc:Depends}
Description: scanner library development headers
The KDE scanner library provides an API and widgets for using scanners and
@@ -45,9 +43,9 @@ Description: scanner library development headers
.
This package contains the scanner library development files.
-Package: libkf5sane5
+Package: libkf6sane6
Architecture: any
-Depends: libkf5sane-data (= ${source:Version}),
+Depends: libkf6sane-data (= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Description: scanner library (runtime)
diff --git a/debian/libkf5sane-dev.acc.in b/debian/libkf5sane-dev.acc.in
deleted file mode 100644
index 197296d..0000000
--- a/debian/libkf5sane-dev.acc.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
- 15.12.0
-</version>
-
-<headers>
- /usr/include/KF5/KSane/
- /usr/include/KF5/ksane_version.h
-</headers>
-
-<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5Sane.so
-</libs>
-
-<gcc_options>
- -fPIC
-</gcc_options>
-
-</descriptor>
diff --git a/debian/libkf5sane-dev.install b/debian/libkf5sane-dev.install
deleted file mode 100644
index 9a98934..0000000
--- a/debian/libkf5sane-dev.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/include/KF5/KSane/
-usr/include/KF5/KSane/ksane_version.h
-usr/lib/*/cmake/KF5Sane/
-usr/lib/*/libKF5Sane.so
diff --git a/debian/libkf5sane5.install b/debian/libkf5sane5.install
deleted file mode 100644
index 1a47add..0000000
--- a/debian/libkf5sane5.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKF5Sane.so.*.*
-usr/lib/*/libKF5Sane.so.5
diff --git a/debian/libkf5sane5.symbols b/debian/libkf5sane5.symbols
deleted file mode 100644
index 88f2287..0000000
--- a/debian/libkf5sane5.symbols
+++ /dev/null
@@ -1,47 +0,0 @@
-# SymbolsHelper-Confirmed: 4.11.5 kfreebsd-amd64 kfreebsd-i386
-libKF5Sane.so.5 libkf5sane5 #MINVER#
-* Build-Depends-Package: libkf5sane-dev
- _ZN10KSaneIface11KSaneWidget10currentDPIEv at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget10getOptValsER4QMapI7QStringS2_E at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget10imageReadyER10QByteArrayiiii at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget10openDeviceERK7QString at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget10scanCancelEv at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget10setOptValsERK4QMapI7QStringS2_E at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget11closeDeviceEv at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget11qt_metacallEN11QMetaObject4CallEiPPv at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget11qt_metacastEPKc at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget11userMessageEiRK7QString at Base 4.7.1
- _ZN10KSaneIface11KSaneWidget12scanProgressEi at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget12selectDeviceEP7QWidget at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget12setSelectionE7QPointFS1_ at Base 4.4.1
- _ZN10KSaneIface11KSaneWidget13buttonPressedERK7QStringS3_b at Base 4.8.4
- _ZN10KSaneIface11KSaneWidget13scanAreaWidthEv at Base 4.4.1
- _ZN10KSaneIface11KSaneWidget14scanAreaHeightEv at Base 4.4.1
- _ZN10KSaneIface11KSaneWidget14toQImageSilentERK10QByteArrayiiiNS0_11ImageFormatE at Base 4.5.90
- _ZN10KSaneIface11KSaneWidget16availableDevicesERK5QListINS0_10DeviceInfoEE at Base 4.7.1
- _ZN10KSaneIface11KSaneWidget16enableAutoSelectEb at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget16staticMetaObjectE at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget17setScanButtonTextERK7QString at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget19setOptionsCollapsedEb at Base 4.4.1
- _ZN10KSaneIface11KSaneWidget19setScanButtonHiddenEb at Base 4.4.1
- _ZN10KSaneIface11KSaneWidget20setPreviewButtonTextERK7QString at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget20setPreviewResolutionEf at Base 4.4.1
- _ZN10KSaneIface11KSaneWidget8scanDoneEiRK7QString at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget8toQImageERK10QByteArrayiiiNS0_11ImageFormatE at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget9getOptValERK7QStringRS1_ at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget9scanFinalEv at Base 4.3.4
- _ZN10KSaneIface11KSaneWidget9setOptValERK7QStringS3_ at Base 4.3.4
- _ZN10KSaneIface11KSaneWidgetC1EP7QWidget at Base 4.3.4
- _ZN10KSaneIface11KSaneWidgetC2EP7QWidget at Base 4.3.4
- _ZN10KSaneIface11KSaneWidgetD0Ev at Base 4.3.4
- _ZN10KSaneIface11KSaneWidgetD1Ev at Base 4.3.4
- _ZN10KSaneIface11KSaneWidgetD2Ev at Base 4.3.4
- _ZNK10KSaneIface11KSaneWidget10metaObjectEv at Base 4.3.4
- _ZNK10KSaneIface11KSaneWidget17initGetDeviceListEv at Base 4.7.1
- _ZNK10KSaneIface11KSaneWidget4makeEv at Base 4.3.4
- _ZNK10KSaneIface11KSaneWidget5modelEv at Base 4.3.4
- _ZNK10KSaneIface11KSaneWidget6vendorEv at Base 4.3.4
- _ZTIN10KSaneIface11KSaneWidgetE at Base 4.3.4
- _ZTSN10KSaneIface11KSaneWidgetE at Base 4.3.4
- _ZTVN10KSaneIface11KSaneWidgetE at Base 4.3.4
- (c++)"non-virtual thunk to KSaneIface::KSaneWidget::~KSaneWidget()@Base" 4.3.4
diff --git a/debian/libkf5sane-data.install b/debian/libkf6sane-data.install
similarity index 100%
rename from debian/libkf5sane-data.install
rename to debian/libkf6sane-data.install
diff --git a/debian/libkf6sane-dev.install b/debian/libkf6sane-dev.install
new file mode 100644
index 0000000..aa1b4a5
--- /dev/null
+++ b/debian/libkf6sane-dev.install
@@ -0,0 +1,4 @@
+usr/include/KF6/KSane/
+usr/include/KF6/KSane/ksane_version.h
+usr/lib/*/cmake/KF5Sane/
+usr/lib/*/libKF6Sane.so
diff --git a/debian/libkf6sane6.install b/debian/libkf6sane6.install
new file mode 100644
index 0000000..2d32277
--- /dev/null
+++ b/debian/libkf6sane6.install
@@ -0,0 +1,2 @@
+usr/lib/*/libKF6Sane.so.*.*
+usr/lib/*/libKF6Sane.so.6
diff --git a/debian/rules b/debian/rules
index 3266c63..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,14 +1,6 @@
#!/usr/bin/make -f
-
-export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
-l10npkgs_firstversion_ok := 4:16.04.3-7~
-
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
%:
- dh $@ --with kf5
-
-override_dh_gencontrol: l10npkgs_firstversion_ok
- dh_gencontrol
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list