[neon/kde/ktnef/Neon/unstable] debian: more kf6ify

Carlos De Maine null at kde.org
Sun Sep 24 13:27:40 BST 2023


Git commit 5cad040fc46e0f1de418da8335f0870291dedd04 by Carlos De Maine.
Committed on 24/09/2023 at 14:27.
Pushed by carlosdem into branch 'Neon/unstable'.

more kf6ify

D  +0    -1    debian/compat
M  +24   -8    debian/control
R  +2    -2    debian/kpim6-ktnef-dev.install [from: debian/libkf5tnef-dev.install - 056% similarity]
A  +4    -0    debian/kpim6-ktnef.install
A  +1    -0    debian/kpim6-ktnef.lintian-overrides
R  +0    -0    debian/kpim6-ktnef.maintscript [from: debian/libkf5tnef5.maintscript - 100% similarity]
D  +0    -22   debian/libkf5tnef-dev.acc.in
D  +0    -5    debian/libkf5tnef5.install
D  +0    -1    debian/libkf5tnef5.lintian-overrides
D  +0    -122  debian/libkf5tnef5.symbols

https://invent.kde.org/neon/kde/ktnef/-/commit/5cad040fc46e0f1de418da8335f0870291dedd04

diff --git a/debian/compat b/debian/compat
deleted file mode 100644
index f599e28..0000000
--- a/debian/compat
+++ /dev/null
@@ -1 +0,0 @@
-10
diff --git a/debian/control b/debian/control
index 38dfb47..92374b2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,8 +3,8 @@ Section: libs
 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 (>= 9),
+Build-Depends: cmake,
+               debhelper-compat (= 13),
                kf6-extra-cmake-modules,
                kpim6-calendar-dev,
                kpim6-calendarutils-dev,
@@ -12,15 +12,18 @@ Build-Depends: cmake (>= 2.8.12~),
                libical-dev,
                pkg-kde-tools-neon,
                qt6-base-dev
-Standards-Version: 3.9.8
+Standards-Version: 4.6.2
 Homepage: https://projects.kde.org/projects/kde/pim/ktnef
 Vcs-Browser: https://anonscm.debian.org/git/pkg-kde/applications/ktnef.git
 Vcs-Git: https://anonscm.debian.org/git/pkg-kde/applications/ktnef.git
 
-Package: libkf5tnef-dev
-Section: libdevel
+Package: kpim6-ktnef-dev
 Architecture: any
-Depends: kpim6-calendar-dev, kpim6-tnef (= ${binary:Version}), ${misc:Depends}
+X-Neon-MergedPackage: true
+Multi-Arch: same
+Depends: kpim6-calendar-dev,
+         kpim6-tnef(= ${binary:Version}),
+         ${misc:Depends}
 Description: library for handling TNEF data - development files
  Ktnef is a library for handling data in the TNEF format (Transport Neutral
  Encapsulation Format, a proprietary format of e-mail attachment used by
@@ -30,10 +33,11 @@ Description: library for handling TNEF data - development files
  .
  This package contains the development files.
 
-Package: libkf5tnef5
+Package: kpim6-ktnef
 Architecture: any
+X-Neon-MergedPackage: true
 Multi-Arch: same
-Depends: ${misc:Depends}, ${shlibs:Depends}
+Depends: misc:Depends, shlibs:Depends
 Breaks: ${kde-l10n:all}
 Replaces: ${kde-l10n:all}
 Description: library for handling TNEF data
@@ -42,3 +46,15 @@ Description: library for handling TNEF data
  Microsoft Outlook and Microsoft Exchange Server). The API permits access
  to the actual attachments, the message properties (TNEF/MAPI), and allows
  one to view/extract message formatted text in Rich Text Format.
+
+Package: libkf5tnef-dev
+Architecture: all
+Depends: kpim6-ktnef-dev
+Description: Dummy transitional
+ Transitional dummy package.
+
+Package: libkf5tnef5
+Architecture: all
+Depends: kpim6-ktnef
+Description: Dummy transitional
+ Transitional dummy package.
diff --git a/debian/libkf5tnef-dev.install b/debian/kpim6-ktnef-dev.install
similarity index 56%
rename from debian/libkf5tnef-dev.install
rename to debian/kpim6-ktnef-dev.install
index c1cfb61..e23a529 100644
--- a/debian/libkf5tnef-dev.install
+++ b/debian/kpim6-ktnef-dev.install
@@ -1,4 +1,4 @@
 usr/include/KPim6/KTNEF/
