[neon/backports-noble/kcolorpicker-noble/Neon/unstable] debian: Really do migration

[Boyuan Yang]

Git commit fa04cb25d11fd800fa286e88f405ea9e7309a562 by Boyuan Yang.
Committed on 19/03/2024 at 22:22.
Pushed by jriddell into branch 'Neon/unstable'.

Really do migration

M  +33   -8    debian/control
D  +0    -3    debian/libkcolorpicker-dev.install
A  +1    -0    debian/libkcolorpicker-qt5-0.install
A  +1    -0    debian/libkcolorpicker-qt5-0.shlibs
C  +0    -0    debian/libkcolorpicker-qt5-dev.docs [from: debian/libkcolorpicker-dev.docs - 100% similarity]
C  +0    -0    debian/libkcolorpicker-qt5-dev.examples [from: debian/libkcolorpicker-dev.examples - 100% similarity]
A  +3    -0    debian/libkcolorpicker-qt5-dev.install
A  +1    -0    debian/libkcolorpicker-qt6-0.install
A  +1    -0    debian/libkcolorpicker-qt6-0.shlibs
R  +0    -0    debian/libkcolorpicker-qt6-dev.docs [from: debian/libkcolorpicker-dev.docs - 100% similarity]
R  +0    -0    debian/libkcolorpicker-qt6-dev.examples [from: debian/libkcolorpicker-dev.examples - 100% similarity]
A  +3    -0    debian/libkcolorpicker-qt6-dev.install
D  +0    -1    debian/libkcolorpicker0.install
D  +0    -1    debian/libkcolorpicker0.shlibs
M  +11   -7    debian/rules

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

diff --git a/debian/control b/debian/control
index 0fe4d05..15e0f02 100644
--- a/debian/control
+++ b/debian/control
@@ -6,32 +6,57 @@ Build-Depends:
  cmake,
  debhelper-compat (= 13),
  qtbase5-dev,
+ qt6-base-dev,
 Rules-Requires-Root: no
-Standards-Version: 4.6.1
+Standards-Version: 4.6.2
 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-dev
+Package: libkcolorpicker-qt5-dev
 Architecture: any
 Multi-Arch: same
 Depends:
- libkcolorpicker0 (= ${binary:Version}),
+ libkcolorpicker-qt5-0 (= ${binary:Version}),
  ${misc:Depends},
-Description: QToolButton-like widget with color selection popup menu (dev)
+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.
+ This package provides the development files for Qt5.
 
-Package: libkcolorpicker0
+Package: libkcolorpicker-qt5-0
 Architecture: any
 Multi-Arch: same
 Depends:
  ${misc:Depends},
  ${shlibs:Depends},
-Description: QToolButton-like widget with color selection popup menu (lib)
+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.
+ This package provides the shared library for Qt5.
+
+Package: libkcolorpicker-qt6-dev
+Architecture: any
+Multi-Arch: same
+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 for Qt6.
+
+Package: libkcolorpicker-qt6-0
+Architecture: any
+Multi-Arch: same
+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 for Qt6.
diff --git a/debian/libkcolorpicker-dev.install b/debian/libkcolorpicker-dev.install
deleted file mode 100644
index a4c010d..0000000
--- a/debian/libkcolorpicker-dev.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/include
-usr/lib/*/cmake/*
-usr/lib/*/lib*.so
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-dev.docs b/debian/libkcolorpicker-qt5-dev.docs
similarity index 100%
copy from debian/libkcolorpicker-dev.docs
copy to debian/libkcolorpicker-qt5-dev.docs
diff --git a/debian/libkcolorpicker-dev.examples b/debian/libkcolorpicker-qt5-dev.examples
similarity index 100%
copy from debian/libkcolorpicker-dev.examples
copy to debian/libkcolorpicker-qt5-dev.examples
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
new file mode 100644
index 0000000..e67c722
--- /dev/null
+++ b/debian/libkcolorpicker-qt6-0.install
@@ -0,0 +1 @@
+usr/lib/*/libkColorPicker-Qt6.so.*
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-dev.docs b/debian/libkcolorpicker-qt6-dev.docs
similarity index 100%
rename from debian/libkcolorpicker-dev.docs
rename to debian/libkcolorpicker-qt6-dev.docs
diff --git a/debian/libkcolorpicker-dev.examples b/debian/libkcolorpicker-qt6-dev.examples
similarity index 100%
rename from debian/libkcolorpicker-dev.examples
rename to debian/libkcolorpicker-qt6-dev.examples
diff --git a/debian/libkcolorpicker-qt6-dev.install b/debian/libkcolorpicker-qt6-dev.install
new file mode 100644
index 0000000..d377d03
--- /dev/null
+++ b/debian/libkcolorpicker-qt6-dev.install
@@ -0,0 +1,3 @@
+usr/include/kColorPicker-Qt6/
+usr/lib/*/cmake/kColorPicker-Qt6/
+usr/lib/*/libkColorPicker-Qt6.so
diff --git a/debian/libkcolorpicker0.install b/debian/libkcolorpicker0.install
deleted file mode 100644
index 3ddde58..0000000
--- a/debian/libkcolorpicker0.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.*
diff --git a/debian/libkcolorpicker0.shlibs b/debian/libkcolorpicker0.shlibs
deleted file mode 100644
index a0b3c24..0000000
--- a/debian/libkcolorpicker0.shlibs
+++ /dev/null
@@ -1 +0,0 @@
-libkColorPicker 0 libkcolorpicker0 (>= 0.2.0)
diff --git a/debian/rules b/debian/rules
index ca83181..630d027 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,13 +12,17 @@ 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 \
-	        $(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