[neon/extras/kdiagram/Neon/unstable] debian: double build madness

Carlos De Maine null at kde.org
Thu Nov 30 11:31:36 GMT 2023


Git commit fa4bd962c3db80c3f8e3952da739f3f4d9227489 by Carlos De Maine.
Committed on 30/11/2023 at 12:31.
Pushed by carlosdem into branch 'Neon/unstable'.

double build madness

M  +78   -2    debian/control
A  +5    -0    debian/libkchart-qt5-dev.install
A  +1    -0    debian/libkchart3-l10n.install
A  +2    -0    debian/libkchart3.install
A  +5    -0    debian/libkgantt-qt5-dev.install
M  +1    -1    debian/libkgantt2-l10n.install
M  +2    -2    debian/libkgantt2.install
C  +0    -0    debian/libkgantt3-l10n.install [from: debian/libkgantt2-l10n.install - 100% similarity]
C  +0    -0    debian/libkgantt3.install [from: debian/libkgantt2.install - 100% similarity]
M  +21   -1    debian/rules

https://invent.kde.org/neon/extras/kdiagram/-/commit/fa4bd962c3db80c3f8e3952da739f3f4d9227489

diff --git a/debian/control b/debian/control
index 2d8ad0f..a27a080 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Package: libkchart-dev
 Architecture: any
 Section: libdevel
 Multi-Arch: same
-Depends: libkchart2 (= ${binary:Version}),
+Depends: libkchart3 (= ${binary:Version}),
          qt6-svg-dev,
          qt6-base-dev,
         ${misc:Depends}
@@ -33,6 +33,82 @@ Description: library for creating business charts (development files)
  .
  This package contains the development files.
 
+Package: libkchart3
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: libkchart3-l10n (= ${binary:Version})
+Description: library for creating business charts (shared library)
+ KD Charts provides an implementation of the ODF Chart specification. It
+ supports stock charts, box charts, and whisker charts and allows one to
+ integrate these charts in Qt-based applications.
+ .
+ This package contains the shared library.
+
+Package: libkchart3-l10n
+Section: localization
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: library for creating business charts (translation)
+ KD Charts provides an implementation of the ODF Chart specification. It
+ supports stock charts, box charts, and whisker charts and allows one to
+ integrate these charts in Qt-based applications.
+ .
+ This package contains translations.
+
+Package: libkgantt-dev
+Architecture: any
+Section: libdevel
+Multi-Arch: same
+Depends: libkgantt3 (= ${binary:Version}),
+         qt6-base-dev,
+         ${misc:Depends}
+Description: library for creating Gantt diagrams (development files)
+ Gantt charts are a bar charts that illustrate project schedules. KD Gantt
+ provides a module for implementing ODF Gantt charts in Qt-based applications.
+ .
+ This package contains the development files.
+
+Package: libkgantt3
+Architecture: any
+Multi-Arch: same
+Depends: ${misc:Depends},
+         ${shlibs:Depends}
+Recommends: libkgantt3-l10n (= ${binary:Version})
+Description: library for creating Gantt diagrams (shared library)
+ Gantt charts are a bar charts that illustrate project schedules. KD Gantt
+ provides a module for implementing ODF Gantt charts in Qt-based applications.
+ .
+ This package contains the shared library.
+
+Package: libkgantt3-l10n
+Section: localization
+Architecture: all
+Multi-Arch: foreign
+Depends: ${misc:Depends}
+Description: library for creating Gantt diagrams (translations)
+ Gantt charts are a bar charts that illustrate project schedules. KD Gantt
+ provides a module for implementing ODF Gantt charts in Qt-based applications.
+ .
+ This package contains translations.
+
+Package: libkchart-qt5-dev
+Architecture: any
+Section: libdevel
+Multi-Arch: same
+Depends: libkchart2 (= ${binary:Version}),
+         libqt5svg5-dev,
+         qtbase5-dev (>= 5.2),
+         ${misc:Depends}
+Description: library for creating business charts (development files)
+ KD Charts provides an implementation of the ODF Chart specification. It
+ supports stock charts, box charts, and whisker charts and allows one to
+ integrate these charts in Qt-based applications.
+ .
+ This package contains the development files.
+
 Package: libkchart2
 Architecture: any
 Multi-Arch: same
@@ -58,7 +134,7 @@ Description: library for creating business charts (translation)
  .
  This package contains translations.
 
