[neon/forks/fcitx-qt5/Neon/release] debian: manually merge salsa package, cos KDE hooks will not let me commit it
Jonathan Riddell
null at kde.org
Wed Jan 26 15:07:16 GMT 2022
Git commit 6df12491106e09286586cdd79d4049571c1b8177 by Jonathan Riddell.
Committed on 26/01/2022 at 15:07.
Pushed by jriddell into branch 'Neon/release'.
manually merge salsa package, cos KDE hooks will not let me commit it
M +57 -3 debian/changelog
M +37 -7 debian/control
M +5 -3 debian/copyright
R +0 -0 debian/fcitx-module-quickphrase-editor5.install [from: debian/fcitx5-module-quickphrase-editor.install - 100% similarity]
M +0 -11 debian/libfcitx-qt5-1.symbols
M +4 -3 debian/rules
https://invent.kde.org/neon/forks/fcitx-qt5/commit/6df12491106e09286586cdd79d4049571c1b8177
diff --git a/debian/changelog b/debian/changelog
index cff44f6..b21e5c3 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,62 @@
-fcitx-qt5 (1.2.6-0neon) focal; urgency=medium
+fcitx-qt5 (1.2.7-1.1) unstable; urgency=medium
- * New release
+ * Team upload.
+ * Do not bump version string to -2 to preserve qt6
+ package in Debian experimental.
+ * Rename fcitx5-module-quickphrase-editor to
+ fcitx-module-quickphrase-editor5. This package now has nothing
+ to do with fcitx5. (Closes: #964189)
+
+ -- Boyuan Yang <byang at debian.org> Fri, 14 Jan 2022 11:04:03 -0500
+
+fcitx-qt5 (1.2.7-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * debian/rules: Prepare for Qt6 infrastructure.
+ * Refresh symbol files.
+ * debian/copyright: Update copyright information.
+
+ -- Boyuan Yang <byang at debian.org> Fri, 07 Jan 2022 22:02:16 -0500
+
+fcitx-qt5 (1.2.6-2) unstable; urgency=medium
+
+ * Team upload.
+ * Bump Standards-Version to 4.6.0.
+
+ [ Gunnar Hjalmarsson ]
+ * Tweak symbols file for ppc64el on Ubuntu
+
+ -- Boyuan Yang <byang at debian.org> Fri, 22 Oct 2021 15:16:46 -0400
+
+fcitx-qt5 (1.2.6-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+
+ -- Boyuan Yang <byang at debian.org> Tue, 17 Aug 2021 21:51:07 -0400
+
+fcitx-qt5 (1.2.5-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream release.
+ * debian/libfcitx-qt5-1.symbols: Add new symbols.
+
+ -- Boyuan Yang <byang at debian.org> Wed, 05 Aug 2020 14:10:03 -0400
+
+fcitx-qt5 (1.2.4+git20200609-1) unstable; urgency=medium
+
+ * Team upload.
+ * New upstream snapshot (2020-06-09).
+ + Compatible with kcm-fcitx 0.5.6.
+ * debian/control:
+ + Bump Standards-Version to 4.5.0.
+ + Bump debhelper compat to v13.
+ * debian/upstream/signing-key.asc: Since we are using snapshot
+ tarball, disable key signing check for now. This should be
+ reverted with next upload.
- -- Harald Sitter <sitter at kde.org> Tue, 22 Sep 2020 14:55:32 +0200
+ -- Boyuan Yang <byang at debian.org> Fri, 03 Jul 2020 11:00:03 -0400
fcitx-qt5 (1.2.4-1) unstable; urgency=medium
diff --git a/debian/control b/debian/control
index 30a2b3b..9e9b112 100644
--- a/debian/control
+++ b/debian/control
@@ -7,14 +7,16 @@ Uploaders:
YunQiang Su <syq at debian.org>,
Build-Depends:
cmake (>= 3.1),
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
extra-cmake-modules (>= 1.4.0),
fcitx-libs-dev (>= 1:4.2.8),
intltool,
pkg-config,
qtbase5-dev,
qtbase5-private-dev,
-Standards-Version: 4.4.1
+# qt6-base-dev,
+# qt6-base-private-dev,
+Standards-Version: 4.6.0
Homepage: https://www.fcitx-im.org
Vcs-Git: https://salsa.debian.org/input-method-team/fcitx-qt5.git
Vcs-Browser: https://salsa.debian.org/input-method-team/fcitx-qt5
@@ -44,16 +46,20 @@ Description: Free Chinese Input Toy of X - Qt5 IM Module frontend
This package provides the Qt5 IM Module frontend, which is necessary
for Fcitx users who would like to use Qt5 applications.
-Package: fcitx5-module-quickphrase-editor
+Package: fcitx-module-quickphrase-editor5
Architecture: any
Depends:
libfcitx-qt5-data,
${misc:Depends},
${shlibs:Depends},
Replaces:
- fcitx-module-quickphrase-editor (<< 1:4.2.9.5~),
+ fcitx-module-quickphrase-editor,
+ fcitx5-module-quickphrase-editor,
Breaks:
- fcitx-module-quickphrase-editor (<< 1:4.2.9.5~),
+ fcitx-module-quickphrase-editor,
+ fcitx5-module-quickphrase-editor,
+Provides:
+ fcitx-module-quickphrase-editor,
Suggests:
fcitx-config-gtk | fcitx-config-gtk2 | kde-config-fcitx,
Multi-Arch: same
@@ -69,8 +75,7 @@ Description: Flexible Input Method Framework - Quick Phrase editor module
developer-friendly API.
.
This package provides the Quick Phrase Editor module for configuration tools
- including fcitx-config-gtk and kde-config-fcitx. It is compatible with both
- fcitx4 and fcitx5.
+ including fcitx-config-gtk and kde-config-fcitx. It is specific to fcitx4.
Package: libfcitx-qt5-1
Architecture: any
@@ -154,3 +159,28 @@ Description: Free Chinese Input Toy of X - Devel files for libfcitx-qt5
pure Xlib, GTK+, or KDE, and a developer-friendly API.
.
This package provides the development files of fcitx-qt5.
+#
+# Package: fcitx-frontend-qt6
+# Architecture: any
+# Multi-Arch: same
+# Pre-Depends:
+# ${misc:Pre-Depends},
+# Depends:
+# fcitx-module-dbus,
+# ${misc:Depends},
+# ${shlibs:Depends},
+# Description: Free Chinese Input Toy of X - Qt6 IM Module frontend
+# Fcitx is the Free Chinese Input Toy of X, which was initially designed
+# for Chinese users, and used XIM protocol. Now it has already evolved
+# into a highly modularized, feature rich input method framework for
+# Unix-like platforms supporting a considerable amount of frontends,
+# backends and modules.
+# .
+# It offers a pleasant and modern experience, with intuitive graphical
+# configuration tools and customizable skins and mapping tables.
+# It is highly modularized and extensible,
+# with GTK+ 2/3 and Qt 4/5 IM Modules, support for UIs based on Fbterm,
+# pure Xlib, GTK+, or KDE, and a developer-friendly API.
+# .
+# This package provides the Qt6 IM Module frontend, which is necessary
+# for Fcitx users who would like to use Qt6 applications.
diff --git a/debian/copyright b/debian/copyright
index af571e2..7fef481 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -4,7 +4,7 @@ Upstream-Contact: Weng Xuetian <wengxt at gmail.com>
Source: https://github.com/fcitx/fcitx-qt5
Files: *
-Copyright: 2012-2015 Weng Xuetian (csslayer) <wengxt at gmail.com>
+Copyright: 2012-2021 Weng Xuetian (csslayer) <wengxt at gmail.com>
License: GPL-2+
Files: debian/*
@@ -12,8 +12,10 @@ Copyright: 2013 YunQiang Su <wzssyqa at gmail.com>
2013-2015 Aron Xu <aron at debian.org>
License: GPL-2+
-Files: platforminputcontext/*
-Copyright: 2011-2017 Weng Xuetian (csslayer) <wengxt at gmail.com>
+Files:
+ qt5/platforminputcontext/*
+ qt6/platforminputcontext/*
+Copyright: 2011-2021 Weng Xuetian (csslayer) <wengxt at gmail.com>
License: BSD-3-Clause
License: BSD-3-Clause
diff --git a/debian/fcitx5-module-quickphrase-editor.install b/debian/fcitx-module-quickphrase-editor5.install
similarity index 100%
rename from debian/fcitx5-module-quickphrase-editor.install
rename to debian/fcitx-module-quickphrase-editor5.install
diff --git a/debian/libfcitx-qt5-1.symbols b/debian/libfcitx-qt5-1.symbols
index d971348..bc72f8d 100644
--- a/debian/libfcitx-qt5-1.symbols
+++ b/debian/libfcitx-qt5-1.symbols
@@ -42,13 +42,9 @@ libFcitxQt5DBusAddons.so.1 libfcitx-qt5-1 #MINVER#
(c++)"FcitxQtInputMethodItem::setName(QString const&)@Base" 1.0.0
(c++)"FcitxQtInputMethodItem::setUniqueName(QString const&)@Base" 1.0.0
(c++)"FcitxQtInputMethodItem::uniqueName() const at Base" 1.0.0
- (c++)"FcitxQtInputMethodItem::~FcitxQtInputMethodItem()@Base" 1.0.0
(c++|optional|arch=arm64 armhf)"FcitxQtInputMethodProxy::ConfigureIM(QString const&)@Base" 1.0.0
- (c++|optional|arch=armhf powerpc ppc64el)"FcitxQtInputMethodProxy::CreateIC()@Base" 1.0.0
- (c++|optional|arch=!amd64 !i386)"FcitxQtInputMethodProxy::CreateIC(unsigned int&, unsigned int&, unsigned int&, unsigned int&)@Base" 1.0.0
(c++)"FcitxQtInputMethodProxy::FcitxQtInputMethodProxy(QString const&, QString const&, QDBusConnection const&, QObject*)@Base" 1.0.0
(c++|optional|arch=armhf i386)"FcitxQtInputMethodProxy::GetCurrentState()@Base" 1.0.0
- (c++|optional|arch=!amd64 !arm64)"FcitxQtInputMethodProxy::GetCurrentUI()@Base" 1.0.0
(c++|optional|arch=armhf i386)"FcitxQtInputMethodProxy::ReloadAddonConfig(QString const&)@Base" 1.0.0
(c++|optional|arch=arm64 i386 powerpc)"FcitxQtInputMethodProxy::SetCurrentIM(QString const&)@Base" 1.0.0
(c++)"FcitxQtInputMethodProxy::metaObject() const at Base" 1.0.0
@@ -65,17 +61,12 @@ libFcitxQt5DBusAddons.so.1 libfcitx-qt5-1 #MINVER#
(c++)"FcitxQtKeyboardLayout::setName(QString const&)@Base" 1.0.0
(c++)"FcitxQtKeyboardLayout::setVariant(QString const&)@Base" 1.0.0
(c++)"FcitxQtKeyboardLayout::variant() const at Base" 1.0.0
- (c++)"FcitxQtKeyboardLayout::~FcitxQtKeyboardLayout()@Base" 1.0.0
(c++)"FcitxQtKeyboardProxy::FcitxQtKeyboardProxy(QString const&, QString const&, QDBusConnection const&, QObject*)@Base" 1.0.0
(c++)"FcitxQtKeyboardProxy::metaObject() const at Base" 1.0.0
(c++)"FcitxQtKeyboardProxy::qt_metacall(QMetaObject::Call, int, void**)@Base" 1.0.0
(c++)"FcitxQtKeyboardProxy::qt_metacast(char const*)@Base" 1.0.0
(c++)"FcitxQtKeyboardProxy::staticMetaObject at Base" 1.0.0
(c++)"FcitxQtKeyboardProxy::~FcitxQtKeyboardProxy()@Base" 1.0.0
- (c++)"QByteArray::~QByteArray()@Base" 1.0.0
- (c++)"QString::~QString()@Base" 1.0.0
- (c++)"FcitxQtInputMethodProxy::CreateICv2(QString const&, bool&, unsigned int&, unsigned int&, unsigned int&, unsigned int&)@Base" 1.2.3
- (c++)"FcitxQtInputMethodProxy::CreateICv3(QString const&, int, bool&, unsigned int&, unsigned int&, unsigned int&, unsigned int&)@Base" 1.2.3
(c++)"operator<<(QDBusArgument&, FcitxQtFormattedPreedit const&)@Base" 1.0.0
(c++)"operator<<(QDBusArgument&, FcitxQtInputMethodItem const&)@Base" 1.0.0
(c++)"operator<<(QDBusArgument&, FcitxQtKeyboardLayout const&)@Base" 1.0.0
@@ -179,8 +170,6 @@ libFcitxQt5WidgetsAddons.so.1 libfcitx-qt5-1 #MINVER#
(c++)"FcitxQtKeySequenceWidget::setMultiKeyShortcutsAllowed(bool)@Base" 1.0.0
(c++)"FcitxQtKeySequenceWidget::staticMetaObject at Base" 1.0.0
(c++)"FcitxQtKeySequenceWidget::~FcitxQtKeySequenceWidget()@Base" 1.0.0
- (c++)"QByteArray::~QByteArray()@Base" 1.0.0
- (c++)"QString::~QString()@Base" 1.0.0
(c++)"non-virtual thunk to FcitxQtKeySequenceWidget::~FcitxQtKeySequenceWidget()@Base" 1.0.0
(c++)"typeinfo for FcitxQtConfigUIFactory at Base" 1.0.0
(c++)"typeinfo for FcitxQtConfigUIFactoryInterface at Base" 1.0.0
diff --git a/debian/rules b/debian/rules
index 18a3d3b..718b1af 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,7 @@
# see FEATURE AREAS in dpkg-buildflags(1)
export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+export DEB_LDFLAGS_MAINT_APPEND =
export QT_SELECT := 5
DPKG_EXPORT_BUILDFLAGS = 1
@@ -14,5 +14,6 @@ CXXFLAGS += $(CPPFLAGS)
%:
dh $@
-override_dh_missing:
- dh_missing --fail-missing
+#override_dh_auto_configure:
+# dh_auto_configure -- \
+# -DENABLE_QT6=On
More information about the Neon-commits
mailing list