[neon/extras/kdiagram/Neon/unstable] debian: Revert "double build madness"
Carlos De Maine
null at kde.org
Thu Nov 30 11:36:30 GMT 2023
Git commit 575c81b108bd866816f203e71fd3af7f913f57ca by Carlos De Maine.
Committed on 30/11/2023 at 12:36.
Pushed by carlosdem into branch 'Neon/unstable'.
Revert "double build madness"
This reverts commit fa4bd962c3db80c3f8e3952da739f3f4d9227489
M +2 -78 debian/control
D +0 -5 debian/libkchart-qt5-dev.install
D +0 -1 debian/libkchart3-l10n.install
D +0 -2 debian/libkchart3.install
D +0 -5 debian/libkgantt-qt5-dev.install
M +1 -1 debian/libkgantt2-l10n.install
M +2 -2 debian/libkgantt2.install
D +0 -1 debian/libkgantt3-l10n.install
D +0 -2 debian/libkgantt3.install
M +1 -21 debian/rules
https://invent.kde.org/neon/extras/kdiagram/-/commit/575c81b108bd866816f203e71fd3af7f913f57ca
diff --git a/debian/control b/debian/control
index a27a080..2d8ad0f 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Package: libkchart-dev
Architecture: any
Section: libdevel
Multi-Arch: same
-Depends: libkchart3 (= ${binary:Version}),
+Depends: libkchart2 (= ${binary:Version}),
qt6-svg-dev,
qt6-base-dev,
${misc:Depends}
@@ -33,82 +33,6 @@ 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
@@ -134,7 +58,7 @@ Description: library for creating business charts (translation)
.
This package contains translations.
-Package: libkgantt-qt5-dev
+Package: libkgantt-dev
Architecture: any
Section: libdevel
Multi-Arch: same
diff --git a/debian/libkchart-qt5-dev.install b/debian/libkchart-qt5-dev.install
deleted file mode 100644
index b07b996..0000000
--- a/debian/libkchart-qt5-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-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
deleted file mode 100644
index c6112d5..0000000
--- a/debian/libkchart3-l10n.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/*/LC_MESSAGES/kchart6_qt.qm
diff --git a/debian/libkchart3.install b/debian/libkchart3.install
deleted file mode 100644
index 4742d21..0000000
--- a/debian/libkchart3.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKChart6.so.3
-usr/lib/*/libKChart6.so.3.*
diff --git a/debian/libkgantt-qt5-dev.install b/debian/libkgantt-qt5-dev.install
deleted file mode 100644
index ad75df5..0000000
--- a/debian/libkgantt-qt5-dev.install
+++ /dev/null
@@ -1,5 +0,0 @@
-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 0054402..609c221 100644
--- a/debian/libkgantt2-l10n.install
+++ b/debian/libkgantt2-l10n.install
@@ -1 +1 @@
-usr/share/locale/*/LC_MESSAGES/kgantt_qt.qm
+usr/share/locale/*/LC_MESSAGES/kgantt6_qt.qm
diff --git a/debian/libkgantt2.install b/debian/libkgantt2.install
index 7f274b4..b2387b2 100644
--- a/debian/libkgantt2.install
+++ b/debian/libkgantt2.install
@@ -1,2 +1,2 @@
-usr/lib/*/libKGantt.so.2
-usr/lib/*/libKGantt.so.32*
+usr/lib/*/libKGantt6.so.3
+usr/lib/*/libKGantt6.so.3.*
diff --git a/debian/libkgantt3-l10n.install b/debian/libkgantt3-l10n.install
deleted file mode 100644
index 609c221..0000000
--- a/debian/libkgantt3-l10n.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/locale/*/LC_MESSAGES/kgantt6_qt.qm
diff --git a/debian/libkgantt3.install b/debian/libkgantt3.install
deleted file mode 100644
index b2387b2..0000000
--- a/debian/libkgantt3.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/*/libKGantt6.so.3
-usr/lib/*/libKGantt6.so.3.*
diff --git a/debian/rules b/debian/rules
index fb259ad..3d69b0d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,25 +2,5 @@
# 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 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
+ dh $@ --with kf6 --buildsystem kf6
More information about the Neon-commits
mailing list