[neon/backports-noble/kcolorpicker-noble/Neon/unstable] debian: Make package co-installable

Boyuan Yang null at kde.org
Wed Jul 3 15:10:16 BST 2024


Git commit 0acc696f6fae4d94487c0da73f8cf142ed1f414a by Boyuan Yang.
Committed on 20/03/2024 at 19:06.
Pushed by jriddell into branch 'Neon/unstable'.

Make package co-installable

M  +4    -1    debian/changelog
A  +21   -0    debian/patches/0001-Make-Qt5-Qt6-library-coinstallable.patch
A  +1    -0    debian/patches/series

https://invent.kde.org/neon/backports-noble/kcolorpicker-noble/-/commit/0acc696f6fae4d94487c0da73f8cf142ed1f414a

diff --git a/debian/changelog b/debian/changelog
index 76cb6a1..c88c21a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,8 +7,11 @@ kcolorpicker (0.3.1-1~exp1) experimental; urgency=medium
     + 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>  Tue, 19 Mar 2024 18:23:12 -0400
+ -- Boyuan Yang <byang at debian.org>  Wed, 20 Mar 2024 15:03:25 -0400
 
 kcolorpicker (0.2.0-1) unstable; urgency=medium
 
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



More information about the Neon-commits mailing list