[neon/kde/libkdcraw/Neon/stable] debian: libkdcraw is qt6 based

Carlos De Maine null at kde.org
Tue Jan 16 09:04:39 GMT 2024


Git commit ea82b42b653a98623555ff49ee6cba79f531b745 by Carlos De Maine.
Committed on 16/01/2024 at 10:04.
Pushed by carlosdem into branch 'Neon/stable'.

libkdcraw is qt6 based

D  +0    -1    debian/.gitattributes
M  +1    -1    debian/changelog
D  +0    -1    debian/compat
M  +24   -12   debian/control
D  +0    -2    debian/docs
A  +3    -0    debian/libkdcraw-dev.install
A  +3    -0    debian/libkdcraw.install
A  +1    -0    debian/libkdcrawqt6.lintian-overrides
D  +0    -3    debian/libkf5kdcraw-dev.install
D  +0    -17   debian/libkf5kdcraw5.acc.in
D  +0    -3    debian/libkf5kdcraw5.install
D  +0    -61   debian/libkf5kdcraw5.symbols
M  +4    -1    debian/rules
D  +0    -3    debian/tests/acc
D  +0    -10   debian/tests/control
D  +0    -3    debian/tests/testsuite
D  +0    -6    debian/tests/testsuite.xsession

https://invent.kde.org/neon/kde/libkdcraw/-/commit/ea82b42b653a98623555ff49ee6cba79f531b745

diff --git a/debian/.gitattributes b/debian/.gitattributes
deleted file mode 100644
index 6a03163..0000000
--- a/debian/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-changelog merge=dpkg-mergechangelogs
diff --git a/debian/changelog b/debian/changelog
index 0b1716d..e7c38bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,4 @@
-libkf5kdcraw (23.08.4-0neon) jammy; urgency=medium
+libkdcraw (23.08.4-0neon) jammy; urgency=medium
 
   * New release
 
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index fa437dc..c92ad5f 100644
--- a/debian/control
+++ b/debian/control
@@ -1,28 +1,32 @@
-Source: libkf5kdcraw
+Source: libkdcraw
 Section: kde
 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>
-Build-Depends: cmake (>= 2.8.12~),
-               debhelper (>= 9),
-               extra-cmake-modules (>= 1.1.0~),
-               libraw-dev (>= 0.18),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
+               kf6-extra-cmake-modules,
+               libraw-dev,
                libx11-dev,
                pkg-config,
-               pkg-kde-tools (>= 0.12),
-               qtbase5-dev (>= 5.2.0~),
-Standards-Version: 4.2.1
+               pkg-kde-tools-neon,
+               qt6-base-dev,
+Standards-Version: 4.6.2
 Homepage: http://www.kde.org/
 Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libkdcraw
 Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libkdcraw.git
 
-Package: libkf5kdcraw-dev
+Package: libkdcraw-dev
 Section: libdevel
 Architecture: any
-Depends: libkf5kdcraw5 (= ${binary:Version}),
+Depends: libkdcraw (= ${binary:Version}),
          pkg-config,
-         qtbase5-dev,
+         qt6-base-dev,
          ${misc:Depends}
+Provides: libkf6kdcraw-dev,
+          libkdcrawqt6-dev,
+Replaces: libkf6kdcraw-dev,
+          libkdcrawqt6-dev,
 Description: RAW picture decoding library -- development files
  Libkdcraw is a Qt interface to the libraw library used to decode
  RAW picture files.
@@ -30,11 +34,19 @@ Description: RAW picture decoding library -- development files
  This package contains the development files and the documentation.
  The library documentation is available in the kdcraw.h header file.
 
-Package: libkf5kdcraw5
+Package: libkdcraw
 Section: libs
 Architecture: any
 Multi-Arch: same
 Depends: ${misc:Depends}, ${shlibs:Depends}
