[neon/kde/marble/Neon/unstable] debian: kf6ify
Carlos De Maine
null at kde.org
Tue Oct 1 13:13:48 BST 2024
Git commit 07ce8431a06909061730ffa41f7bd378093bad59 by Carlos De Maine.
Committed on 01/10/2024 at 12:04.
Pushed by carlosdem into branch 'Neon/unstable'.
kf6ify
M +40 -47 debian/control
D +0 -21 debian/libastro-dev.acc.in
D +0 -321 debian/libastro1.symbols
D +0 -21 debian/libmarble-dev.acc.in
M +4 -6 debian/libmarble-dev.install
R +0 -0 debian/libmarblewidget-qt6-29.install [from: debian/libmarblewidget-qt5-28.install - 100% similarity]
M +8 -8 debian/marble-data.install
D +0 -1 debian/marble-data.maintscript
M +5 -5 debian/marble.install
D +0 -30 debian/patches/do_not_install_private_headers
M +1 -2 debian/patches/series
M +9 -48 debian/rules
https://invent.kde.org/neon/kde/marble/-/commit/07ce8431a06909061730ffa41f7bd378093bad59
diff --git a/debian/control b/debian/control
index e262ccd..1305992 100644
--- a/debian/control
+++ b/debian/control
@@ -3,43 +3,41 @@ Section: kde
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Sune Vuorela <sune at debian.org>, Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 3.5~),
+Build-Depends: cmake,
debhelper-compat (= 13),
- extra-cmake-modules (>= 1.7.0~),
gettext,
- libgps-dev (>= 2.90),
- libkf5coreaddons-dev (>= 5.7.0~),
- libkf5crash-dev (>= 5.7.0~),
- libkf5doctools-dev (>= 5.7.0~),
- libkf5i18n-dev (>= 5.7.0~),
- libkf5kio-dev (>= 5.7.0~),
- libkf5newstuff-dev (>= 5.7.0~),
- libkf5parts-dev (>= 5.7.0~),
- libkf5wallet-dev (>= 5.7.0~),
- libphonon4qt5-dev,
- libphonon4qt5experimental-dev,
+ kf6-extra-cmake-modules,
+ kf6-kcoreaddons-dev,
+ kf6-kcrash-dev,
+ kf6-kdoctools-dev,
+ kf6-ki18n-dev,
+ kf6-kio-dev,
+ kf6-knewstuff-dev,
+ kf6-kparts-dev,
+ kf6-krunner-dev,
+ kf6-kwallet-dev,
+ libgps-dev,
+ lib-plasma-dev,
libprotobuf-dev,
- libqt5opengl5-dev,
- libqt5serialport5-dev,
- libqt5svg5-dev (>= 5.7.0~),
- libqt5webkit5-dev (>= 5.4),
libshp-dev,
libwlocate-dev,
- pkg-config,
- pkg-kde-tools (>= 0.12),
+ pkgconf,
+ pkg-kde-tools-neon,
+ qt6-phonon-dev,
protobuf-compiler,
python3-dev,
- qtbase5-dev (>= 5.4),
- qtdeclarative5-dev (>= 5.4),
- qtlocation5-dev,
- qtmultimedia5-dev,
- qtpositioning5-dev,
- qtscript5-dev (>= 5.4),
- qttools5-dev (>= 5.4),
- qtwebengine5-dev,
+ qt6-base-dev,
+ qt6-declarative-dev,
+ qt6-location-dev,
+ qt6-multimedia-dev,
+ qt6-positioning-dev,
+ qt6-serialport-dev,
+ qt6-svg-dev,
+ qt6-tools-dev,
+ qt6-webengine-dev,
shared-mime-info,
zlib1g-dev
-Standards-Version: 4.5.0
+Standards-Version: 4.6.2
Rules-Requires-Root: no
Homepage: https://marble.kde.org/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/marble
@@ -79,11 +77,10 @@ Package: libmarble-dev
Architecture: any
Section: libdevel
Depends: libastro-dev (= ${binary:Version}),
- libmarblewidget-qt5-28 (= ${binary:Version}),
- libqt5svg5-dev (>= 5.7.0~),
- libqt5webkit5-dev (>= 5.4),
- qtdeclarative5-dev (>= 5.7.0~),
- qtwebengine5-dev,
+ libmarblewidget-qt6-29 (= ${binary:Version}),
+ qt6-svg-dev,
+ qt6-declarative-dev,
+ qt6-webengine-dev,
${misc:Depends},
${sameVersionDep:qtbase5-dev:libmarblewidget-qt5-28},
${shlibs:Depends}
@@ -98,7 +95,7 @@ Description: development files for the Marble globe widget library
.
This package is part of the KDE education module.
-Package: libmarblewidget-qt5-28
+Package: libmarblewidget-qt-29
Architecture: any
Section: libs
Multi-Arch: same
@@ -124,8 +121,6 @@ Depends: marble-data (>= ${source:Version}),
${misc:Depends},
${shlibs:Depends}
Suggests: gosmore, monav-routing-daemon, routino
-Replaces: marble-data (<< 4:17.08.1)
-Breaks: marble-data (<< 4:17.08.1)
Description: globe and map widget
Marble is a generic geographical map widget and framework for KDE
applications. The Marble widget shows the earth as a sphere but does not
@@ -139,8 +134,6 @@ Architecture: all
Section: misc
Multi-Arch: foreign
Depends: marble-qt-data (= ${source:Version}), ${misc:Depends}
-Breaks: ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
Description: data files for Marble
Marble is a generic geographical map widget and framework for KDE
applications. The Marble widget shows the earth as a sphere but does not
@@ -157,8 +150,6 @@ Architecture: all
Section: misc
Multi-Arch: foreign
Depends: ${misc:Depends}
-Breaks: marble-data (<< 4:21.04.0-0~), ${kde-l10n:all}
-Replaces: marble-data (<< 4:21.04.0-0~), ${kde-l10n:all}
Description: Qt-only data files for Marble
Marble is a generic geographical map widget and framework for KDE
applications. The Marble widget shows the earth as a sphere but does not
@@ -175,12 +166,8 @@ Architecture: any
Section: misc
Depends: marble-data (>= ${source:Version}),
marble-plugins (= ${binary:Version}),
- qml-module-qtgraphicaleffects,
- qml-module-qtmultimedia,
- qml-module-qtquick-controls,
- qml-module-qtquick-controls2,
- qml-module-qtquick-dialogs,
- qml-module-qtquick-window2,
+ qt6-multimedia,
+ qt6-declarative,
${misc:Depends},
${shlibs:Depends}
Suggests: gosmore, monav-routing-daemon, routino
@@ -223,7 +210,13 @@ Description: globe and map widget (no KDE dependencies)
Package: plasma-marble
Architecture: any
Section: misc
-Depends: ${misc:Depends},
+Depends: marble-data (>= ${source:Version}),
+ marble-plugins (= ${binary:Version}),
+ libplasma6,
+ kf6-krunner,
+ qt6-declarative,
+ ${misc:Depends},
+ ${shlibs:Depends},
Description: Plasma integration for Marble - empty package
Marble is a generic geographical map widget and framework for KDE
applications. The Marble widget shows the earth as a sphere but does not
diff --git a/debian/libastro-dev.acc.in b/debian/libastro-dev.acc.in
deleted file mode 100644
index 711ab1b..0000000
--- a/debian/libastro-dev.acc.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
- 15.07.90
-</version>
-
-<headers>
- /usr/include/astro/
-</headers>
-
-<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libastro.so
-</libs>
-
-<gcc_options>
- -fPIC
- -std=c++11
-</gcc_options>
-
-</descriptor>
diff --git a/debian/libastro1.symbols b/debian/libastro1.symbols
deleted file mode 100644
index 9d68efa..0000000
--- a/debian/libastro1.symbols
+++ /dev/null
@@ -1,321 +0,0 @@
-# SymbolsHelper-Confirmed: 4:17.08.1 amd64
-libastro.so.1 libastro1 #MINVER#
-* Build-Depends-Package: libastro-dev
- _Z11JupCallistodR4Vec3S0_ at Base 4:4.12.80
- _Z11JupGanymededR4Vec3S0_ at Base 4:4.12.80
- _Z11PosCallistod at Base 4:4.12.80
- _Z11PosGanymeded at Base 4:4.12.80
- _Z13PosSEnceladusd at Base 4:15.08.0
- _Z3dddiid at Base 4:4.12.80
- _Z3dmsdRiS_Rd at Base 4:4.12.80
- _Z3epsd at Base 4:4.12.80
- _Z3mjdiiid at Base 4:4.12.80
- _Z5JupIodR4Vec3S0_ at Base 4:4.12.80
- _Z5ellipddddddR4Vec3S0_ at Base 4:4.12.80
- _Z5parabdddddR4Vec3S0_ at Base 4:4.12.80
- _Z6AppPosdddddiRK4Vec3RdS2_S2_ at Base 4:17.08.1
- _Z6EquHordddd4Vec3 at Base 4:4.12.80
- _Z6GeoPosddddd at Base 4:4.12.80
- _Z6GeoPosddddddd at Base 4:4.12.80
- _Z6HorEqudddd4Vec3 at Base 4:4.12.80
- _Z6PoleMxdd at Base 4:4.12.80
- _Z6PosJIod at Base 4:4.12.80
- _Z6atan20dd at Base 4:4.12.80
- _Z6caldatdRiS_S_Rd at Base 4:4.12.80
- _Z6eclequdR4Vec3 at Base 4:4.12.80
- _Z6equecldR4Vec3 at Base 4:4.12.80
- _Z6hyperbdddddR4Vec3S0_ at Base 4:4.12.80
- _Z6keplerdddddddddR4Vec3S0_ at Base 4:4.12.80
- _Z6nutecldRd at Base 4:4.12.80
- _Z6nutmatdRdb at Base 4:4.12.80
- _Z6oscelmddR4Vec3S0_RdS1_S1_S1_S1_S1_S1_ at Base 4:4.12.80
- _Z7DefTdUti at Base 4:4.12.80
- _Z7Refractddd at Base 4:4.12.80
- _Z7SatRheadR4Vec3S0_ at Base 4:4.12.80
- _Z7aberratdR4Vec3 at Base 4:4.12.80
- _Z7eccanomdd at Base 4:4.12.80
- _Z7hypanomdd at Base 4:4.12.80
- _Z7julcentd at Base 4:4.12.80
- _Z7lsidtimddd at Base 4:4.12.80
- _Z7pmatecldd at Base 4:4.12.80
- _Z7pmatequdd at Base 4:4.12.80
- _Z8AppRADecddddddRdS_ at Base 4:4.12.80
- _Z8QuickSund at Base 4:4.12.80
- _Z8SatTitandR4Vec3S0_ at Base 4:4.12.80
- _Z9JupEuropadR4Vec3S0_ at Base 4:4.12.80
- _Z9MarDeimosdR4Vec3S0_ at Base 4:4.12.80
- _Z9MarPhobosdR4Vec3S0_ at Base 4:4.12.80
- _Z9NepTritondR4Vec3S0_ at Base 4:4.12.80
- _Z9PluCharondR4Vec3S0_ at Base 4:4.12.80
- _Z9PosEuropad at Base 4:4.12.80
- _Z9PosSDioned at Base 4:15.08.0
- _Z9PosSMimasd at Base 4:15.08.0
- _ZN11SolarSystem10getConstIoEv at Base 4:15.08.0
- _ZN11SolarSystem10getJupiterERdS0_ at Base 4:4.12.80
- _ZN11SolarSystem10getMercuryERdS0_ at Base 4:4.12.80
- _ZN11SolarSystem10getNeptuneERdS0_ at Base 4:4.12.80
- _ZN11SolarSystem10getPhysSunERdS0_ at Base 4:4.12.80
- _ZN11SolarSystem10getPlanMatEv at Base 4:4.12.80
- _ZN11SolarSystem11MoonDetailsEv at Base 4:4.12.80
- _ZN11SolarSystem11getCallistoERdS0_ at Base 4:15.08.0
- _ZN11SolarSystem11getCometMagEdd at Base 4:4.12.80
- _ZN11SolarSystem11getConstSunEv at Base 4:4.12.80
- _ZN11SolarSystem11getDiamMoonEv at Base 4:4.12.80
- _ZN11SolarSystem11getDistanceEv at Base 4:4.12.80
- _ZN11SolarSystem11getGanymedeERdS0_ at Base 4:15.08.0
- _ZN11SolarSystem11getPhysMarsERdS0_S0_ at Base 4:4.12.80
- _ZN11SolarSystem11getPhysRheaERdS0_S0_ at Base 4:15.08.0
- _ZN11SolarSystem11getPhysUserERdS0_S0_ at Base 4:15.08.0
- _ZN11SolarSystem11includeUserEb at Base 4:15.08.0
- _ZN11SolarSystem11setNutationEb at Base 4:4.12.80
- _ZN11SolarSystem11setTimezoneEd at Base 4:4.12.80
- _ZN11SolarSystem11updateSolarEv at Base 4:4.12.80
- _ZN11SolarSystem12getConstMarsEv at Base 4:4.12.80
- _ZN11SolarSystem12getConstMoonEv at Base 4:4.12.80
- _ZN11SolarSystem12getConstRheaEv at Base 4:15.08.0
- _ZN11SolarSystem12getConstUserEv at Base 4:15.08.0
- _ZN11SolarSystem12getEnceladusERdS0_ at Base 4:15.08.0
- _ZN11SolarSystem12getPhysDioneERdS0_S0_ at Base 4:15.08.0
- _ZN11SolarSystem12getPhysEarthERdS0_S0_ at Base 4:4.12.80
- _ZN11SolarSystem12getPhysMimasERdS0_S0_ at Base 4:15.08.0
- _ZN11SolarSystem12getPhysTitanERdS0_S0_ at Base 4:15.08.0
- _ZN11SolarSystem12getPhysVenusERdS0_S0_ at Base 4:4.12.80
- _ZN11SolarSystem12putConstUserEdddddddddd at Base 4:15.08.0
- _ZN11SolarSystem12putOrbitUserEddddddd at Base 4:15.08.0
- _ZN11SolarSystem13getConstDioneEv at Base 4:15.08.0
- _ZN11SolarSystem13getConstEarthEv at Base 4:4.12.80
- _ZN11SolarSystem13getConstMimasEv at Base 4:15.08.0
- _ZN11SolarSystem13getConstTitanEv at Base 4:15.08.0
- _ZN11SolarSystem13getConstVenusEv at Base 4:4.12.80
- _ZN11SolarSystem13getLunarPhaseERdS0_S0_ at Base 4:4.12.80
- _ZN11SolarSystem13getPhysEuropaERdS0_S0_ at Base 4:15.08.0
- _ZN11SolarSystem13getPhysSaturnERdS0_S0_ at Base 4:4.12.80
- _ZN11SolarSystem13getPhysUranusERdS0_S0_ at Base 4:4.12.80
- _ZN11SolarSystem13setCurrentMJDEiiiiid at Base 4:4.12.80
- _ZN11SolarSystem13setCurrentMJDEv at Base 4:4.12.80
- _ZN11SolarSystem14getAsteroidMagEdd at Base 4:4.12.80
- _ZN11SolarSystem14getConstEuropaEv at Base 4:15.08.0
- _ZN11SolarSystem14getConstSaturnEv at Base 4:4.12.80
- _ZN11SolarSystem14getConstUranusEv at Base 4:4.12.80
- _ZN11SolarSystem14getDatefromMJDEdRiS0_S0_S0_S0_Rd at Base 4:15.08.0
- _ZN11SolarSystem14getPhysJupiterERdS0_S0_ at Base 4:4.12.80
- _ZN11SolarSystem14getPhysMercuryERdS0_S0_ at Base 4:4.12.80
- _ZN11SolarSystem14getPhysNeptuneERdS0_S0_ at Base 4:4.12.80
- _ZN11SolarSystem14setAutoTAI_UTCEv at Base 4:4.12.80
- _ZN11SolarSystem14setCentralBodyEPc at Base 4:15.08.0
- _ZN11SolarSystem15getConstJupiterEv at Base 4:4.12.80
- _ZN11SolarSystem15getConstMercuryEv at Base 4:4.12.80
- _ZN11SolarSystem15getConstNeptuneEv at Base 4:4.12.80
- _ZN11SolarSystem15getPhysCallistoERdS0_S0_ at Base 4:15.08.0
- _ZN11SolarSystem15getPhysGanymedeERdS0_S0_ at Base 4:15.08.0
- _ZN11SolarSystem15getSkyRotAnglesERdS0_S0_ at Base 4:15.08.0
- _ZN11SolarSystem15putEllipticUserEdddddddd at Base 4:15.08.0
- _ZN11SolarSystem15setDeltaTAI_UTCEd at Base 4:4.12.80
- _ZN11SolarSystem16getConstCallistoEv at Base 4:15.08.0
- _ZN11SolarSystem16getConstGanymedeEv at Base 4:15.08.0
- _ZN11SolarSystem16getOrbitPositionERdS0_ at Base 4:4.12.80
- _ZN11SolarSystem16getPhysEnceladusERdS0_S0_ at Base 4:15.08.0
- _ZN11SolarSystem16getSelenographicEv at Base 4:15.08.0
- _ZN11SolarSystem16putOrbitElementsEddddddd at Base 4:4.12.80
- _ZN11SolarSystem17getConstEnceladusEv at Base 4:15.08.0
- _ZN11SolarSystem17getLunarLibrationERdS0_S0_ at Base 4:4.12.80
- _ZN11SolarSystem17getPlanetocentricEdd at Base 4:4.12.80
- _ZN11SolarSystem17getPlanetographicEddRdS0_ at Base 4:4.12.80
- _ZN11SolarSystem19putEllipticElementsEdddddddd at Base 4:4.12.80
- _ZN11SolarSystem5MnPosERdS0_ at Base 4:15.08.0
- _ZN11SolarSystem5SnPosERdS0_ at Base 4:15.08.0
- _ZN11SolarSystem5getIoERdS0_ at Base 4:15.08.0
- _ZN11SolarSystem6atan23Edd at Base 4:4.12.80
- _ZN11SolarSystem6getMJDEiiiiid at Base 4:15.08.0
- _ZN11SolarSystem6getSunERdS0_ at Base 4:4.12.80
- _ZN11SolarSystem6ssinitEv at Base 4:4.12.80
- _ZN11SolarSystem7DefTimeEv at Base 4:4.12.80
- _ZN11SolarSystem7DegFDmsEd at Base 4:4.12.80
- _ZN11SolarSystem7DmsDegFEd at Base 4:4.12.80
- _ZN11SolarSystem7PosUserEd at Base 4:15.08.0
- _ZN11SolarSystem7getMarsERdS0_ at Base 4:4.12.80
- _ZN11SolarSystem7getMoonERdS0_ at Base 4:4.12.80
- _ZN11SolarSystem7getRheaERdS0_ at Base 4:15.08.0
- _ZN11SolarSystem7getUserERdS0_ at Base 4:15.08.0
- _ZN11SolarSystem8MoonLibrEd4Vec3S0_RdS1_S1_ at Base 4:4.12.80
- _ZN11SolarSystem8getDioneERdS0_ at Base 4:15.08.0
- _ZN11SolarSystem8getEarthERdS0_ at Base 4:4.12.80
- _ZN11SolarSystem8getMimasERdS0_ at Base 4:15.08.0
- _ZN11SolarSystem8getRaDecERK4Vec3RdS3_ at Base 4:17.08.1
- _ZN11SolarSystem8getTitanERdS0_ at Base 4:15.08.0
- _ZN11SolarSystem8getVenusERdS0_ at Base 4:4.12.80
- _ZN11SolarSystem8setEpochEd at Base 4:4.12.80
- _ZN11SolarSystem9getEuropaERdS0_ at Base 4:15.08.0
- _ZN11SolarSystem9getPhysIoERdS0_S0_ at Base 4:15.08.0
- _ZN11SolarSystem9getSaturnERdS0_ at Base 4:4.12.80
- _ZN11SolarSystem9getUranusERdS0_ at Base 4:4.12.80
- _ZN11SolarSystemC1Ev at Base 4:4.12.80
- _ZN11SolarSystemC2Ev at Base 4:4.12.80
- _ZN11SolarSystemD1Ev at Base 4:4.12.80
- _ZN11SolarSystemD2Ev at Base 4:4.12.80
- _ZN13PlanetarySats10currentPosEv at Base 4:4.12.80
- _ZN13PlanetarySats10getMercuryEv at Base 4:4.12.80
- _ZN13PlanetarySats10setDeltaRTEd at Base 4:4.12.80
- _ZN13PlanetarySats10setSatFileEPc at Base 4:4.12.80
- _ZN13PlanetarySats12setStepWidthEd at Base 4:4.12.80
- _ZN13PlanetarySats13getFixedFrameERdS0_S0_S0_S0_S0_ at Base 4:4.12.80
- _ZN13PlanetarySats13stateToKeplerEv at Base 4:4.12.80
- _ZN13PlanetarySats14getDatefromMJDEdRiS0_S0_S0_S0_Rd at Base 4:4.12.80
- _ZN13PlanetarySats14getStateVectorEi at Base 4:4.12.80
- _ZN13PlanetarySats14setAutoTAI_UTCEv at Base 4:4.12.80
- _ZN13PlanetarySats14setStateVectorEddddddd at Base 4:4.12.80
- _ZN13PlanetarySats15setDeltaTAI_UTCEd at Base 4:4.12.80
- _ZN13PlanetarySats16getSelenographicEd at Base 4:4.12.80
- _ZN13PlanetarySats17getKeplerElementsERdS0_S0_S0_S0_S0_S0_S0_S0_ at Base 4:4.12.80
- _ZN13PlanetarySats6atan23Edd at Base 4:4.12.80
- _ZN13PlanetarySats6setMJDEiiiiid at Base 4:4.12.80
- _ZN13PlanetarySats7getMarsEv at Base 4:4.12.80
- _ZN13PlanetarySats7getMoonEv at Base 4:4.12.80
- _ZN13PlanetarySats7getTimeEv at Base 4:4.12.80
- _ZN13PlanetarySats8getVenusEv at Base 4:4.12.80
- _ZN13PlanetarySats8nextStepEv at Base 4:4.12.80
- _ZN13PlanetarySats9getSatPosEd at Base 4:4.12.80
- _ZN13PlanetarySats9plsatinitEv at Base 4:4.12.80
- _ZN13PlanetarySats9selectSatEPc at Base 4:4.12.80
- _ZN13PlanetarySats9setPlanetEPc at Base 4:4.12.80
- _ZN13PlanetarySatsC1Ev at Base 4:4.12.80
- _ZN13PlanetarySatsC2Ev at Base 4:4.12.80
- _ZN13PlanetarySatsD1Ev at Base 4:4.12.80
- _ZN13PlanetarySatsD2Ev at Base 4:4.12.80
- _ZN4Mat36GetMijEii at Base 4:15.08.0
- _ZN4Mat36PutMijEdii at Base 4:4.12.80
- _ZN4Mat36assignEPA3_d at Base 4:4.12.80
- _ZN4Mat36assignEddddddddd at Base 4:4.12.80
- _ZN4Mat3C1ERKS_ at Base 4:4.12.80
- _ZN4Mat3C1Ed at Base 4:4.12.80
- _ZN4Mat3C2ERKS_ at Base 4:4.12.80
- _ZN4Mat3C2Ed at Base 4:4.12.80
- _ZN4Mat3aSERKS_ at Base 4:4.12.80
- _ZN4Mat3dVEd at Base 4:4.12.80
- _ZN4Mat3mIERKS_ at Base 4:4.12.80
- _ZN4Mat3mLERKS_ at Base 4:4.12.80
- _ZN4Mat3mLEd at Base 4:4.12.80
- _ZN4Mat3pLERKS_ at Base 4:4.12.80
- _ZN4Vec36assignEddd at Base 4:4.12.80
- _ZN4Vec3C1ERKS_ at Base 4:4.12.80
- _ZN4Vec3C1Eddd at Base 4:4.12.80
- _ZN4Vec3C2ERKS_ at Base 4:4.12.80
- _ZN4Vec3C2Eddd at Base 4:4.12.80
- _ZN4Vec3aSERKS_ at Base 4:4.12.80
- _ZN4Vec3dVEd at Base 4:4.12.80
- _ZN4Vec3ixEj at Base 4:4.12.80
- _ZN4Vec3mIERKS_ at Base 4:4.12.80
- _ZN4Vec3mLERKS_ at Base 4:4.12.80
- _ZN4Vec3mLEd at Base 4:4.12.80
- _ZN4Vec3pLERKS_ at Base 4:4.12.80
- _ZN6Sun2004termEiiidddddd at Base 4:4.12.80
- _ZN6Sun2005stateEdR4Vec3S1_ at Base 4:4.12.80
- _ZN6Sun2006addtheEddddRdS0_ at Base 4:4.12.80
- _ZN6Sun2007pertjupEv at Base 4:4.12.80
- _ZN6Sun2007pertmarEv at Base 4:4.12.80
- _ZN6Sun2007pertmooEv at Base 4:4.12.80
- _ZN6Sun2007pertsatEv at Base 4:4.12.80
- _ZN6Sun2007pertvenEv at Base 4:4.12.80
- _ZN6Sun2008positionEd at Base 4:4.12.80
- _ZN6Sun200C1Ev at Base 4:4.12.80
- _ZN6Sun200C2Ev at Base 4:4.12.80
- _ZN7Eclipse12equ_sun_moonEdd at Base 4:4.12.80
- _ZN7Eclipse5lunarEdd at Base 4:4.12.80
- _ZN7Eclipse5solarEddRdS0_ at Base 4:4.12.80
- _ZN7Eclipse5umbraEddR4Vec3S1_RdS2_ at Base 4:4.12.80
- _ZN7Eclipse6GetEp2Ev at Base 4:15.08.0
- _ZN7Eclipse6maxposEddRdS0_ at Base 4:4.12.80
- _ZN7Eclipse6penumdEddR4Vec3S1_RdS2_ at Base 4:4.12.80
- _ZN7Eclipse7GetRSunEv at Base 4:15.08.0
- _ZN7Eclipse8GetRMoonEv at Base 4:15.08.0
- _ZN7Eclipse8durationEddRd at Base 4:4.12.80
- _ZN7EclipseC1Ev at Base 4:4.12.80
- _ZN7EclipseC2Ev at Base 4:4.12.80
- _ZN7Moon20013long_periodicEd at Base 4:4.12.80
- _ZN7Moon2004addnEdiiiiRdS0_S0_ at Base 4:15.08.0
- _ZN7Moon2004termEiiiiRdS0_ at Base 4:15.08.0
- _ZN7Moon2005minitEd at Base 4:4.12.80
- _ZN7Moon2005sinusEd at Base 4:4.12.80
- _ZN7Moon2006addsolEddddiiii at Base 4:4.12.80
- _ZN7Moon2006addtheEddddRdS0_ at Base 4:4.12.80
- _ZN7Moon2006solar1Ev at Base 4:4.12.80
- _ZN7Moon2006solar2Ev at Base 4:4.12.80
- _ZN7Moon2006solar3Ev at Base 4:4.12.80
- _ZN7Moon2006solarnERd at Base 4:15.08.0
- _ZN7Moon2008positionEd at Base 4:4.12.80
- _ZN7Moon2009planetaryEd at Base 4:4.12.80
- _ZN7Moon200C1Ev at Base 4:4.12.80
- _ZN7Moon200C2Ev at Base 4:4.12.80
- _ZN7Plan2004MarsEd at Base 4:4.12.80
- _ZN7Plan2004termEiiidddddd at Base 4:4.12.80
- _ZN7Plan2005PlutoEd at Base 4:4.12.80
- _ZN7Plan2005VenusEd at Base 4:4.12.80
- _ZN7Plan2005stateER4Vec3S1_ at Base 4:15.08.0
- _ZN7Plan2006SaturnEd at Base 4:4.12.80
- _ZN7Plan2006UranusEd at Base 4:4.12.80
- _ZN7Plan2006addtheEddddRdS0_ at Base 4:4.12.80
- _ZN7Plan2006posvelEv at Base 4:4.12.80
- _ZN7Plan2007JupiterEd at Base 4:4.12.80
- _ZN7Plan2007MercuryEd at Base 4:4.12.80
- _ZN7Plan2007NeptuneEd at Base 4:4.12.80
- _ZN7Plan2008velocityEv at Base 4:15.08.0
- _ZN7Plan200C1Ev at Base 4:4.12.80
- _ZN7Plan200C2Ev at Base 4:4.12.80
- _ZN8EclSolar10calcMaxPosERdS0_ at Base 4:4.12.80
- _ZN8EclSolar10getPartialERdS0_ at Base 4:4.12.80
- _ZN8EclSolar10localStartEiPdS0_PiiPc at Base 4:4.12.80
- _ZN8EclSolar10sunObscureEddd at Base 4:4.12.80
- _ZN8EclSolar11getLocalMaxERdS0_S0_ at Base 4:4.12.80
- _ZN8EclSolar11getPenumbraERdS0_ at Base 4:4.12.80
- _ZN8EclSolar11previousEclEv at Base 4:4.12.80
- _ZN8EclSolar11setLocalPosEddd at Base 4:4.12.80
- _ZN8EclSolar11setLunarEclEb at Base 4:4.12.80
- _ZN8EclSolar11setTimezoneEd at Base 4:4.12.80
- _ZN8EclSolar12centralBoundEbRdS0_S0_S0_ at Base 4:4.12.80
- _ZN8EclSolar12putEclSelectEi at Base 4:4.12.80
- _ZN8EclSolar12setStepWidthEd at Base 4:4.12.80
- _ZN8EclSolar13eclPltCentralEbRdS0_ at Base 4:4.12.80
- _ZN8EclSolar13getLocalTotalERdS0_ at Base 4:4.12.80
- _ZN8EclSolar13getShadowConeEdbiPdS0_ at Base 4:4.12.80
- _ZN8EclSolar13setCurrentMJDEiiiiid at Base 4:4.12.80
- _ZN8EclSolar14getEclYearInfoEPc at Base 4:4.12.80
- _ZN8EclSolar14getEclYearInfoEiRiS0_S0_S0_S0_RdS1_S1_ at Base 4:4.12.80
- _ZN8EclSolar14setAutoTAI_UTCEv at Base 4:4.12.80
- _ZN8EclSolar15getLocalDetailsEPc at Base 4:4.12.80
- _ZN8EclSolar15setDeltaTAI_UTCEd at Base 4:4.12.80
- _ZN8EclSolar16getNumberEclYearEv at Base 4:4.12.80
- _ZN8EclSolar16setPenumbraAngleEdi at Base 4:4.12.80
- _ZN8EclSolar18getLocalVisibilityERdS0_ at Base 4:4.12.80
- _ZN8EclSolar5iscrsEdddRdS0_S0_S0_ at Base 4:4.12.80
- _ZN8EclSolar5phmjdEdddRiRdS1_ at Base 4:4.12.80
- _ZN8EclSolar6atan23Edd at Base 4:4.12.80
- _ZN8EclSolar6dtmstrEdPc at Base 4:4.12.80
- _ZN8EclSolar6esinitEv at Base 4:4.12.80
- _ZN8EclSolar6moonphEv at Base 4:4.12.80
- _ZN8EclSolar7DefTimeEv at Base 4:4.12.80
- _ZN8EclSolar7DegFDmsEd at Base 4:4.12.80
- _ZN8EclSolar7ckphaseEddddRiPdd at Base 4:4.12.80
- _ZN8EclSolar7nextEclEv at Base 4:4.12.80
- _ZN8EclSolar7putYearEi at Base 4:4.12.80
- _ZN8EclSolar8GNSBoundEbbRdS0_ at Base 4:4.12.80
- _ZN8EclSolar8GRSBoundEbRdS0_S0_S0_ at Base 4:4.12.80
- _ZN8EclSolar8GetMonthEiPc at Base 4:4.12.80
- _ZN8EclSolar8eclStartEv at Base 4:4.12.80
- _ZN8EclSolar8getTotalERdS0_ at Base 4:4.12.80
- _ZN8EclSolar9InRSBoundEv at Base 4:4.12.80
- _ZN8EclSolar9InitBoundEv at Base 4:4.12.80
- _ZN8EclSolar9getEclTxtEiPc at Base 4:4.12.80
- _ZN8EclSolar9getMaxPosERdS0_ at Base 4:4.12.80
- _ZN8EclSolar9getlocmagEdddddRK4Vec3S2_Ri at Base 4:17.08.1
- _ZN8EclSolar9navCourseEdddd at Base 4:4.12.80
- _ZN8EclSolar9navNewPosEddddRdS0_ at Base 4:4.12.80
- _ZN8EclSolarC1Ev at Base 4:4.12.80
- _ZN8EclSolarC2Ev at Base 4:4.12.80
- _ZN8EclSolarD1Ev at Base 4:4.12.80
- _ZN8EclSolarD2Ev at Base 4:4.12.80
- _ZNK13PlanetarySats10getLastMJDEv at Base 4:4.12.80
- _ZNK13PlanetarySats10getSatNameEPc at Base 4:4.12.80
- _ZNK13PlanetarySats17getPlanetographicERdS0_S0_ at Base 4:4.12.80
- _ZNK8EclSolar10getLastMJDEv at Base 4:4.12.80
- _ZNK8EclSolar14getDatefromMJDEdRiS0_S0_S0_S0_Rd at Base 4:4.12.80
- _ZNK8EclSolar7getYearEv at Base 4:4.12.80
diff --git a/debian/libmarble-dev.acc.in b/debian/libmarble-dev.acc.in
deleted file mode 100644
index fe98677..0000000
--- a/debian/libmarble-dev.acc.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
- 15.07.90
-</version>
-
-<headers>
- /usr/include/marble/
-</headers>
-
-<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libmarblewidget-qt5.so
-</libs>
-
-<gcc_options>
- -fPIC
- -std=c++11
-</gcc_options>
-
-</descriptor>
diff --git a/debian/libmarble-dev.install b/debian/libmarble-dev.install
index 99a95af..1ffda13 100644
--- a/debian/libmarble-dev.install
+++ b/debian/libmarble-dev.install
@@ -1,8 +1,6 @@
usr/include/marble/
usr/lib/*/cmake/Marble/
-usr/lib/*/libmarblewidget-qt5.so
-usr/lib/*/qt5/mkspecs/modules/qt_Marble.pri
-usr/lib/*/qt5/plugins/designer/LatLonEditPlugin.so
-usr/lib/*/qt5/plugins/designer/MarbleNavigatorPlugin.so
-usr/lib/*/qt5/plugins/designer/MarbleWidgetPlugin.so
-usr/share/apps/marble/examples/
\ No newline at end of file
+usr/lib/*/libmarblewidget-qt6.so
+usr/lib/*/qt6/mkspecs/
+usr/lib/*/qt6/plugins/
+usr/share/apps/marble/examples/
diff --git a/debian/libmarblewidget-qt5-28.install b/debian/libmarblewidget-qt6-29.install
similarity index 100%
rename from debian/libmarblewidget-qt5-28.install
rename to debian/libmarblewidget-qt6-29.install
diff --git a/debian/marble-data.install b/debian/marble-data.install
index 6d15aab..1b0e2e8 100644
--- a/debian/marble-data.install
+++ b/debian/marble-data.install
@@ -1,12 +1,12 @@
usr/share/applications/marble_geojson.desktop
usr/share/config.kcfg/marble.kcfg
usr/share/doc/HTML/*/marble/
-usr/share/kservices5/marble_thumbnail_geojson.desktop
-usr/share/kservices5/marble_thumbnail_gpx.desktop
-usr/share/kservices5/marble_thumbnail_kml.desktop
-usr/share/kservices5/marble_thumbnail_osm.desktop
-usr/share/kservices5/marble_thumbnail_shp.desktop
-usr/share/kxmlgui5/marble/marble_part.rc
-usr/share/kxmlgui5/marble/marbleui.rc
-usr/share/locale/*/LC_MESSAGES/*mo
+usr/share/kservices6/marble_thumbnail_geojson.desktop
+usr/share/kservices6/marble_thumbnail_gpx.desktop
+usr/share/kservices6/marble_thumbnail_kml.desktop
+usr/share/kservices6/marble_thumbnail_osm.desktop
+usr/share/kservices6/marble_thumbnail_shp.desktop
+usr/share/kxmlgui6/marble/marble_part.rc
+usr/share/kxmlgui6/marble/marbleui.rc
+usr/share/locale/*/LC_MESSAGES/
usr/share/mime/packages/geo.xml
diff --git a/debian/marble-data.maintscript b/debian/marble-data.maintscript
deleted file mode 100644
index 9ccc37e..0000000
--- a/debian/marble-data.maintscript
+++ /dev/null
@@ -1 +0,0 @@
-rm_conffile /etc/xdg/marble.knsrc 4:17.08.3-3~
diff --git a/debian/marble.install b/debian/marble.install
index 66305d6..ad2897e 100644
--- a/debian/marble.install
+++ b/debian/marble.install
@@ -1,6 +1,6 @@
usr/bin/marble
-usr/lib/*/qt5/plugins/libmarble_part.so
-usr/lib/*/qt5/plugins/marblethumbnail.so
+usr/lib/*/qt6/plugins/libmarble_part.so
+usr/lib/*/qt6/plugins/marblethumbnail.so
usr/share/*/org.kde.marble.appdata.xml
usr/share/applications/marble_geo.desktop
usr/share/applications/marble_gpx.desktop
@@ -9,6 +9,6 @@ usr/share/applications/marble_kmz.desktop
usr/share/applications/marble_shp.desktop
usr/share/applications/marble_worldwind.desktop
usr/share/applications/org.kde.marble.desktop
-usr/share/kservices5/marble_part.desktop
-usr/share/kservices5/marble_thumbnail_kmz.desktop
-usr/share/qlogging-categories5/marble.categories
+usr/share/kservices6/marble_part.desktop
+usr/share/kservices6/marble_thumbnail_kmz.desktop
+usr/share/qlogging-categories6/marble.categories
diff --git a/debian/patches/do_not_install_private_headers b/debian/patches/do_not_install_private_headers
deleted file mode 100644
index 8191cd3..0000000
--- a/debian/patches/do_not_install_private_headers
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
-Date: Thu, 14 Apr 2016 05:52:13 +0200
-Subject: do_not_install_private_headers
-
-===================================================================
----
- src/lib/marble/CMakeLists.txt | 3 ---
- 1 file changed, 3 deletions(-)
-
---- a/src/lib/marble/CMakeLists.txt
-+++ b/src/lib/marble/CMakeLists.txt
-@@ -508,7 +508,6 @@
- MarbleInputHandler.h
- MarbleWidgetInputHandler.h
- MarbleWidgetPopupMenu.h
-- TileId.h
- TileCoordsPyramid.h
- TileLevelRangeWidget.h
- QtMarbleConfigDialog.h
-@@ -592,10 +591,8 @@
- ParsingRunner.h
- SearchRunner.h
- ReverseGeocodingRunner.h
-- RoutingRunner.h
- SearchRunnerPlugin.h
- ReverseGeocodingRunnerPlugin.h
-- RoutingRunnerPlugin.h
- ParseRunnerPlugin.h
- LayerInterface.h
- RenderState.h
diff --git a/debian/patches/series b/debian/patches/series
index 16aa8eb..765afe1 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
-do_not_install_private_headers
-allow-svg-bookmark-icons.patch
+#allow-svg-bookmark-icons.patch
diff --git a/debian/rules b/debian/rules
index 031af2f..bd28828 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,53 +1,14 @@
#!/usr/bin/make -f
-
-l10npkgs_firstversion_ok := 4:16.04.3-7~
-include /usr/share/pkg-kde-tools/qt-kde-team/2/l10n-packages.mk
-libpkgs_gen_strict_local_shlibs = $(libpkgs_all_packages)
-include /usr/share/pkg-kde-tools/qt-kde-team/3/library-packages.mk
-include /usr/share/dpkg/architecture.mk
-include /usr/share/dpkg/vendor.mk
-
-ifeq ($(shell $(call dpkg_vendor_derives_from,ubuntu)),yes)
- ifeq ($(DEB_HOST_ARCH),armel)
- conf_args += -DWITH_OpenGL=OFF
- endif
-endif
-
-ifeq ($(DEB_BUILD_GNU_TYPE),$(DEB_HOST_GNU_TYPE))
- QMAKE = qmake
-else
- QMAKE = $(DEB_HOST_GNU_TYPE)-qmake
-endif
+# -*- makefile -*-
%:
- dh $@ --with kf5,pkgkde_symbolshelper
+ dh $@ --with kf6 --buildsystem kf6
override_dh_auto_configure:
- dh_auto_configure -Skf5 -- -DWITH_DESIGNER_PLUGIN=ON \
- -DWITH_KF5=TRUE \
- -DMARBLE_INSTALL_ANDROID_APPS=ON \
- -DQT_PLUGINS_DIR="$(shell $(QMAKE) -qt=5 -query QT_INSTALL_PLUGINS)" \
- -DBUILD_MARBLE_TESTS=NO \
- -DBUILD_MARBLE_TOOLS=YES \
- -DBUILD_MARBLE_EXAMPLES=YES \
- $(conf_args)
-
-override_dh_auto_install:
- dh_auto_install
- # remove extra license files
- rm -f debian/tmp/usr/share/marble/data/LICENSE.txt
- rm -rf debian/tmp/usr/share/marble/data/licenses/
-
-override_dh_auto_test:
- # Disable the auto tests at build time
- :
-
-override_dh_clean:
- dh_clean -Xdata/mwdbii/PISLAND.PNT.orig -Xdata/mwdbii/PLAKE.PNT.orig
-
-override_dh_gencontrol-indep: l10npkgs_firstversion_ok
- dh_gencontrol -i
-
-override_dh_gencontrol-arch: libpkgs_gen_strict_local_shlibs
- dh_sameversiondep -a
- dh_gencontrol -a
+ dh_auto_configure -- \
+ -DWITH_DESIGNER_PLUGIN=ON \
+ -DWITH_KF6=TRUE \
+ -DMARBLE_INSTALL_ANDROID_APPS=ON \
+ -DBUILD_MARBLE_TESTS=NO \
+ -DBUILD_MARBLE_TOOLS=YES \
+ -DBUILD_MARBLE_EXAMPLES=YES
More information about the Neon-commits
mailing list