[neon/kde/libkomparediff2/Neon/unstable_jammy] debian: kf6ify
Carlos De Maine
null at kde.org
Tue Jul 30 23:29:27 BST 2024
Git commit 594b653271ec43e5576aa567d680b8353ea8d6a9 by Carlos De Maine.
Committed on 30/07/2024 at 22:29.
Pushed by carlosdem into branch 'Neon/unstable_jammy'.
kf6ify
(cherry picked from commit 0fff66b9eaa22d2bf7c38765ddd0391ef7a9f7f5)
Co-authored-by: Carlos De Maine <carlosdemaine at gmail.com>
D +0 -1 debian/compat
M +22 -22 debian/control
D +0 -21 debian/libkomparediff2-5.acc.in
D +0 -3 debian/libkomparediff2-5.install
D +0 -189 debian/libkomparediff2-5.symbols
A +3 -0 debian/libkomparediff2-6.install
M +1 -1 debian/libkomparediff2-dev.install
https://invent.kde.org/neon/kde/libkomparediff2/-/commit/594b653271ec43e5576aa567d680b8353ea8d6a9
diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index b4de394..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-11
diff --git a/debian/control b/debian/control
index 70ded29..8c97144 100644
--- a/debian/control
+++ b/debian/control
@@ -3,28 +3,28 @@ Section: kde
Priority: optional
Maintainer: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
Uploaders: Maximiliano Curia <maxy at debian.org>
-Build-Depends: cmake (>= 2.8.12~),
- debhelper (>= 11~),
- extra-cmake-modules (>= 5.16.0~),
- libkf5codecs-dev (>= 5.28.0~),
- libkf5config-dev (>= 5.28.0~),
- libkf5coreaddons-dev (>= 5.28.0~),
- libkf5i18n-dev (>= 5.28.0~),
- libkf5kio-dev (>= 5.28.0~),
- libkf5xmlgui-dev (>= 5.28.0~),
- pkg-kde-tools (>= 0.12)
-Standards-Version: 4.2.1
+Build-Depends: cmake,
+ debhelper-compat,
+ kf6-extra-cmake-modules,
+ kf6-kcodecs-dev,
+ kf6-kconfig-dev,
+ kf6-kcoreaddons-dev,
+ kf6-ki18n-dev,
+ kf6-5kio-dev,
+ kf6-kxmlgui-dev,
+ pkg-kde-tools-neon,
+Standards-Version: 4.6.2
Homepage: http://www.kde.org/
Vcs-Browser: https://salsa.debian.org/qt-kde-team/kde/libkomparediff2
Vcs-Git: https://salsa.debian.org/qt-kde-team/kde/libkomparediff2.git
-Package: libkomparediff2-5
+Package: libkomparediff2-6
Section: libs
Architecture: any
Multi-Arch: same
Depends: ${misc:Depends}, ${shlibs:Depends}
-Breaks: kompare (<< 4:16.08), kpart5-kompare (<< 4:16.08), ${kde-l10n:all}
-Replaces: ${kde-l10n:all}
+Breaks: libkomparediff-5
+Replaces: libkomparediff-5
Description: library to compare files and strings
This package contains a library used to compare files and strings, and is
used in Kompare and KDevelop.
@@ -34,14 +34,14 @@ Description: library to compare files and strings
Package: libkomparediff2-dev
Section: libdevel
Architecture: any
-Depends: libkf5codecs-dev,
- libkf5config-dev,
- libkf5coreaddons-dev,
- libkf5i18n-dev,
- libkf5kio-dev,
- libkf5xmlgui-dev,
- libkomparediff2-5 (= ${binary:Version}),
- qtbase5-dev (>= 5.4.0~),
+Depends: kf6-kcodecs-dev,
+ kf6-kconfig-dev,
+ kf6-kcoreaddons-dev,
+ kf6-ki18n-dev,
+ kf6-kio-dev,
+ kf6-kxmlgui-dev,
+ libkomparediff2-6 (= ${binary:Version}),
+ qt6-base-dev,
${misc:Depends}
Description: library to compare files and strings - development files
This package contains a library used to compare files and strings, and is
diff --git a/debian/libkomparediff2-5.acc.in b/debian/libkomparediff2-5.acc.in
deleted file mode 100644
index c0ae0cd..0000000
--- a/debian/libkomparediff2-5.acc.in
+++ /dev/null
@@ -1,21 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
- 14.12.50
-</version>
-
-<headers>
- /usr/include/libkomparediff2
-</headers>
-
-<libs>
- /usr/lib/@@DEB_HOST_MULTIARCH@@/libkomparediff2.so
-</libs>
-
-<gcc_options>
- -fPIC
- -std=c++11
-</gcc_options>
-
-</descriptor>
diff --git a/debian/libkomparediff2-5.install b/debian/libkomparediff2-5.install
deleted file mode 100644
index 3a4355a..0000000
--- a/debian/libkomparediff2-5.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib/*/libkomparediff2.so.5
-usr/lib/*/libkomparediff2.so.5.*
-usr/share/locale/
diff --git a/debian/libkomparediff2-5.symbols b/debian/libkomparediff2-5.symbols
deleted file mode 100644
index c7ea08a..0000000
--- a/debian/libkomparediff2-5.symbols
+++ /dev/null
@@ -1,189 +0,0 @@
-# SymbolsHelper-Confirmed: 4:18.08.1 amd64
-libkomparediff2.so.5 libkomparediff2-5 #MINVER#
- _ZN12DiffSettings11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:14.12.50
- _ZN12DiffSettings11qt_metacastEPKc at Base 4:14.12.50
- _ZN12DiffSettings12loadSettingsEP7KConfig at Base 4:14.12.50
- _ZN12DiffSettings12saveSettingsEP7KConfig at Base 4:14.12.50
- _ZN12DiffSettings16staticMetaObjectE at Base 4:14.12.50
- _ZN12DiffSettingsC1EP7QWidget at Base 4:14.12.50
- _ZN12DiffSettingsC2EP7QWidget at Base 4:14.12.50
- _ZN12DiffSettingsD0Ev at Base 4:14.12.50
- _ZN12DiffSettingsD1Ev at Base 4:14.12.50
- _ZN12DiffSettingsD2Ev at Base 4:14.12.50
- (optional=templinst)_ZN12KConfigGroup10writeEntryIbEEvPKcRKT_6QFlagsIN11KConfigBase15WriteConfigFlagEE at Base 4:14.12.50
- _ZN12SettingsBase11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:14.12.50
- _ZN12SettingsBase11qt_metacastEPKc at Base 4:14.12.50
- _ZN12SettingsBase12loadSettingsEP7KConfig at Base 4:14.12.50
- _ZN12SettingsBase12saveSettingsEP7KConfig at Base 4:14.12.50
- _ZN12SettingsBase16staticMetaObjectE at Base 4:14.12.50
- _ZN12SettingsBaseC1EP7QWidget at Base 4:14.12.50
- _ZN12SettingsBaseC2EP7QWidget at Base 4:14.12.50
- _ZN12SettingsBaseD0Ev at Base 4:14.12.50
- _ZN12SettingsBaseD1Ev at Base 4:14.12.50
- _ZN12SettingsBaseD2Ev at Base 4:14.12.50
- _ZN5Diff210Difference11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:14.12.50
- _ZN5Diff210Difference11qt_metacastEPKc at Base 4:14.12.50
- _ZN5Diff210Difference12applyQuietlyEb at Base 4:14.12.50
- _ZN5Diff210Difference13addSourceLineE7QString at Base 4:14.12.50
- _ZN5Diff210Difference16staticMetaObjectE at Base 4:14.12.50
- _ZN5Diff210Difference17differenceAppliedEPS0_ at Base 4:14.12.50
- _ZN5Diff210Difference18addDestinationLineE7QString at Base 4:14.12.50
- _ZN5Diff210Difference26determineInlineDifferencesEv at Base 4:14.12.50
- _ZN5Diff210Difference5applyEb at Base 4:14.12.50
- _ZN5Diff210DifferenceC1Eiii at Base 4:14.12.50
- _ZN5Diff210DifferenceC2Eiii at Base 4:14.12.50
- _ZN5Diff210DifferenceD0Ev at Base 4:14.12.50
- _ZN5Diff210DifferenceD1Ev at Base 4:14.12.50
- _ZN5Diff210DifferenceD2Ev at Base 4:14.12.50
- _ZN5Diff213DiffModelList4sortEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList10diffStringERK7QString at Base 4:14.12.50
- _ZN5Diff216KompareModelList10firstModelEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:14.12.50
- _ZN5Diff216KompareModelList11qt_metacastEPKc at Base 4:14.12.50
- _ZN5Diff216KompareModelList11setEncodingERK7QString at Base 4:14.12.50
- _ZN5Diff216KompareModelList12setReadWriteEb at Base 4:18.08.1
- _ZN5Diff216KompareModelList12setSelectionEPKNS_10DifferenceE at Base 4:14.12.50
- _ZN5Diff216KompareModelList12setSelectionEPKNS_9DiffModelEPKNS_10DifferenceE at Base 4:14.12.50
- _ZN5Diff216KompareModelList13modelsChangedEPKNS_13DiffModelListE at Base 4:14.12.50
- _ZN5Diff216KompareModelList13slotNextModelEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList13updateActionsEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList14openDirAndDiffEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList15applyDifferenceEPKNS_10DifferenceEb at Base 4:14.12.50
- _ZN5Diff216KompareModelList15applyDifferenceEb at Base 4:14.12.50
- _ZN5Diff216KompareModelList15openFileAndDiffEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList15parseDiffOutputERK7QString at Base 4:14.12.50
- _ZN5Diff216KompareModelList15saveDestinationEPNS_9DiffModelE at Base 4:14.12.50
- _ZN5Diff216KompareModelList15slotFileChangedERK7QString at Base 4:14.12.50
- _ZN5Diff216KompareModelList15slotKompareInfoEPN7Kompare4InfoE at Base 4:14.12.50
- _ZN5Diff216KompareModelList16parseAndOpenDiffERK7QString at Base 4:14.12.50
- _ZN5Diff216KompareModelList16setSelectedModelEPNS_9DiffModelE at Base 4:14.12.50
- _ZN5Diff216KompareModelList16staticMetaObjectE at Base 4:14.12.50
- _ZN5Diff216KompareModelList17slotPreviousModelEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList18setDepthAndAppliedEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList18slotNextDifferenceEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList19applyAllDifferencesEb at Base 4:14.12.50
- _ZN5Diff216KompareModelList19slotApplyDifferenceEb at Base 4:14.12.50
- _ZN5Diff216KompareModelList19slotSaveDestinationEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList19slotWriteDiffOutputEb at Base 4:14.12.50
- _ZN5Diff216KompareModelList20slotDirectoryChangedERK7QString at Base 4:14.12.50
- _ZN5Diff216KompareModelList20slotSelectionChangedEPKNS_10DifferenceE at Base 4:14.12.50
- _ZN5Diff216KompareModelList20slotSelectionChangedEPKNS_9DiffModelEPKNS_10DifferenceE at Base 4:14.12.50
- _ZN5Diff216KompareModelList21setStatusBarModelInfoEiiiii at Base 4:14.12.50
- _ZN5Diff216KompareModelList22slotPreviousDifferenceEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList22updateModelListActionsEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList23slotApplyAllDifferencesEb at Base 4:14.12.50
- _ZN5Diff216KompareModelList23slotDiffProcessFinishedEb at Base 4:14.12.50
- _ZN5Diff216KompareModelList25slotActionApplyDifferenceEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList26blendOriginalIntoModelListERK7QString at Base 4:14.12.50
- _ZN5Diff216KompareModelList27slotActionUnApplyDifferenceEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList29slotActionApplyAllDifferencesEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList31slotActionUnapplyAllDifferencesEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList4showEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList4swapEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList5clearEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList5errorE7QString at Base 4:14.12.50
- _ZN5Diff216KompareModelList5splitERK7QString at Base 4:14.12.50
- _ZN5Diff216KompareModelList6statusEN7Kompare6StatusE at Base 4:14.12.50
- _ZN5Diff216KompareModelList7compareEN7Kompare4ModeE at Base 4:14.12.50
- _ZN5Diff216KompareModelList7compareEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList7refreshEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList7saveAllEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList8openDiffERK7QString at Base 4:14.12.50
- _ZN5Diff216KompareModelList8readFileERK7QString at Base 4:14.12.50
- _ZN5Diff216KompareModelList8saveDiffERK7QStringS1_P12DiffSettings at Base 4:14.12.50
- _ZN5Diff216KompareModelList9blendFileEPNS_9DiffModelERK7QString at Base 4:14.12.50
- _ZN5Diff216KompareModelList9lastModelEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList9nextModelEv at Base 4:14.12.50
- _ZN5Diff216KompareModelList9prevModelEv at Base 4:14.12.50
- _ZN5Diff216KompareModelListC1EP12DiffSettingsP7QWidgetP7QObjectPKcb at Base 4:14.12.50
- _ZN5Diff216KompareModelListC2EP12DiffSettingsP7QWidgetP7QObjectPKcb at Base 4:14.12.50
- _ZN5Diff216KompareModelListD0Ev at Base 4:14.12.50
- _ZN5Diff216KompareModelListD1Ev at Base 4:14.12.50
- _ZN5Diff216KompareModelListD2Ev at Base 4:14.12.50
- _ZN5Diff29DiffModel11qt_metacallEN11QMetaObject4CallEiPPv at Base 4:14.12.50
- _ZN5Diff29DiffModel11qt_metacastEPKc at Base 4:14.12.50
- _ZN5Diff29DiffModel12linesChangedERK11QStringListS3_i at Base 4:14.12.50
- _ZN5Diff29DiffModel13setSourceFileE7QString at Base 4:14.12.50
- _ZN5Diff29DiffModel14lastDifferenceEv at Base 4:14.12.50
- _ZN5Diff29DiffModel14nextDifferenceEv at Base 4:14.12.50
- _ZN5Diff29DiffModel14prevDifferenceEv at Base 4:14.12.50
- _ZN5Diff29DiffModel15applyDifferenceEb at Base 4:14.12.50
- _ZN5Diff29DiffModel15firstDifferenceEv at Base 4:14.12.50
- _ZN5Diff29DiffModel16computeDiffStatsEPNS_10DifferenceE at Base 4:14.12.50
- _ZN5Diff29DiffModel16staticMetaObjectE at Base 4:14.12.50
- _ZN5Diff29DiffModel17setSourceRevisionE7QString at Base 4:14.12.50
- _ZN5Diff29DiffModel18processStartMarkerEPNS_10DifferenceERK11QStringListRN5QListIPNS_6MarkerEE14const_iteratorERib at Base 4:14.12.50
- _ZN5Diff29DiffModel18setDestinationFileE7QString at Base 4:14.12.50
- _ZN5Diff29DiffModel18setSourceTimestampE7QString at Base 4:14.12.50
- _ZN5Diff29DiffModel19applyAllDifferencesEb at Base 4:14.12.50
- _ZN5Diff29DiffModel21setSelectedDifferenceEPNS_10DifferenceE at Base 4:14.12.50
- _ZN5Diff29DiffModel21slotDifferenceAppliedEPNS_10DifferenceE at Base 4:14.12.50
- _ZN5Diff29DiffModel22setDestinationRevisionE7QString at Base 4:14.12.50
- _ZN5Diff29DiffModel23setDestinationTimestampE7QString at Base 4:14.12.50
- _ZN5Diff29DiffModel24localeAwareCompareSourceERKS0_ at Base 4:14.12.50
- _ZN5Diff29DiffModel28splitSourceInPathAndFileNameEv at Base 4:14.12.50
- _ZN5Diff29DiffModel33splitDestinationInPathAndFileNameEv at Base 4:14.12.50
- _ZN5Diff29DiffModel7addDiffEPNS_10DifferenceE at Base 4:14.12.50
- _ZN5Diff29DiffModel7addHunkEPNS_8DiffHunkE at Base 4:14.12.50
- _ZN5Diff29DiffModelC1ERK7QStringS3_ at Base 4:14.12.50
- _ZN5Diff29DiffModelC1Ev at Base 4:14.12.50
- _ZN5Diff29DiffModelC2ERK7QStringS3_ at Base 4:14.12.50
- _ZN5Diff29DiffModelC2Ev at Base 4:14.12.50
- _ZN5Diff29DiffModelD0Ev at Base 4:14.12.50
- _ZN5Diff29DiffModelD1Ev at Base 4:14.12.50
- _ZN5Diff29DiffModelD2Ev at Base 4:14.12.50
- _ZN5Diff29DiffModelaSERKS0_ at Base 4:14.12.50
- _ZN5Diff29DiffModelltERKS0_ at Base 4:14.12.50
- _ZN7Kompare4Info25swapSourceWithDestinationEv at Base 4:14.12.50
- _ZN7Kompare4InfoC1ENS_4ModeENS_8DiffModeENS_6FormatENS_9GeneratorE4QUrlS5_7QStringS6_P13QTemporaryDirS8_jb at Base 4:14.12.50
- _ZN7Kompare4InfoC2ENS_4ModeENS_8DiffModeENS_6FormatENS_9GeneratorE4QUrlS5_7QStringS6_P13QTemporaryDirS8_jb at Base 4:14.12.50
- _ZNK12DiffSettings10metaObjectEv at Base 4:14.12.50
- (optional=templinst)_ZNK12KConfigGroup9readEntryIbEET_PKcRKS1_ at Base 4:14.12.50
- (optional=templinst)_ZNK12KConfigGroup9readEntryIiEET_PKcRKS1_ at Base 4:14.12.50
- _ZNK12SettingsBase10metaObjectEv at Base 4:14.12.50
- _ZNK5Diff210Difference10metaObjectEv at Base 4:14.12.50
- _ZNK5Diff210Difference13sourceLineEndEv at Base 4:14.12.50
- _ZNK5Diff210Difference15sourceLineCountEv at Base 4:14.12.50
- _ZNK5Diff210Difference18destinationLineEndEv at Base 4:14.12.50
- _ZNK5Diff210Difference18recreateDifferenceEv at Base 4:14.12.50
- _ZNK5Diff210Difference20destinationLineCountEv at Base 4:14.12.50
- _ZNK5Diff210Difference26trackingDestinationLineEndEv at Base 4:14.12.50
- _ZNK5Diff216KompareModelList10metaObjectEv at Base 4:14.12.50
- _ZNK5Diff216KompareModelList10modelCountEv at Base 4:14.12.50
- _ZNK5Diff216KompareModelList11hasNextDiffEv at Base 4:14.12.50
- _ZNK5Diff216KompareModelList11hasPrevDiffEv at Base 4:14.12.50
- _ZNK5Diff216KompareModelList11isDirectoryERK7QString at Base 4:14.12.50
- _ZNK5Diff216KompareModelList11isReadWriteEv at Base 4:18.08.1
- _ZNK5Diff216KompareModelList12appliedCountEv at Base 4:14.12.50
- _ZNK5Diff216KompareModelList12hasNextModelEv at Base 4:14.12.50
- _ZNK5Diff216KompareModelList12hasPrevModelEv at Base 4:14.12.50
- _ZNK5Diff216KompareModelList12recreateDiffEv at Base 4:14.12.50
- _ZNK5Diff216KompareModelList15differenceCountEv at Base 4:14.12.50
- _ZNK5Diff216KompareModelList16actionCollectionEv at Base 4:14.12.50
- _ZNK5Diff216KompareModelList17hasUnsavedChangesEv at Base 4:14.12.50
- _ZNK5Diff216KompareModelList6isDiffERK7QString at Base 4:14.12.50
- _ZNK5Diff29DiffModel10metaObjectEv at Base 4:14.12.50
- _ZNK5Diff29DiffModel10sourceFileEv at Base 4:14.12.50
- _ZNK5Diff29DiffModel10sourcePathEv at Base 4:14.12.50
- _ZNK5Diff29DiffModel12recreateDiffEv at Base 4:14.12.50
- _ZNK5Diff29DiffModel15destinationFileEv at Base 4:14.12.50
- _ZNK5Diff29DiffModel15destinationPathEv at Base 4:14.12.50
- _ZNK5Diff29DiffModel17hasUnsavedChangesEv at Base 4:14.12.50
- _ZTI12DiffSettings at Base 4:14.12.50
- _ZTI12SettingsBase at Base 4:14.12.50
- _ZTIN5Diff210DifferenceE at Base 4:14.12.50
- _ZTIN5Diff213DiffModelListE at Base 4:14.12.50
- _ZTIN5Diff216KompareModelListE at Base 4:14.12.50
- _ZTIN5Diff29DiffModelE at Base 4:14.12.50
- _ZTS12DiffSettings at Base 4:14.12.50
- _ZTS12SettingsBase at Base 4:14.12.50
- _ZTSN5Diff210DifferenceE at Base 4:14.12.50
- _ZTSN5Diff213DiffModelListE at Base 4:14.12.50
- _ZTSN5Diff216KompareModelListE at Base 4:14.12.50
- _ZTSN5Diff29DiffModelE at Base 4:14.12.50
- _ZTV12DiffSettings at Base 4:14.12.50
- _ZTV12SettingsBase at Base 4:14.12.50
- _ZTVN5Diff210DifferenceE at Base 4:14.12.50
- _ZTVN5Diff213DiffModelListE at Base 4:14.12.50
- _ZTVN5Diff216KompareModelListE at Base 4:14.12.50
- _ZTVN5Diff29DiffModelE at Base 4:14.12.50
diff --git a/debian/libkomparediff2-6.install b/debian/libkomparediff2-6.install
new file mode 100644
index 0000000..d7cf5c4
--- /dev/null
+++ b/debian/libkomparediff2-6.install
@@ -0,0 +1,3 @@
+usr/lib/*/libkomparediff2.so.6
+usr/lib/*/libkomparediff2.so.6.*
+usr/share/locale/
diff --git a/debian/libkomparediff2-dev.install b/debian/libkomparediff2-dev.install
index a1ef2ba..229122c 100644
--- a/debian/libkomparediff2-dev.install
+++ b/debian/libkomparediff2-dev.install
@@ -1,4 +1,4 @@
usr/include/
usr/lib/*/cmake/LibKompareDiff2/
usr/lib/*/libkomparediff2.so
-usr/share/qlogging-categories5/libkomparediff2.categories
+usr/share/qlogging-categories6/libkomparediff2.categories
More information about the Neon-commits
mailing list