[neon/backports-jammy/kcolorpicker/Neon/release_jammy] debian: backport dual build from noble to make do-release-upgrade happy
Carlos De Maine
null at kde.org
Mon Sep 16 12:38:34 BST 2024
Git commit f269eac0fcbf1b12e60f622761930bc29fedfcc1 by Carlos De Maine.
Committed on 16/09/2024 at 11:35.
Pushed by carlosdem into branch 'Neon/release_jammy'.
backport dual build from noble to make do-release-upgrade happy
M +25 -7 debian/changelog
M +43 -13 debian/control
A +1 -0 debian/libkcolorpicker-qt5-0.install
A +1 -0 debian/libkcolorpicker-qt5-0.shlibs
A +1 -0 debian/libkcolorpicker-qt5-dev.docs
A +1 -0 debian/libkcolorpicker-qt5-dev.examples
A +3 -0 debian/libkcolorpicker-qt5-dev.install
M +1 -1 debian/libkcolorpicker-qt6-0.install
A +1 -0 debian/libkcolorpicker-qt6-0.shlibs
M +1 -1 debian/libkcolorpicker-qt6-dev.docs
M +1 -1 debian/libkcolorpicker-qt6-dev.examples
M +3 -3 debian/libkcolorpicker-qt6-dev.install
A +21 -0 debian/patches/0001-Make-Qt5-Qt6-library-coinstallable.patch
A +1 -0 debian/patches/series
M +15 -5 debian/rules
https://invent.kde.org/neon/backports-jammy/kcolorpicker/-/commit/f269eac0fcbf1b12e60f622761930bc29fedfcc1
diff --git a/debian/changelog b/debian/changelog
index 2802096..66fe74b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,30 @@
-kcolorpicker (0.3.1-0neon) jammy; urgency=medium
+kcolorpicker (0.3.1-1) noble; urgency=medium
- [ Jonathan Esk-Riddell ]
- * New release
+ * Upload to unstable.
+
+ -- Boyuan Yang <byang at debian.org> Sun, 05 May 2024 14:25:54 -0400
+
+kcolorpicker (0.3.1-1~exp2) experimental; urgency=medium
- [ Carlos De Maine ]
- * New release
+ * debian/control: Put package under Debian KDE Extras Team maintenance.
+ * debian/control: Bump Standards-Version to 4.7.0.
- -- Carlos De Maine <carlosdemaine at gmail.com> Tue, 02 Apr 2024 12:40:00 +1100
+ -- Boyuan Yang <byang at debian.org> Fri, 26 Apr 2024 21:55:46 -0400
+
+kcolorpicker (0.3.1-1~exp1) experimental; urgency=medium
+
+ * New upstream release.
+ + Support both Qt5 and Qt6.
+ * debian/: Split packages:
+ + libkcolorpicker-qt5-dev
+ + libkcolorpicker-qt5-0
+ + libkcolorpicker-qt6-dev
+ + libkcolorpicker-qt6-0
+ * debian/patches/0001-Make-Qt5-Qt6-library-coinstallable.patch:
+ Add patch to adjust proposed library name changes to make library
+ co-installable.
+
+ -- Boyuan Yang <byang at debian.org> Wed, 20 Mar 2024 15:03:25 -0400
kcolorpicker (0.2.0-1) unstable; urgency=medium
@@ -93,4 +111,4 @@ kcolorpicker (0.1.1-1) unstable; urgency=medium
* Initial release. (Closes: #955296)
- -- Boyuan Yang <byang at debian.org> Sun, 29 Mar 2020 10:08:44 -0400
+ -- Boyuan Yang <byang at debian.org> Sun, 29 Mar 2020 10:08:44 -0400
\ No newline at end of file
diff --git a/debian/control b/debian/control
index 7d8b49b..af99ea6 100644
--- a/debian/control
+++ b/debian/control
@@ -1,34 +1,64 @@
Source: kcolorpicker
Section: libs
Priority: optional
-Maintainer: Boyuan Yang <byang at debian.org>
-Build-Depends: cmake, debhelper-compat (= 13), qt6-base-dev
+Maintainer: Debian KDE Extras Team <pkg-kde-extras at lists.alioth.debian.org>
+Uploaders:
+ Boyuan Yang <byang at debian.org>,
+Build-Depends:
+ cmake,
+ debhelper-compat (= 13),
+ qtbase5-dev,
+ qt6-base-dev,
Rules-Requires-Root: no
-Standards-Version: 4.6.1
+Standards-Version: 4.7.0
Homepage: https://github.com/ksnip/kcolorpicker
Vcs-Git: https://salsa.debian.org/debian/kcolorpicker.git
Vcs-Browser: https://salsa.debian.org/debian/kcolorpicker
+Package: libkcolorpicker-qt5-dev
+Architecture: any
+Multi-Arch: same
+Depends:
+ libkcolorpicker-qt5-0 (= ${binary:Version}),
+ ${misc:Depends},
+Description: QToolButton-like widget with color selection popup menu (Qt5 dev)
+ The kColorPicker library provides a QToolButton-like widget with color
+ selection popup menu. This library is used by the ksnip project.
+ .
+ This package provides the development files for Qt5.
+
+Package: libkcolorpicker-qt5-0
+Architecture: any
+Multi-Arch: same
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: QToolButton-like widget with color selection popup menu (Qt5 lib)
+ The kColorPicker library provides a QToolButton-like widget with color
+ selection popup menu. This library is used by the ksnip project.
+ .
+ This package provides the shared library for Qt5.
+
Package: libkcolorpicker-qt6-dev
Architecture: any
Multi-Arch: same
-Depends: libkcolorpicker-qt6-0 (= ${binary:Version}),
- qt6-base-dev,
- ${misc:Depends}
-Description: QToolButton-like widget with color selection popup menu (dev)
+Depends:
+ libkcolorpicker-qt6-0 (= ${binary:Version}),
+ ${misc:Depends},
+Description: QToolButton-like widget with color selection popup menu (Qt6 dev)
The kColorPicker library provides a QToolButton-like widget with color
selection popup menu. This library is used by the ksnip project.
.
- This package provides the development files.
+ This package provides the development files for Qt6.
Package: libkcolorpicker-qt6-0
Architecture: any
Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Replaces: libkcolorpicker0
-Conflicts: libkcolorpicker0
-Description: QToolButton-like widget with color selection popup menu (lib)
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+Description: QToolButton-like widget with color selection popup menu (Qt6 lib)
The kColorPicker library provides a QToolButton-like widget with color
selection popup menu. This library is used by the ksnip project.
.
- This package provides the shared library.
+ This package provides the shared library for Qt6.
\ No newline at end of file
diff --git a/debian/libkcolorpicker-qt5-0.install b/debian/libkcolorpicker-qt5-0.install
new file mode 100644
index 0000000..65f725c
--- /dev/null
+++ b/debian/libkcolorpicker-qt5-0.install
@@ -0,0 +1 @@
+usr/lib/*/libkColorPicker-Qt5.so.*
diff --git a/debian/libkcolorpicker-qt5-0.shlibs b/debian/libkcolorpicker-qt5-0.shlibs
new file mode 100644
index 0000000..f523438
--- /dev/null
+++ b/debian/libkcolorpicker-qt5-0.shlibs
@@ -0,0 +1 @@
+libkColorPicker-Qt5 0 libkcolorpicker-qt5-0 (>= 0.3.1)
diff --git a/debian/libkcolorpicker-qt5-dev.docs b/debian/libkcolorpicker-qt5-dev.docs
new file mode 100644
index 0000000..42061c0
--- /dev/null
+++ b/debian/libkcolorpicker-qt5-dev.docs
@@ -0,0 +1 @@
+README.md
\ No newline at end of file
diff --git a/debian/libkcolorpicker-qt5-dev.examples b/debian/libkcolorpicker-qt5-dev.examples
new file mode 100644
index 0000000..4949f09
--- /dev/null
+++ b/debian/libkcolorpicker-qt5-dev.examples
@@ -0,0 +1 @@
+example/
\ No newline at end of file
diff --git a/debian/libkcolorpicker-qt5-dev.install b/debian/libkcolorpicker-qt5-dev.install
new file mode 100644
index 0000000..9cc6ee6
--- /dev/null
+++ b/debian/libkcolorpicker-qt5-dev.install
@@ -0,0 +1,3 @@
+usr/include/kColorPicker-Qt5/
+usr/lib/*/cmake/kColorPicker-Qt5/
+usr/lib/*/libkColorPicker-Qt5.so
diff --git a/debian/libkcolorpicker-qt6-0.install b/debian/libkcolorpicker-qt6-0.install
index 3ddde58..5af68e6 100644
--- a/debian/libkcolorpicker-qt6-0.install
+++ b/debian/libkcolorpicker-qt6-0.install
@@ -1 +1 @@
-usr/lib/*/lib*.so.*
+usr/lib/*/libkColorPicker-Qt6.so.*
\ No newline at end of file
diff --git a/debian/libkcolorpicker-qt6-0.shlibs b/debian/libkcolorpicker-qt6-0.shlibs
new file mode 100644
index 0000000..89f1ae8
--- /dev/null
+++ b/debian/libkcolorpicker-qt6-0.shlibs
@@ -0,0 +1 @@
+libkColorPicker-Qt6 0 libkcolorpicker-qt6-0 (>= 0.3.1)
diff --git a/debian/libkcolorpicker-qt6-dev.docs b/debian/libkcolorpicker-qt6-dev.docs
index b43bf86..42061c0 100644
--- a/debian/libkcolorpicker-qt6-dev.docs
+++ b/debian/libkcolorpicker-qt6-dev.docs
@@ -1 +1 @@
-README.md
+README.md
\ No newline at end of file
diff --git a/debian/libkcolorpicker-qt6-dev.examples b/debian/libkcolorpicker-qt6-dev.examples
index 90c978b..4949f09 100644
--- a/debian/libkcolorpicker-qt6-dev.examples
+++ b/debian/libkcolorpicker-qt6-dev.examples
@@ -1 +1 @@
-example/
+example/
\ No newline at end of file
diff --git a/debian/libkcolorpicker-qt6-dev.install b/debian/libkcolorpicker-qt6-dev.install
index a4c010d..59f4f5c 100644
--- a/debian/libkcolorpicker-qt6-dev.install
+++ b/debian/libkcolorpicker-qt6-dev.install
@@ -1,3 +1,3 @@
-usr/include
-usr/lib/*/cmake/*
-usr/lib/*/lib*.so
+usr/include/kColorPicker-Qt6/
+usr/lib/*/cmake/kColorPicker-Qt6/
+usr/lib/*/libkColorPicker-Qt6.so
\ No newline at end of file
diff --git a/debian/patches/0001-Make-Qt5-Qt6-library-coinstallable.patch b/debian/patches/0001-Make-Qt5-Qt6-library-coinstallable.patch
new file mode 100644
index 0000000..fed09b7
--- /dev/null
+++ b/debian/patches/0001-Make-Qt5-Qt6-library-coinstallable.patch
@@ -0,0 +1,21 @@
+From: Boyuan Yang <byang at debian.org>
+Date: Wed, 20 Mar 2024 15:02:32 -0400
+Subject: Make Qt5 Qt6 library coinstallable
+
+Bug: https://github.com/ksnip/kColorPicker/issues/13
+---
+ CMakeLists.txt | 1 +
+ 1 file changed, 1 insertion(+)
+
+diff --git a/CMakeLists.txt b/CMakeLists.txt
+index 1d15048..3d14b5b 100644
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
+@@ -65,6 +65,7 @@ set_target_properties(kColorPicker
+ RUNTIME_OUTPUT_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR}/bin
+ VERSION ${PROJECT_VERSION}
+ SOVERSION 0
++ OUTPUT_NAME kColorPicker-Qt${QT_MAJOR_VERSION}
+ )
+
+ install(TARGETS kColorPicker
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..7e420d2
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+0001-Make-Qt5-Qt6-library-coinstallable.patch
diff --git a/debian/rules b/debian/rules
index 7924d8d..78cb039 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,10 +13,20 @@ export DEB_BUILD_MAINT_OPTIONS = hardening=+all
export DEB_LDFLAGS_MAINT_APPEND =
%:
- dh $@ --with kf6 --buildsystem kf6
+ dh $@ --buildsystem=cmake
override_dh_auto_configure:
- dh_auto_configure -- \
- -DBUILD_SHARED_LIBS=ON \
- -DBUILD_WITH_QT6=6 \
- $(NULL)
+ 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