[neon/backports-noble/kimageannotator-noble/Neon/release] debian: Prepare split package
Boyuan Yang
null at kde.org
Wed Jul 3 14:54:16 BST 2024
Git commit 6d1702051b7047e91c743ac4536a37c99cc119d5 by Boyuan Yang.
Committed on 20/03/2024 at 19:34.
Pushed by jriddell into branch 'Neon/release'.
Prepare split package
M +11 -0 debian/changelog
M +52 -21 debian/control
D +0 -3 debian/libkimageannotator-dev.install
A +1 -0 debian/libkimageannotator-qt5-0.install
A +1 -0 debian/libkimageannotator-qt5-0.shlibs
C +0 -0 debian/libkimageannotator-qt5-dev.examples [from: debian/libkimageannotator-dev.examples - 100% similarity]
A +3 -0 debian/libkimageannotator-qt5-dev.install
A +1 -0 debian/libkimageannotator-qt6-0.install
A +1 -0 debian/libkimageannotator-qt6-0.shlibs
R +0 -0 debian/libkimageannotator-qt6-dev.examples [from: debian/libkimageannotator-dev.examples - 100% similarity]
A +3 -0 debian/libkimageannotator-qt6-dev.install
D +0 -1 debian/libkimageannotator0.install
D +0 -1 debian/libkimageannotator0.shlibs
M +15 -6 debian/rules
https://invent.kde.org/neon/backports-noble/kimageannotator-noble/-/commit/6d1702051b7047e91c743ac4536a37c99cc119d5
diff --git a/debian/changelog b/debian/changelog
index 73566c4..fe08c66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+kimageannotator (0.7.1-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ * Split package to support both Qt5 and Qt6.
+ + libkimageannotator-qt5-0
+ + libkimageannotator-qt6-0
+ + libkimageannotator-qt5-dev
+ + libkimageannotator-qt6-dev
+
+ -- Boyuan Yang <byang at debian.org> Wed, 20 Mar 2024 15:33:08 -0400
+
kimageannotator (0.6.1-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/control b/debian/control
index 3a85261..2634526 100644
--- a/debian/control
+++ b/debian/control
@@ -3,56 +3,87 @@ Section: libs
Priority: optional
Maintainer: Boyuan Yang <byang at debian.org>
Build-Depends:
- debhelper-compat (= 13),
cmake,
+ debhelper-compat (= 13),
+ libkcolorpicker-qt5-dev (>= 0.3.1~),
+ libkcolorpicker-qt6-dev (>= 0.3.1~),
+ libqt5svg5-dev,
+ qt6-base-dev,
qtbase5-dev,
- libkcolorpicker-dev (>= 0.2.0~),
- qttools5-dev-tools,
qttools5-dev,
- libqt5svg5-dev,
+ qttools5-dev-tools,
Standards-Version: 4.6.2
Rules-Requires-Root: no
Homepage: https://github.com/ksnip/kImageAnnotator
Vcs-Git: https://salsa.debian.org/debian/kimageannotator.git
Vcs-Browser: https://salsa.debian.org/debian/kimageannotator
-Package: libkimageannotator-dev
+Package: libkimageannotator-qt5-dev
Section: libdevel
Architecture: any
Multi-Arch: same
Depends:
- libkcolorpicker-dev,
- libkimageannotator0 (= ${binary:Version}),
+ libkcolorpicker-qt5-dev,
+ libkimageannotator-qt5-0 (= ${binary:Version}),
+ ${misc:Depends},
+Description: Image Annotating Library (Qt5 dev)
+ The kImageAnnotator library provides tools to annotate
+ images. This library is used by the ksnip project.
+ .
+ This package provides the Qt5 development files.
+
+Package: libkimageannotator-common
+Architecture: all
+Multi-Arch: foreign
+Depends:
${misc:Depends},
-Description: Image Annotating Library (dev)
+Breaks:
+ libkimageannotator0 (<< 0.3.1-3),
+Replaces:
+ libkimageannotator0 (<< 0.3.1-3),
+Description: Image Annotating Library (common data files)
The kImageAnnotator library provides tools to annotate
images. This library is used by the ksnip project.
.
- This package provides the development files.
+ This package provides the architecture-independent files used by
+ the library, including the translation files.
-Package: libkimageannotator0
+Package: libkimageannotator-qt5-0
Architecture: any
Multi-Arch: same
Depends:
- ${shlibs:Depends},
+ libkimageannotator-common (= ${source:Version}),
${misc:Depends},
+ ${shlibs:Depends},
+Description: Image Annotating Library (Qt5 lib)
+ The kImageAnnotator library provides tools to annotate
+ images. This library is used by the ksnip project.
+ .
+ This package provides the Qt5 shared library.
+
+Package: libkimageannotator-qt6-0
+Architecture: any
+Multi-Arch: same
+Depends:
libkimageannotator-common (= ${source:Version}),
-Description: Image Annotating Library (lib)
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: Image Annotating Library (Qt6 lib)
The kImageAnnotator library provides tools to annotate
images. This library is used by the ksnip project.
.
- This package provides the shared library.
+ This package provides the Qt6 shared library.
-Package: libkimageannotator-common
-Architecture: all
-Multi-Arch: foreign
+Package: libkimageannotator-qt6-dev
+Section: libdevel
+Architecture: any
+Multi-Arch: same
Depends:
+ libkcolorpicker-qt6-dev,
+ libkimageannotator-qt6-0 (= ${binary:Version}),
${misc:Depends},
-Breaks: libkimageannotator0 (<< 0.3.1-3),
-Replaces: libkimageannotator0 (<< 0.3.1-3),
-Description: Image Annotating Library (common data files)
+Description: Image Annotating Library (Qt6 dev)
The kImageAnnotator library provides tools to annotate
images. This library is used by the ksnip project.
.
- This package provides the architecture-independent files used by
- the library, including the translation files.
+ This package provides the Qt6 development files.
diff --git a/debian/libkimageannotator-dev.install b/debian/libkimageannotator-dev.install
deleted file mode 100644
index e8ea616..0000000
--- a/debian/libkimageannotator-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include/*
-usr/lib/*/cmake/*
-usr/lib/*/libkImageAnnotator.so
diff --git a/debian/libkimageannotator-qt5-0.install b/debian/libkimageannotator-qt5-0.install
new file mode 100644
index 0000000..aeff10e
--- /dev/null
+++ b/debian/libkimageannotator-qt5-0.install
@@ -0,0 +1 @@
+usr/lib/*/libkImageAnnotator-Qt5.so.0*
diff --git a/debian/libkimageannotator-qt5-0.shlibs b/debian/libkimageannotator-qt5-0.shlibs
new file mode 100644
index 0000000..cf3983c
--- /dev/null
+++ b/debian/libkimageannotator-qt5-0.shlibs
@@ -0,0 +1 @@
+libkImageAnnotator-Qt5 0 libkimageannotator-qt5-0 (>= 0.7.1)
diff --git a/debian/libkimageannotator-dev.examples b/debian/libkimageannotator-qt5-dev.examples
similarity index 100%
copy from debian/libkimageannotator-dev.examples
copy to debian/libkimageannotator-qt5-dev.examples
diff --git a/debian/libkimageannotator-qt5-dev.install b/debian/libkimageannotator-qt5-dev.install
new file mode 100644
index 0000000..0d0cb4e
--- /dev/null
+++ b/debian/libkimageannotator-qt5-dev.install
@@ -0,0 +1,3 @@
+usr/include/kImageAnnotator-Qt5/
+usr/lib/*/cmake/kImageAnnotator-Qt5/
+usr/lib/*/libkImageAnnotator-Qt5.so
diff --git a/debian/libkimageannotator-qt6-0.install b/debian/libkimageannotator-qt6-0.install
new file mode 100644
index 0000000..396776a
--- /dev/null
+++ b/debian/libkimageannotator-qt6-0.install
@@ -0,0 +1 @@
+usr/lib/*/libkImageAnnotator-Qt6.so.0*
diff --git a/debian/libkimageannotator-qt6-0.shlibs b/debian/libkimageannotator-qt6-0.shlibs
new file mode 100644
index 0000000..8ed844c
--- /dev/null
+++ b/debian/libkimageannotator-qt6-0.shlibs
@@ -0,0 +1 @@
+libkImageAnnotator-Qt6 0 libkimageannotator-qt6-0 (>= 0.7.1)
diff --git a/debian/libkimageannotator-dev.examples b/debian/libkimageannotator-qt6-dev.examples
similarity index 100%
rename from debian/libkimageannotator-dev.examples
rename to debian/libkimageannotator-qt6-dev.examples
diff --git a/debian/libkimageannotator-qt6-dev.install b/debian/libkimageannotator-qt6-dev.install
new file mode 100644
index 0000000..43a0845
--- /dev/null
+++ b/debian/libkimageannotator-qt6-dev.install
@@ -0,0 +1,3 @@
+usr/include/kImageAnnotator-Qt6/
+usr/lib/*/cmake/kImageAnnotator-Qt6/
+usr/lib/*/libkImageAnnotator-Qt6.so
diff --git a/debian/libkimageannotator0.install b/debian/libkimageannotator0.install
deleted file mode 100644
index 3fa1e44..0000000
--- a/debian/libkimageannotator0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/*.so.0*
diff --git a/debian/libkimageannotator0.shlibs b/debian/libkimageannotator0.shlibs
deleted file mode 100644
index 8586f4a..0000000
--- a/debian/libkimageannotator0.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libkImageAnnotator 0 libkimageannotator0 (>= 0.6.0)
diff --git a/debian/rules b/debian/rules
index 7ccbeec..78cb039 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,12 +12,21 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
# package maintainers to append LDFLAGS
export DEB_LDFLAGS_MAINT_APPEND =
-export QT_SELECT := 5
-
-
%:
- dh $@
+ dh $@ --buildsystem=cmake
override_dh_auto_configure:
- dh_auto_configure -- \
- -DBUILD_SHARED_LIBS=ON
+ dh_auto_configure --builddirectory=qt5 -- -DBUILD_SHARED_LIBS=ON -DBUILD_WITH_QT6=OFF
+ dh_auto_configure --builddirectory=qt6 -- -DBUILD_SHARED_LIBS=ON -DBUILD_WITH_QT6=ON
+
+override_dh_auto_build:
+ dh_auto_build --builddirectory=qt5
+ dh_auto_build --builddirectory=qt6
+
+override_dh_auto_install:
+ dh_auto_install --builddirectory=qt5
+ dh_auto_install --builddirectory=qt6
+
+override_dh_auto_test:
+ dh_auto_test --builddirectory=qt5
+ dh_auto_test --builddirectory=qt6
More information about the Neon-commits
mailing list