[neon/extras/calligra/Neon/release] debian: merge salsa
Jonathan Esk-Riddell
null at kde.org
Wed Sep 7 17:19:49 BST 2022
Git commit 54c576d58f07276fc307112066e9e82cd462f276 by Jonathan Esk-Riddell.
Committed on 07/09/2022 at 16:19.
Pushed by jriddell into branch 'Neon/release'.
merge salsa
M +0 -2 debian/calligrastage.install
M +1 -8 debian/calligrawords.install
M +104 -97 debian/control
M +16 -1329 debian/copyright
https://invent.kde.org/neon/extras/calligra/commit/54c576d58f07276fc307112066e9e82cd462f276
diff --cc debian/control
index 19f7a27,57f302f..c86a8a7
--- a/debian/control
+++ b/debian/control
@@@ -14,70 -12,76 +12,77 @@@ Build-Depends: cmake (>= 3.16~)
libboost-system-dev,
libeigen3-dev,
libetonyek-dev,
- libfontconfig1-dev,
- libfreetype6-dev,
+ libfontconfig-dev,
+ libfreetype-dev,
libgit2-dev,
- libglib2.0-dev,
libgsl-dev,
- libicu-dev,
- libjpeg-dev,
- libkchart-dev,
- libkf5activities-dev,
+ libkchart-dev (>= 2.7.0~),
+ libkf5activities-dev (>= 5.7.0),
+ libkf5archive-dev (>= 5.7.0),
libkf5akonadi-dev,
- libkf5akonadicontact-dev,
+ libkf5attica-dev,
libkf5calendarcore-dev,
+ libkf5codecs-dev (>= 5.7.0),
+ libkf5completion-dev (>= 5.7.0),
+ libkf5config-dev (>= 5.7.0),
+ libkf5configwidgets-dev (>= 5.7.0),
libkf5contacts-dev,
- libkf5coreaddons-dev,
- libkf5dbusaddons-dev,
- libkf5doctools-dev,
- libkf5holidays-dev,
- libkf5i18n-dev,
- libkf5iconthemes-dev,
- libkf5itemviews-dev,
- libkf5kcmutils-dev,
- libkf5kdelibs4support-dev,
- libkf5kio-dev,
- libkf5notifyconfig-dev,
- libkf5parts-dev,
- libkf5sonnet-dev,
- libkf5texteditor-dev,
- libkf5textwidgets-dev,
- libkf5threadweaver-dev,
- libkf5wallet-dev,
- libkf5widgetsaddons-dev,
- libkf5windowsystem-dev,
- libkf5xmlgui-dev,
- libkgantt-dev,
- libkproperty3-dev,
- libkreport3-dev,
+ libkf5coreaddons-dev (>= 5.7.0),
+ libkf5dbusaddons-dev (>= 5.7.0),
+ libkf5doctools-dev (>= 5.7.0),
+ libkf5guiaddons-dev (>= 5.7.0),
+ libkf5i18n-dev (>= 5.7.0),
+ libkf5iconthemes-dev (>= 5.7.0),
+ libkf5itemviews-dev (>= 5.7.0),
+ libkf5jobwidgets-dev (>= 5.7.0),
+ libkf5kcmutils-dev (>= 5.7.0),
+ libkf5kdelibs4support-dev (>= 5.7.0),
+ libkf5khtml-dev (>= 5.7.0),
+ libkf5kio-dev (>= 5.7.0),
+ libkf5notifications-dev (>= 5.7.0),
+ libkf5notifyconfig-dev (>= 5.7.0),
+ libkf5parts-dev (>= 5.7.0),
+ libkf5sonnet-dev (>= 5.7.0),
+ libkf5textwidgets-dev (>= 5.7.0),
+ libkf5wallet-dev (>= 5.7.0),
+ libkf5widgetsaddons-dev (>= 5.7.0),
+ libkf5windowsystem-dev (>= 5.7.0),
+ libkf5xmlgui-dev (>= 5.7.0),
+ libkproperty3-dev (>= 3.1.0~),
+ libkreport3-dev (>= 3.1.0~),
liblcms2-dev (>= 2.4),
+ libmarble-dev,
libodfgen-dev,
libopenexr-dev,
- libopenjpeg-dev | libopenjp2-7-dev,
libphonon4qt5-dev,
libphonon4qt5experimental-dev,
- libpng-dev,
+ libpoppler-private-dev (>= 0.83.0~),
+ libpoppler-qt5-dev (>= 0.83.0~),
libqca-qt5-2-dev,
- libqt5svg5-dev,
- libqt5x11extras5-dev,
+ libqt5opengl5-dev (>= 5.3.0),
+ libqt5svg5-dev (>= 5.3.0),
+ libqt5x11extras5-dev (>= 5.3.0),
libspnav-dev,
libvisio-dev (>= 0.1),
libwpd-dev (>= 0.10),
libwpg-dev (>= 0.3),
libwps-dev (>= 0.4),
- libxbase64-dev,
+ libx11-dev,
libxml2-dev,
+ okular-dev (>= 4:17.08),
pkg-config,
- pkg-kde-tools,
+ pkg-kde-tools (>= 0.15.16),
pstoedit,
- qtdeclarative5-dev,
+ qtbase5-dev (>= 5.3.0),
+ qtdeclarative5-dev (>= 5.3.0),
shared-mime-info,
+ vc-dev [!armhf !arm64],
zlib1g-dev
- Standards-Version: 3.9.8
- Homepage: http://www.calligra.org/
- Vcs-Git: https://anonscm.debian.org/git/pkg-kde/calligra/calligra.git
- Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/calligra/calligra.git
+ Standards-Version: 4.6.1
+ Homepage: https://www.calligra.org/
+ Vcs-Git: https://salsa.debian.org/qt-kde-team/extras/calligra.git
+ Vcs-Browser: https://salsa.debian.org/qt-kde-team/extras/calligra
+ Rules-Requires-Root: no
Package: calligra
Architecture: all
@@@ -281,17 -287,14 +288,17 @@@ Description: Okular backend for ODT doc
Package: calligra-gemini
Architecture: any
Depends: calligra-libs (= ${binary:Version}),
- qml-module-qtwebengine,
+ calligra-gemini-data (>= ${source:Version}),
${misc:Depends},
- ${shlibs:Depends},
-Homepage: https://www.calligra.org/gemini/
-Description: unified interface for stage and words
- Calligra Gemini provide a unified applications which combines
- traditional desktop application and touch friendly interface for
- the Words and Stage components.
+ ${shlibs:Depends}
+Breaks: calligragemini (<< ${source:Version}~ciBuild)
+Replaces: calligragemini (<< ${source:Version}~ciBuild)
+Description: Calligra Gemini is an office suite designed for 2-in-1 devices
+ Calligra Gemini is an office suite which wraps the Calligra suite's
+ word processing and presentation components in a user interface which
+ can switch between a touch optimised user interface and a traditional
+ desktop one, allowing you to keep working and not loose your place in
+ your work.
.
This package is part of the Calligra Suite.
More information about the Neon-commits
mailing list