-Package: libkgantt-dev
+Package: libkgantt-qt5-dev
 Architecture: any
 Section: libdevel
 Multi-Arch: same
diff --git a/debian/libkchart-qt5-dev.install b/debian/libkchart-qt5-dev.install
new file mode 100644
index 0000000..b07b996
--- /dev/null
+++ b/debian/libkchart-qt5-dev.install
@@ -0,0 +1,5 @@
+usr/include/KChart
+usr/include/kchart_*.h
+usr/lib/*/cmake/KChart
+usr/lib/*/libKChart.so
+usr/lib/*/qt5/mkspecs/modules/qt_KChart.pri
\ No newline at end of file
diff --git a/debian/libkchart3-l10n.install b/debian/libkchart3-l10n.install
new file mode 100644
index 0000000..c6112d5
--- /dev/null
+++ b/debian/libkchart3-l10n.install
@@ -0,0 +1 @@
+usr/share/locale/*/LC_MESSAGES/kchart6_qt.qm
diff --git a/debian/libkchart3.install b/debian/libkchart3.install
new file mode 100644
index 0000000..4742d21
--- /dev/null
+++ b/debian/libkchart3.install
@@ -0,0 +1,2 @@
+usr/lib/*/libKChart6.so.3
+usr/lib/*/libKChart6.so.3.*
diff --git a/debian/libkgantt-qt5-dev.install b/debian/libkgantt-qt5-dev.install
new file mode 100644
index 0000000..ad75df5
--- /dev/null
+++ b/debian/libkgantt-qt5-dev.install
@@ -0,0 +1,5 @@
+usr/include/KGantt
+usr/include/kgantt_*.h
+usr/lib/*/cmake/KGantt
+usr/lib/*/libKGantt.so
+usr/lib/*/qt5/mkspecs/modules/qt_KGantt.pri
diff --git a/debian/libkgantt2-l10n.install b/debian/libkgantt2-l10n.install
index 609c221..0054402 100644
--- a/debian/libkgantt2-l10n.install
+++ b/debian/libkgantt2-l10n.install
@@ -1 +1 @@
-usr/share/locale/*/LC_MESSAGES/kgantt6_qt.qm
+usr/share/locale/*/LC_MESSAGES/kgantt_qt.qm
diff --git a/debian/libkgantt2.install b/debian/libkgantt2.install
index b2387b2..7f274b4 100644
--- a/debian/libkgantt2.install
+++ b/debian/libkgantt2.install
@@ -1,2 +1,2 @@
-usr/lib/*/libKGantt6.so.3
-usr/lib/*/libKGantt6.so.3.*
+usr/lib/*/libKGantt.so.2
+usr/lib/*/libKGantt.so.32*
diff --git a/debian/libkgantt2-l10n.install b/debian/libkgantt3-l10n.install
similarity index 100%
copy from debian/libkgantt2-l10n.install
copy to debian/libkgantt3-l10n.install
diff --git a/debian/libkgantt2.install b/debian/libkgantt3.install
similarity index 100%
copy from debian/libkgantt2.install
copy to debian/libkgantt3.install
diff --git a/debian/rules b/debian/rules
index 3d69b0d..fb259ad 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,5 +2,25 @@
 # SPDX-License-Identifier: LGPL-2.0-or-later
 # SPDX-FileCopyrightText: 2023 Jonathan Riddell <jr at jriddell.org>
 
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all optimize=-lto
+
+#CMAKE_ARGS = -DBUILD_SHARED_LIBS=ON -DQCORO_BUILD_EXAMPLES=ON
+CMAKE_ARGS = 
+
 %:
-	dh $@ --with kf6 --buildsystem kf6
+	dh $@ --with pkgkde_symbolshelper
+
+execute_after_dh_auto_clean:
+	rm -rf build-Qt6
+
+override_dh_auto_configure:
+	dh_auto_configure -- $(CMAKE_ARGS) -DUSE_QT_VERSION=5
+	dh_auto_configure --builddirectory=build-Qt6 -- $(CMAKE_ARGS) -DUSE_QT_VERSION=6
+
+override_dh_auto_build:
+	dh_auto_build
+	dh_auto_build --builddirectory=build-Qt6
+
+override_dh_auto_install:
+	dh_auto_install
+	dh_auto_install --builddirectory=build-Qt6


More information about the Neon-commits mailing list