-usr/lib/*/cmake/KPim5Tnef/
-usr/lib/*/libKPim5Tnef.so
+usr/lib/*/cmake/KPim6Tnef/
+usr/lib/*/libKPim6Tnef.so
 usr/lib/*/qt6/mkspecs/modules/qt_KTNef.pri
diff --git a/debian/kpim6-ktnef.install b/debian/kpim6-ktnef.install
new file mode 100644
index 0000000..720df7d
--- /dev/null
+++ b/debian/kpim6-ktnef.install
@@ -0,0 +1,4 @@
+usr/lib/*/libKPim6Tnef.so.6
+usr/lib/*/libKPim6Tnef.so.*.*
+usr/share/locale/
+usr/share/qlogging-categories6/
diff --git a/debian/kpim6-ktnef.lintian-overrides b/debian/kpim6-ktnef.lintian-overrides
new file mode 100644
index 0000000..fbe2b54
--- /dev/null
+++ b/debian/kpim6-ktnef.lintian-overrides
@@ -0,0 +1 @@
+kpim6-ktnef: package-name-doesnt-match-sonames libKPim5Tnef6
diff --git a/debian/libkf5tnef5.maintscript b/debian/kpim6-ktnef.maintscript
similarity index 100%
rename from debian/libkf5tnef5.maintscript
rename to debian/kpim6-ktnef.maintscript
diff --git a/debian/libkf5tnef-dev.acc.in b/debian/libkf5tnef-dev.acc.in
deleted file mode 100644
index 34836f0..0000000
--- a/debian/libkf5tnef-dev.acc.in
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<descriptor>
-
-<version>
-    15.07.90
-</version>
-
-<headers>
-    /usr/include/KF5/KTNEF/
-    /usr/include/KF5/ktnef_version.h
-</headers>
-
-<libs>
-    /usr/lib/@@DEB_HOST_MULTIARCH@@/libKF5Tnef.so
-</libs>
-
-<gcc_options>
-    -fPIC
-    -std=c++11
-</gcc_options>
-
-</descriptor>
diff --git a/debian/libkf5tnef5.install b/debian/libkf5tnef5.install
deleted file mode 100644
index e667318..0000000
--- a/debian/libkf5tnef5.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/lib/*/libKPim5Tnef.so.5
-usr/lib/*/libKPim5Tnef.so.5.*
-usr/share/locale/
-usr/share/qlogging-categories6/ktnef.categories
-usr/share/qlogging-categories6/ktnef.renamecategories
diff --git a/debian/libkf5tnef5.lintian-overrides b/debian/libkf5tnef5.lintian-overrides
deleted file mode 100644
index acaf5ea..0000000
--- a/debian/libkf5tnef5.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libkf5tnef5: package-name-doesnt-match-sonames libKPim5Tnef5
diff --git a/debian/libkf5tnef5.symbols b/debian/libkf5tnef5.symbols
deleted file mode 100644
index fb57cc5..0000000
--- a/debian/libkf5tnef5.symbols
+++ /dev/null
@@ -1,122 +0,0 @@
-# SymbolsHelper-Confirmed: 16.04.1 hurd-i386
-libKF5Tnef.so.5 libkf5tnef5 #MINVER#
- _ZN5KTnef11KTNEFAttach10setMimeTagERK7QString at Base 15.07.90
- _ZN5KTnef11KTNEFAttach11setFileNameERK7QString at Base 15.07.90
- _ZN5KTnef11KTNEFAttach12setExtensionERK7QString at Base 15.07.90
- _ZN5KTnef11KTNEFAttach13setDataParsedEv at Base 15.07.90
- _ZN5KTnef11KTNEFAttach13setInfoParsedEv at Base 15.07.90
- _ZN5KTnef11KTNEFAttach14setDisplayNameERK7QString at Base 15.07.90
- _ZN5KTnef11KTNEFAttach14setDisplaySizeEi at Base 15.07.90
- _ZN5KTnef11KTNEFAttach14setTitleParsedEv at Base 15.07.90
- _ZN5KTnef11KTNEFAttach15unsetDataParserEv at Base 15.07.90
- _ZN5KTnef11KTNEFAttach7setNameERK7QString at Base 15.07.90
- _ZN5KTnef11KTNEFAttach7setSizeEi at Base 15.07.90
- _ZN5KTnef11KTNEFAttach8setIndexEi at Base 15.07.90
- _ZN5KTnef11KTNEFAttach9setOffsetEi at Base 15.07.90
- _ZN5KTnef11KTNEFAttachC1Ev at Base 15.07.90
- _ZN5KTnef11KTNEFAttachC2Ev at Base 15.07.90
- _ZN5KTnef11KTNEFAttachD1Ev at Base 15.07.90
- _ZN5KTnef11KTNEFAttachD2Ev at Base 15.07.90
- _ZN5KTnef11KTNEFParser10extractAllEv at Base 15.07.90
- _ZN5KTnef11KTNEFParser10openDeviceEP9QIODevice at Base 15.07.90
- _ZN5KTnef11KTNEFParser13ParserPrivate11parseDeviceEv at Base 15.07.90
- _ZN5KTnef11KTNEFParser13ParserPrivate12checkCurrentEi at Base 15.07.90
- _ZN5KTnef11KTNEFParser13ParserPrivate12deleteDeviceEv at Base 15.07.90
- _ZN5KTnef11KTNEFParser13ParserPrivate13decodeMessageEv at Base 15.07.90
- _ZN5KTnef11KTNEFParser13ParserPrivate16decodeAttachmentEv at Base 15.07.90
- _ZN5KTnef11KTNEFParser13ParserPrivate18readMAPIPropertiesER4QMapIiPNS_13KTNEFPropertyEEPNS_11KTNEFAttachE at Base 15.07.90
- _ZN5KTnef11KTNEFParser13ParserPrivate19extractAttachmentToEPNS_11KTNEFAttachERK7QString at Base 15.07.90
- _ZN5KTnef11KTNEFParser20setDefaultExtractDirERK7QString at Base 15.07.90
- _ZN5KTnef11KTNEFParserC1Ev at Base 15.07.90
- _ZN5KTnef11KTNEFParserC2Ev at Base 15.07.90
- _ZN5KTnef11KTNEFParserD1Ev at Base 15.07.90
- _ZN5KTnef11KTNEFParserD2Ev at Base 15.07.90
- _ZN5KTnef11KTNEFWriter10setDtStampERK9QDateTime at Base 15.07.90
- _ZN5KTnef11KTNEFWriter10setDtStartERK9QDateTime at Base 15.07.90
- _ZN5KTnef11KTNEFWriter10setSummaryERK7QString at Base 15.07.90
- _ZN5KTnef11KTNEFWriter11addAttendeeERK7QStringNS0_4RoleENS0_8PartStatEbS3_ at Base 15.07.90
- _ZN5KTnef11KTNEFWriter11addPropertyEiiRK8QVariant at Base 15.07.90
- _ZN5KTnef11KTNEFWriter11setLocationERK7QString at Base 15.07.90
- _ZN5KTnef11KTNEFWriter11setPriorityENS0_8PriorityE at Base 15.07.90
- _ZN5KTnef11KTNEFWriter12setOrganizerERK7QString at Base 15.07.90
- _ZN5KTnef11KTNEFWriter13setCategoriesERK11QStringList at Base 15.07.90
- _ZN5KTnef11KTNEFWriter14clearAttendeesEv at Base 15.07.90
- _ZN5KTnef11KTNEFWriter14setDescriptionERK7QString at Base 15.07.90
- _ZN5KTnef11KTNEFWriter14setMessageTypeENS0_11MessageTypeE at Base 15.07.90
- _ZN5KTnef11KTNEFWriter6setUIDERK7QString at Base 15.07.90
- _ZN5KTnef11KTNEFWriter8setAlarmERK7QStringNS0_11AlarmActionERK9QDateTime at Base 15.07.90
- _ZN5KTnef11KTNEFWriter8setDtEndERK9QDateTime at Base 15.07.90
- _ZN5KTnef11KTNEFWriter9setMethodENS0_6MethodE at Base 15.07.90
- _ZN5KTnef11KTNEFWriter9setSenderERK7QStringS3_ at Base 15.07.90
- _ZN5KTnef11KTNEFWriterC1Ev at Base 15.07.90
- _ZN5KTnef11KTNEFWriterC2Ev at Base 15.07.90
- _ZN5KTnef11KTNEFWriterD1Ev at Base 15.07.90
- _ZN5KTnef11KTNEFWriterD2Ev at Base 15.07.90
- _ZN5KTnef12KTNEFMessage13addAttachmentEPNS_11KTNEFAttachE at Base 15.07.90
- _ZN5KTnef12KTNEFMessage14MessagePrivate16clearAttachmentsEv at Base 15.07.90
- _ZN5KTnef12KTNEFMessage14MessagePrivateD1Ev at Base 15.07.90
- _ZN5KTnef12KTNEFMessage14MessagePrivateD2Ev at Base 15.07.90
- _ZN5KTnef12KTNEFMessage16clearAttachmentsEv at Base 15.07.90
- _ZN5KTnef12KTNEFMessageC1Ev at Base 15.07.90
- _ZN5KTnef12KTNEFMessageC2Ev at Base 15.07.90
- _ZN5KTnef12KTNEFMessageD1Ev at Base 15.07.90
- _ZN5KTnef12KTNEFMessageD2Ev at Base 15.07.90
- _ZN5KTnef13KTNEFProperty11formatValueERK8QVariantb at Base 15.07.90
- _ZN5KTnef13KTNEFPropertyC1ERKS0_ at Base 15.07.90
- _ZN5KTnef13KTNEFPropertyC1EiiRK8QVariantS3_ at Base 15.07.90
- _ZN5KTnef13KTNEFPropertyC1Ev at Base 15.07.90
- _ZN5KTnef13KTNEFPropertyC2ERKS0_ at Base 15.07.90
- _ZN5KTnef13KTNEFPropertyC2EiiRK8QVariantS3_ at Base 15.07.90
- _ZN5KTnef13KTNEFPropertyC2Ev at Base 15.07.90
- _ZN5KTnef13KTNEFPropertyD1Ev at Base 15.07.90
- _ZN5KTnef13KTNEFPropertyD2Ev at Base 15.07.90
- _ZN5KTnef13KTNEFPropertyaSERKS0_ at Base 15.07.90
- _ZN5KTnef13msTNEFToVPartERK10QByteArray at Base 15.07.90
- _ZN5KTnef16KTNEFPropertySet10attributesEv at Base 15.07.90
- _ZN5KTnef16KTNEFPropertySet10propertiesEv at Base 15.07.90
- _ZN5KTnef16KTNEFPropertySet11addPropertyEiiRK8QVariantS3_b at Base 15.07.90
- _ZN5KTnef16KTNEFPropertySet12addAttributeEiiRK8QVariantb at Base 15.07.90
- _ZN5KTnef16KTNEFPropertySet5clearEb at Base 15.07.90
- _ZN5KTnef16KTNEFPropertySetC1Ev at Base 15.07.90
- _ZN5KTnef16KTNEFPropertySetC2Ev at Base 15.07.90
- _ZN5KTnef16KTNEFPropertySetD1Ev at Base 15.07.90
- _ZN5KTnef16KTNEFPropertySetD2Ev at Base 15.07.90
- _ZN5KTnef20formatTNEFInvitationERK10QByteArrayRK14QSharedPointerIN8KCalCore14MemoryCalendarEEPN9KCalUtils25InvitationFormatterHelperE at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach10checkStateEi at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach10dataParsedEv at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach10infoParsedEv at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach11displayNameEv at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach11displaySizeEv at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach11titleParsedEv at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach4nameEv at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach4sizeEv at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach5indexEv at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach6offsetEv at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach7mimeTagEv at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach8fileNameEv at Base 15.07.90
- _ZNK5KTnef11KTNEFAttach9extensionEv at Base 15.07.90
- _ZNK5KTnef11KTNEFParser11extractFileERK7QString at Base 15.07.90
- _ZNK5KTnef11KTNEFParser13extractFileToERK7QStringS3_ at Base 15.07.90
- _ZNK5KTnef11KTNEFParser7messageEv at Base 15.07.90
- _ZNK5KTnef11KTNEFParser8openFileERK7QString at Base 15.07.90
- _ZNK5KTnef11KTNEFWriter13writePropertyER11QDataStreamRii at Base 15.07.90
- _ZNK5KTnef11KTNEFWriter9writeFileER11QDataStream at Base 15.07.90
- _ZNK5KTnef11KTNEFWriter9writeFileER9QIODevice at Base 15.07.90
- _ZNK5KTnef12KTNEFMessage10attachmentERK7QString at Base 15.07.90
- _ZNK5KTnef12KTNEFMessage14attachmentListEv at Base 15.07.90
- _ZNK5KTnef12KTNEFMessage9rtfStringEv at Base 15.07.90
- _ZNK5KTnef13KTNEFProperty11valueStringEv at Base 15.07.90
- _ZNK5KTnef13KTNEFProperty3keyEv at Base 15.07.90
- _ZNK5KTnef13KTNEFProperty4nameEv at Base 15.07.90
- _ZNK5KTnef13KTNEFProperty4typeEv at Base 15.07.90
- _ZNK5KTnef13KTNEFProperty5valueEv at Base 15.07.90
- _ZNK5KTnef13KTNEFProperty8isVectorEv at Base 15.07.90
- _ZNK5KTnef13KTNEFProperty9keyStringEv at Base 15.07.90
- _ZNK5KTnef16KTNEFPropertySet10attributesEv at Base 15.07.90
- _ZNK5KTnef16KTNEFPropertySet10propertiesEv at Base 15.07.90
- _ZNK5KTnef16KTNEFPropertySet13findNamedPropERK7QStringS3_b at Base 15.07.90
- _ZNK5KTnef16KTNEFPropertySet8findPropEiRK7QStringb at Base 15.07.90
- _ZNK5KTnef16KTNEFPropertySet8propertyEi at Base 15.07.90
- _ZNK5KTnef16KTNEFPropertySet9attributeEi at Base 15.07.90
- (optional=templinst|arch=armel armhf hurd-i386 i386 kfreebsd-i386 mips mipsel powerpc)_ZSt4swapIN8QVariant7PrivateEEvRT_S3_ at Base 15.08.0
- _ZZZN5KTnef11KTNEFParser13ParserPrivateC4EvENKUlvE_clEvE15qstring_literal at Base 15.12.0


More information about the Neon-commits mailing list