+Provides: libkf6kdcraw5,
+          libkf6kdcraw6,
+          libkf6kdcraw,
+          libkdcrawqt6,
+Replaces: libkf6kdcraw5,
+          libkf6kdcraw6,
+          libkf6kdcraw,
+          libkdcrawqt6,
 Description: RAW picture decoding library
  Libkdcraw is a Qt interface to the libraw library used to decode
  RAW picture files.
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index 6f12db5..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,2 +0,0 @@
-AUTHORS
-README
diff --git a/debian/libkdcraw-dev.install b/debian/libkdcraw-dev.install
new file mode 100644
index 0000000..ea00257
--- /dev/null
+++ b/debian/libkdcraw-dev.install
@@ -0,0 +1,3 @@
+usr/include/KDcrawQt6/
+usr/lib/*/cmake/KDcrawQt6/
+usr/lib/*/libKDcrawQt6.so
diff --git a/debian/libkdcraw.install b/debian/libkdcraw.install
new file mode 100644
index 0000000..41614fc
--- /dev/null
+++ b/debian/libkdcraw.install
@@ -0,0 +1,3 @@
+usr/lib/*/libKDcrawQt6.so.5
+usr/lib/*/libKDcrawQt6.so.5.*
+usr/share/qlogging-categories6/
diff --git a/debian/libkdcrawqt6.lintian-overrides b/debian/libkdcrawqt6.lintian-overrides
new file mode 100644
index 0000000..c0de3b7
--- /dev/null
+++ b/debian/libkdcrawqt6.lintian-overrides
@@ -0,0 +1 @@
+libkdcraw: package-name-doesnt-match-sonames libKDcrawQt6-5
diff --git a/debian/libkf5kdcraw-dev.install b/debian/libkf5kdcraw-dev.install
deleted file mode 100644
index a5d6c2f..0000000
--- a/debian/libkf5kdcraw-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/
-usr/lib/*/cmake/KF5KDcraw/
-usr/lib/*/libKF5KDcraw.so
diff --git a/debian/libkf5kdcraw5.acc.in b/debian/libkf5kdcraw5.acc.in
deleted file mode 100644
index 8553de6..0000000
--- a/debian/libkf5kdcraw5.acc.in
+++ /dev/null
@@ -1,17 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
-    15.12.0
-</version>
-
-<headers>
-    /usr/include/KF5/KDCRAW
-    /usr/include/KF5/libkdcraw_version.h
-</headers>
-
-<libs>
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5KDcraw.so
-</libs>
-
-</descriptor>
diff --git a/debian/libkf5kdcraw5.install b/debian/libkf5kdcraw5.install
deleted file mode 100644
index 969ad90..0000000
--- a/debian/libkf5kdcraw5.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libKF5KDcraw.so.5
-usr/lib/*/libKF5KDcraw.so.5.*
-usr/share/qlogging-categories5/
diff --git a/debian/libkf5kdcraw5.symbols b/debian/libkf5kdcraw5.symbols
deleted file mode 100644
index 024ca3e..0000000
--- a/debian/libkf5kdcraw5.symbols
+++ /dev/null
@@ -1,61 +0,0 @@
-# SymbolsHelper-Confirmed: 15.12.0 amd64
-libKF5KDcraw.so.5 libkf5kdcraw5 #MINVER#
- _ZN11KDcrawIface18DcrawInfoContainer7isEmptyEv at Base 4.12.3
- _ZN11KDcrawIface18DcrawInfoContainerC1Ev at Base 4.12.3
- _ZN11KDcrawIface18DcrawInfoContainerC2Ev at Base 4.12.3
- _ZN11KDcrawIface18DcrawInfoContainerD0Ev at Base 4.12.3
- _ZN11KDcrawIface18DcrawInfoContainerD1Ev at Base 4.12.3
- _ZN11KDcrawIface18DcrawInfoContainerD2Ev at Base 4.12.3
- _ZN11KDcrawIface19RawDecodingSettings19optimizeTimeLoadingEv at Base 4.12.3
- _ZN11KDcrawIface19RawDecodingSettingsC1Ev at Base 4.12.3
- _ZN11KDcrawIface19RawDecodingSettingsC2Ev at Base 4.12.3
- _ZN11KDcrawIface19RawDecodingSettingsD0Ev at Base 4.12.3
- _ZN11KDcrawIface19RawDecodingSettingsD1Ev at Base 4.12.3
- _ZN11KDcrawIface19RawDecodingSettingsD2Ev at Base 4.12.3
- _ZN11KDcrawIface19RawDecodingSettingsaSERKS0_ at Base 4.12.3
- _ZN11KDcrawIface6KDcraw11qt_metacallEN11QMetaObject4CallEiPPv at Base 4.12.3
- _ZN11KDcrawIface6KDcraw11qt_metacastEPKc at Base 4.12.3
- _ZN11KDcrawIface6KDcraw12rawFilesListEv at Base 4.12.3
- _ZN11KDcrawIface6KDcraw13librawUseGompEv at Base 4.12.3
- _ZN11KDcrawIface6KDcraw13librawVersionEv at Base 4.12.3
- _ZN11KDcrawIface6KDcraw13loadFullImageER6QImageRK7QStringRKNS_19RawDecodingSettingsE at Base 4.12.3
- _ZN11KDcrawIface6KDcraw14decodeRAWImageERK7QStringRKNS_19RawDecodingSettingsER10QByteArrayRiS9_S9_ at Base 4.12.3
- _ZN11KDcrawIface6KDcraw14extractRAWDataERK7QStringR10QByteArrayRNS_18DcrawInfoContainerEj at Base 4.12.3
- _ZN11KDcrawIface6KDcraw14loadRawPreviewER6QImageRK7QString at Base 4.12.3
- _ZN11KDcrawIface6KDcraw15loadHalfPreviewER10QByteArrayRK7QBuffer at Base 4.12.3
- _ZN11KDcrawIface6KDcraw15loadHalfPreviewER10QByteArrayRK7QString at Base 4.12.3
- _ZN11KDcrawIface6KDcraw15loadHalfPreviewER6QImageRK7QString at Base 4.12.3
- _ZN11KDcrawIface6KDcraw15rawFileIdentifyERNS_18DcrawInfoContainerERK7QString at Base 4.12.3
- _ZN11KDcrawIface6KDcraw15rawFilesVersionEv at Base 4.12.3
- _ZN11KDcrawIface6KDcraw15supportedCameraEv at Base 4.12.3
- _ZN11KDcrawIface6KDcraw16staticMetaObjectE at Base 4.12.3
- _ZN11KDcrawIface6KDcraw17librawUseRawSpeedEv at Base 4.12.3
- _ZN11KDcrawIface6KDcraw18decodeHalfRAWImageERK7QStringRKNS_19RawDecodingSettingsER10QByteArrayRiS9_S9_ at Base 4.12.3
- _ZN11KDcrawIface6KDcraw19loadEmbeddedPreviewER10QByteArrayRK7QBuffer at Base 4.12.3
- _ZN11KDcrawIface6KDcraw19loadEmbeddedPreviewER10QByteArrayRK7QString at Base 4.12.3
- _ZN11KDcrawIface6KDcraw19loadEmbeddedPreviewER6QImageRK7QString at Base 4.12.3
- _ZN11KDcrawIface6KDcraw22setWaitingDataProgressEd at Base 4.12.3
- _ZN11KDcrawIface6KDcraw24checkToCancelWaitingDataEv at Base 4.12.3
- _ZN11KDcrawIface6KDcraw25librawUseGPL2DemosaicPackEv at Base 4.12.3
- _ZN11KDcrawIface6KDcraw25librawUseGPL3DemosaicPackEv at Base 4.12.3
- _ZN11KDcrawIface6KDcraw6cancelEv at Base 4.12.3
- _ZN11KDcrawIface6KDcraw7versionEv at Base 4.12.3
- _ZN11KDcrawIface6KDcraw8rawFilesEv at Base 4.12.3
- _ZN11KDcrawIface6KDcrawC1Ev at Base 4.12.3
- _ZN11KDcrawIface6KDcrawC2Ev at Base 4.12.3
- _ZN11KDcrawIface6KDcrawD0Ev at Base 4.12.3
- _ZN11KDcrawIface6KDcrawD1Ev at Base 4.12.3
- _ZN11KDcrawIface6KDcrawD2Ev at Base 4.12.3
- _ZN11KDcrawIfacelsE6QDebugRKNS_18DcrawInfoContainerE at Base 4.12.3
- _ZN11KDcrawIfacelsE6QDebugRKNS_19RawDecodingSettingsE at Base 4.12.3
- _ZNK11KDcrawIface19RawDecodingSettingseqERKS0_ at Base 4.12.3
- _ZNK11KDcrawIface6KDcraw10metaObjectEv at Base 4.12.3
- _ZTIN11KDcrawIface18DcrawInfoContainerE at Base 4.12.3
- _ZTIN11KDcrawIface19RawDecodingSettingsE at Base 4.12.3
- _ZTIN11KDcrawIface6KDcrawE at Base 4.12.3
- _ZTSN11KDcrawIface18DcrawInfoContainerE at Base 4.12.3
- _ZTSN11KDcrawIface19RawDecodingSettingsE at Base 4.12.3
- _ZTSN11KDcrawIface6KDcrawE at Base 4.12.3
- _ZTVN11KDcrawIface18DcrawInfoContainerE at Base 4.12.3
- _ZTVN11KDcrawIface19RawDecodingSettingsE at Base 4.12.3
- _ZTVN11KDcrawIface6KDcrawE at Base 4.12.3
diff --git a/debian/rules b/debian/rules
index b57f3e9..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,3 +1,6 @@
 #!/usr/bin/make -f
+# SPDX-License-Identifier: LGPL-2.0-or-later
+# SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
-include /usr/share/pkg-kde-tools/qt-kde-team/3/debian-qt-kde.mk
+%:
+	dh $@ --with kf6 --buildsystem kf6
diff --git a/debian/tests/acc b/debian/tests/acc
deleted file mode 100755
index ecd74f2..0000000
--- a/debian/tests/acc
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-
-dh_acc
diff --git a/debian/tests/control b/debian/tests/control
deleted file mode 100644
index 7f101d0..0000000
--- a/debian/tests/control
+++ /dev/null
@@ -1,10 +0,0 @@
-# Tests: testsuite
-# Depends: @, @builddeps@, build-essential,
-#          xvfb, xauth, dbus,
-#          texlive-latex-base
-# Restrictions: build-needed
-
-Tests: acc
-Depends: @,
-         dh-acc, exuberant-ctags
-Restrictions: allow-stderr
diff --git a/debian/tests/testsuite b/debian/tests/testsuite
deleted file mode 100755
index a599827..0000000
--- a/debian/tests/testsuite
+++ /dev/null
@@ -1,3 +0,0 @@
-#!/bin/sh
-xvfb-run -a --server-args="-screen 0 1024x768x24" \
-    dbus-run-session -- debian/tests/testsuite.xsession
diff --git a/debian/tests/testsuite.xsession b/debian/tests/testsuite.xsession
deleted file mode 100755
index 98ca5e6..0000000
--- a/debian/tests/testsuite.xsession
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-export LANG=C.UTF-8
-export LC_ALL=C.UTF-8
-kdeinit5
-trap kdeinit5_shutdown EXIT
-dh_auto_test


More information about the Neon-commits mailing list