[neon/neon-packaging/maliit-framework/Neon/release_jammy] debian: clean up and modernise
Carlos De Maine
null at kde.org
Thu Sep 26 04:21:55 BST 2024
Git commit 184a01870873de0d87dad65d2b3f3f566e9b26a0 by Carlos De Maine.
Committed on 26/09/2024 at 03:21.
Pushed by carlosdem into branch 'Neon/release_jammy'.
clean up and modernise
(cherry picked from commit 9f93396bbc77dbfb0d9fe1216f866d484146a127)
Co-authored-by: Carlos De Maine <carlosdemaine at gmail.com>
D +0 -1 debian/compat
M +16 -27 debian/control
D +0 -87 debian/copyright
M +2 -2 debian/maliit-framework.sh
M +3 -0 debian/rules
M +1 -1 debian/xinput/maliit
https://invent.kde.org/neon/neon-packaging/maliit-framework/-/commit/184a01870873de0d87dad65d2b3f3f566e9b26a0
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 bd495c4..0d85cfc 100644
--- a/debian/control
+++ b/debian/control
@@ -1,11 +1,11 @@
Source: maliit-framework
Section: libs
-Priority: extra
+Priority: optional
Maintainer: Ubuntu Developers <ubuntu-devel-discuss at lists.ubuntu.com>
XSBC-Original-Maintainer: Debian Mobile Team <debian-mobile at lists.debian.org>
Uploaders: Michał Zając <quintasan at kubuntu.org>, Iain Lane <laney at debian.org>
Build-Depends: cmake,
- debhelper (>= 9),
+ debhelper-compat (= 13),
doxygen,
graphviz,
libdbus-1-dev,
@@ -17,21 +17,22 @@ Build-Depends: cmake,
libxcb-damage0-dev,
libxcb-xfixes0-dev,
libxext-dev,
- pkg-config,
- qtbase5-dev (>= 5.2),
+ pkgconf,
+ qtbase5-dev,
qtbase5-private-dev,
qtdeclarative5-dev,
qtwayland5-dev-tools,
qtwayland5-private-dev,
wayland-protocols
-Standards-Version: 3.9.6
-Homepage: https://wiki.maliit.org
-Vcs-Browser: https://code.launchpad.net/~ubuntu-core-dev/maliit/maliit-framework-ubuntu
-Vcs-Bzr: lp:~ubuntu-core-dev/maliit/maliit-framework-ubuntu
+Standards-Version: 4.6.2
+Homepage: https://github.com/maliit/framework
+Vcs-Browser: https://github.com/maliit/framework
Package: maliit-framework
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}, qml-module-qtquick-localstorage
+Depends: ${misc:Depends},
+ ${shlibs:Depends},
+ qml-module-qtquick-localstorage
Breaks: gir1.2-maliit-1.0 (<< ${source:Version}),
libmaliit-glib0 (<< ${source:Version}),
libmaliit0 (<< ${source:Version}),
@@ -61,7 +62,9 @@ Description: Maliit Input Method Framework - Plugin Library
Package: maliit-framework-dev
Architecture: any
Section: libdevel
-Depends: maliit-framework (= ${binary:Version}), ${misc:Depends}
+Depends: maliit-framework (= ${binary:Version}),
+ qtbase5-dev,
+ ${misc:Depends},
Description: Maliit Input Method Framework - Development Files
Maliit provides a flexible and cross-platform input method framework. It has a
plugin-based client-server architecture where applications act as clients and
@@ -71,21 +74,10 @@ Description: Maliit Input Method Framework - Development Files
.
This package is needed to compile plugins for the Maliit framework
-Package: maliit-framework-dbg
-Section: debug
-Architecture: any
-Depends: maliit-framework (= ${binary:Version}), ${misc:Depends}
-Description: Maliit Input Method Framework - Debug symbols
- Maliit provides a flexible and cross-platform input method framework. It has a
- plugin-based client-server architecture where applications act as clients and
- communicate with the Maliit server via input context plugins. The communication
- link currently uses D-Bus. Maliit is an open source framework (LGPL 2) with
- open source plugins (BSD).
- .
- This package contains debugging symbols.
-
Package: gir1.2-maliit-1.0
-Depends: maliit-framework, ${misc:Depends}
+Depends: maliit-framework,
+ ${gir:Depends},
+ ${misc:Depends}
Architecture: all
Section: oldlibs
Description: transitional dummy package
@@ -95,8 +87,6 @@ Package: libmaliit-glib2
Depends: ${misc:Depends}, ${shlibs:Depends}
Architecture: any
Section: libs
-Breaks: libmaliit-glib0 (<< ${source:Version}~ciBuild)
-Replaces: libmaliit-glib0 (<< ${source:Version}~ciBuild)
Description: Maliit Input Method Framework - GLib Bindings
Maliit provides a flexible and cross-platform input method framework. It has a
plugin-based client-server architecture where applications act as clients and
@@ -145,6 +135,5 @@ Description: transitional dummy package
Package: maliit-framework-doc
Depends: maliit-framework, ${misc:Depends}
Architecture: all
-Section: docs
Description: docs for Maliit framework
Documentation for the framework of Maliit
diff --git a/debian/copyright b/debian/copyright
deleted file mode 100644
index a7fa2d8..0000000
--- a/debian/copyright
+++ /dev/null
@@ -1,87 +0,0 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
-Upstream-Name: maliit-framework
-
-Files: debian/* connection/waylandinputmethodconnection.*
-Copyright: 2013 Canonical Ltd
- 2012 Canonical Ltd
-License: LGPL-2.1
-
-Files: src/mimsettingsqsettings.*
-Copyright: 2012 Mattia Barbon <mattia at develer.com>
- 2012 Canonical Ltd
-License: LGPL-2.1
-
-Files: connection/dbuscustomarguments src/maliit/plugins/abstractpluginsetting.h src/msharedattributeextensionmanager.*
-Copyright: 2012 Mattia Barbon <mattia at develer.com>
-License: LGPL-2.1
-
-Files: src/unknownplatform.* src/abstractplatform.* src/windowdata.* src/windowgroup.* src/waylandplatform.* src/mimpluginmanager_p.h src/mimpluginmanager.h src/xcbplatform.* src/mimserveroptions.cpp
-Copyright: 2013 Openismus GmbH
-License: LGPL-2.1
-
-Files: input-context/minputcontext.cpp
-Copyright: 2013 Jolla Ltd
- 2013 Digia Plc and/or its subsidiary(-ies)
- 2010 Nokia Corporation and/or its subsidiary(-ies)
-License: LGPL-2.1
-
-Files: input-context/main.cpp
-Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
-License: LGPL-2.1
-
-Files: tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.h tests/ut_mimpluginmanagerconfig/ut_mimpluginmanagerconfig.cpp ./src/mimhwkeyboardtracker
-Copyright: 2012 One Laptop per Child Association
-License: LGPL-2.1
-
-Files: src/mimhwkeyboardtracker_stub.cpp
-Copyright: 2013 Gianni Valdambrini <aleister at develer.com>
-License: LGPL-2.1
-
-Files: weston-protocols/*
-Copyright: 2012, 2013 Intel Corporation
-License: Intel
- Permission to use, copy, modify, distribute, and sell this
- software and its documentation for any purpose is hereby granted
- without fee, provided that the above copyright notice appear in
- all copies and that both that copyright notice and this permission
- notice appear in supporting documentation, and that the name of
- the copyright holders not be used in advertising or publicity
- pertaining to distribution of the software without specific,
- written prior permission. The copyright holders make no
- representations about the suitability of this software for any
- purpose. It is provided "as is" without express or implied
- warranty.
- .
- THE COPYRIGHT HOLDERS DISCLAIM ALL WARRANTIES WITH REGARD TO THIS
- SOFTWARE, INCLUDING ALL IMPLIED WARRANTIES OF MERCHANTABILITY AND
- FITNESS, IN NO EVENT SHALL THE COPYRIGHT HOLDERS BE LIABLE FOR ANY
- SPECIAL, INDIRECT OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN
- AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION,
- ARISING OUT OF OR IN CONNECTION WITH THE USE OR PERFORMANCE OF
- THIS SOFTWARE.
-
-Files: *
-Copyright: 2011 Nokia Corporation and/or its subsidiary(-ies)
- 2010 Nokia Corporation and/or its subsidiary(-ies)
-License: LGPL-2.1
-
-License: LGPL-2.1
- This library is free software; you can redistribute it and/or
- modify it under the terms of the GNU Lesser General Public
- License as published by the Free Software Foundation, version 2.1
- of the License.
- .
- This library is distributed in the hope that it will be useful,
- but WITHOUT ANY WARRANTY; without even the implied warranty of
- MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
- Lesser General Public License for more details.
- .
- You should have received a copy of the GNU Lesser General Public
- License along with this library; if not, write to the Free Software
- Foundation, Inc., 51 Franklin Street, Fifth Floor,
- Boston, MA 02110-1301 USA
- .
- On Debian systems, the full text of the GNU Lesser General Public
- License version 2.1 can be found in the file
- `/usr/share/common-licenses/LGPL-2.1'.
diff --git a/debian/maliit-framework.sh b/debian/maliit-framework.sh
index f63b92a..12d91ac 100644
--- a/debian/maliit-framework.sh
+++ b/debian/maliit-framework.sh
@@ -1,8 +1,8 @@
# Exports GTK_IM_MODULE and QT_IM_MODULE under Unity 8
case $XDG_SESSION_DESKTOP in
- ubuntu-touch|unity8*)
+ KDE)
+ export QT_IM_MODULE=Maliit
export GTK_IM_MODULE=Maliit
- export QT_IM_MODULE=maliitphablet
;;
esac
diff --git a/debian/rules b/debian/rules
index ba045dd..9129e88 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,5 +6,8 @@ export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
%:
dh $@
+override_dh_auto_configure:
+ dh_auto_configure -- -DCMAKE_BUILD_TYPE=-DCMAKE_BUILD_TYPE=RelWithDebInfo -DCMAKE_PREFIX_PATH=/usr -DCMAKE_INSTALL_PREFIX=/usr
+
override_dh_auto_test:
true
diff --git a/debian/xinput/maliit b/debian/xinput/maliit
index bed4fe4..09d4b0e 100644
--- a/debian/xinput/maliit
+++ b/debian/xinput/maliit
@@ -3,6 +3,6 @@ XIM_PROGRAM=/usr/bin/maliit-server
XIM_ARGS=
GTK_IM_MODULE=Maliit
-QT_IM_MODULE=MaliitPhablet
+QT_IM_MODULE=Maliit
DEPENDS="maliit-framework"
More information about the Neon-commits
mailing list