[neon/kde/libksane/Neon/unstable] debian: libksane is now qt6
Carlos De Maine
null at kde.org
Tue Jan 16 00:46:20 GMT 2024
Git commit e038c63adc8ab7aced4952fa2ac8c6c92c2c5630 by Carlos De Maine.
Committed on 16/01/2024 at 01:46.
Pushed by carlosdem into branch 'Neon/unstable'.
libksane is now qt6
D +0 -1 debian/compat
M +69 -33 debian/control
M +0 -4 debian/copyright
D +0 -1 debian/docs
D +0 -4 debian/libkf5sane-data.install
D +0 -21 debian/libkf5sane-dev.acc.in
D +0 -4 debian/libkf5sane-dev.install
D +0 -2 debian/libkf5sane6.install
D +0 -47 debian/libkf5sane6.symbols
A +3 -0 debian/libksane-dev.install
A +4 -0 debian/libksane.install
A +1 -0 debian/libksane.lintian-overrides
M +3 -11 debian/rules
https://invent.kde.org/neon/kde/libksane/-/commit/e038c63adc8ab7aced4952fa2ac8c6c92c2c5630
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 74fc70d..ac3946a 100644
--- a/debian/control
+++ b/debian/control
@@ -1,57 +1,93 @@
-Source: libkf5sane
+Source: libksane
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,
+ kf6-sonnet-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
-Architecture: all
-Depends: ${misc:Depends}
-Breaks: libksane-data, ${kde-l10n:all}
-Replaces: libksane-data, ${kde-l10n:all}
-Description: scanner library (data files)
+Package: libksane
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: ${misc:Depends},
+ ${shlibs:Depends}
+Provides: libk6sane6,
+ libk6sane6-data,
+ libkf6sane6-data
+Replaces: libk6sane6,
+ libk6sane6-data,
+ libkf6sane6-data
+Description: scanner library (runtime)
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.
+ This package contains the shared library.
-Package: libkf5sane-dev
-Section: libdevel
-Architecture: any
-Depends: libkf5sane6 (= ${binary:Version}),
- qtbase5-dev (>= 5.7.0~),
+Package: libksane-dev
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: libksane (= ${binary:Version}),
+ qt6-base-dev,
${misc:Depends}
+Provides: libk6sane6-dev,
+ libkg6sane6-dev,
+Replaces: libk6sane6-dev,
+ libkg6sane6-dev,
Description: scanner library development headers
The KDE scanner library provides an API and widgets for using scanners and
other imaging devices supported by SANE.
.
This package contains the scanner library development files.
-Package: libkf5sane6
-Architecture: any
-Depends: libkf5sane-data (= ${source:Version}),
- ${misc:Depends},
- ${shlibs:Depends}
-Description: scanner library (runtime)
- The KDE scanner library provides an API and widgets for using scanners and
- other imaging devices supported by SANE.
- .
- This package contains the shared library.
+Package: libk6sane6
+Architecture: all
+Depends: libksane, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libk6sane6-dev
+Architecture: all
+Depends: libksane-dev, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: lib6ksane6-data
+Architecture: all
+Depends: libksane, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6sane6
+Architecture: all
+Depends: libksane, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6sane6-data
+Architecture: all
+Depends: libksane, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf6sane6-dev
+Architecture: all
+Depends: libksane-dev, ${misc:Depends}
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/copyright b/debian/copyright
index 646c3ab..7822471 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -120,10 +120,6 @@ Copyright: 2002-2003 Stephan Stapel <stephan dot stapel at web dot de>
2008 Ivan Petrouchtchak <fr.ivan at ukrainian-orthodox.org>
License: LGPL-2.1 or LGPL-3 or KDEeV
-Files: src/version.h.cmake
-Copyright: 2007 Gilles Caulier <caulier dot gilles at gmail dot com>
-License: GPL-2+
-
Files: debian/*
Copyright: 2011 Kubuntu Developers <kubuntu-devel at lists.launchpad.net>
2019 Scarlett Moore <sgmoore at kde.org>
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index b43bf86..0000000
--- a/debian/docs
+++ /dev/null
@@ -1 +0,0 @@
-README.md
diff --git a/debian/libkf5sane-data.install b/debian/libkf5sane-data.install
deleted file mode 100644
index ab40529..0000000
--- a/debian/libkf5sane-data.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/icons/hicolor/16x16/actions/black-white.png
-usr/share/icons/hicolor/16x16/actions/color.png
-usr/share/icons/hicolor/16x16/actions/gray-scale.png
-usr/share/locale/
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/libkf5sane6.install b/debian/libkf5sane6.install
deleted file mode 100644
index 3250b77..0000000
--- a/debian/libkf5sane6.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKF5Sane.so.*.*
-usr/lib/*/libKF5Sane.so.*
diff --git a/debian/libkf5sane6.symbols b/debian/libkf5sane6.symbols
deleted file mode 100644
index 88f2287..0000000
--- a/debian/libkf5sane6.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/libksane-dev.install b/debian/libksane-dev.install
new file mode 100644
index 0000000..1bd76dd
--- /dev/null
+++ b/debian/libksane-dev.install
@@ -0,0 +1,3 @@
+usr/include/KSaneWidgets6/
+usr/lib/*/cmake/KSaneWidgets6/
+usr/lib/*/libKSaneWidgets6.so
diff --git a/debian/libksane.install b/debian/libksane.install
new file mode 100644
index 0000000..7f4ccca
--- /dev/null
+++ b/debian/libksane.install
@@ -0,0 +1,4 @@
+usr/lib/*/libKSaneWidgets6.so.*.*
+usr/lib/*/libKSaneWidgets6.so.6
+usr/share/icons/
+usr/share/locale/
diff --git a/debian/libksane.lintian-overrides b/debian/libksane.lintian-overrides
new file mode 100644
index 0000000..3373e1f
--- /dev/null
+++ b/debian/libksane.lintian-overrides
@@ -0,0 +1 @@
+libksane: package-name-doesnt-match-sonames libKSaneWidgets6-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