[neon/extras/calligra/Neon/unstable_jammy] debian: rebase

Carlos De Maine null at kde.org
Thu Aug 29 10:27:36 BST 2024


Git commit 1bfe2ceed107a29a58b340b2bf58903199a9604d by Carlos De Maine.
Committed on 29/08/2024 at 09:27.
Pushed by carlosdem into branch 'Neon/unstable_jammy'.

rebase

M  +20   -255  debian/control
M  +6    -6    debian/rules

https://invent.kde.org/neon/extras/calligra/-/commit/1bfe2ceed107a29a58b340b2bf58903199a9604d

diff --cc debian/control
index 76a2c1f,e36b659..b8a953a
--- a/debian/control
+++ b/debian/control
@@@ -55,10 -54,7 +55,9 @@@ Build-Depends: cauchy-dev
                 libopenjpeg-dev | libopenjp2-7-dev,
                 libphonon4qt6-dev,
                 libpng-dev,
 +               libpoppler-private-dev,
 +               libpoppler-qt6-dev,
                 libqca-qt6-2-dev,
-                libspnav-dev,
                 libvisio-dev (>= 0.1),
                 libwpd-dev (>= 0.10),
                 libwpg-dev (>= 0.3),
@@@ -95,248 -102,4 +104,4 @@@ Description: extensive productivity an
   This suite is a set of applications written to help you to accomplish your
   work. It includes office applications such as a word processor,
   a spreadsheet, a presentation program, a database application, with raster
-- and vector graphics tools, etc.
-  .
-  This metapackage provides all the components of the Calligra Suite.
- 
- Package: karbon
- Architecture: any
- Section: graphics
- Depends: calligra-libs (= ${binary:Version}),
-          ${misc:Depends},
-          ${shlibs:Depends}
- Recommends: pstoedit
- Breaks: calligra-data (<< 1:2.4.3-2),
-         calligraflow (<< ${source:Version}~ciBuild),
-         koffice-data (<< 1:2.4)
- Replaces: calligra-data (<< 1:2.4.3-2),
-           calligraflow (<< ${source:Version}~ciBuild),
-           koffice-data (<< 1:2.4)
- Homepage: http://www.calligra.org/karbon/
- Description: vector graphics application for the Calligra Suite
-  A vector drawing application with an user interface that is easy to
-  use, highly customizable and extensible. That makes Karbon a great application
-  for users starting to explore the world of vector graphics as well as for
-  artists wanting to create breathtaking vector art. Features include:
-  .
-   * Loading support for ODG, SVG, WMF, WPG, EPS/PS
-   * Writing support for ODG, SVG, WMF, PNG, PDF
-   * Customizable user interface with freely placeable toolbars and dockers
-   * Layer docker for easy handling of complex documents including preview
-     thumbnails, support for grouping shapes via drag and drop,
-     controlling visibility of shapes or locking
-   * Advanced path editing tool with great on-canvas editing capabilities
-   * Various drawing tools for creating path shapes including a draw path
-     tool and a pencil tool, as well as a calligraphy drawing tool
-   * Gradient and pattern tools for easy on-canvas editing of gradient and
-     pattern styles
-   * Top notch snapping facilities for guided drawing and editing (e.g.
-     snapping to grid, guide lines, path nodes, bounding boxes, orthogonal
-     positions, intersections of path shapes or extensions of lines and
-     paths)
-   * Many predefined basic shapes included, such as circle/ellipse, star or
-     rectangle
-   * Artistic text shape with support for following path outlines
-     (i.e. text on path)
-   * Complex path operations and effects like Boolean set operations,
-     path flattening, rounding and refining as well as whirl/pinch effects
-   * Extensible by writing plugins for new tools, shapes and dockers
-  .
-  This package is part of the Calligra Suite.
- 
- Package: calligrasheets
- Architecture: any
- Section: math
- Replaces: calligra-data (<< 1:2.4.3-2),
-           koffice-data (<< 1:2.4),
-           kspread (<< 1:2.4)
- Breaks: calligra-data (<< 1:2.4.3-2),
-         koffice-data (<< 1:2.4),
-         kspread (<< 1:2.4)
- Depends: calligra-libs (= ${binary:Version}),
-          ${misc:Depends},
-          ${shlibs:Depends}
- Suggests: khelpcenter
- Homepage: http://www.calligra.org/sheets/
- Description: spreadsheet for the Calligra Suite
-  A powerful spreadsheet application.  It is scriptable and  provides both
-  table-oriented sheets and support for complex mathematical  formulae and
-  statistics. It is the successor of KSpread.
-  .
-  This package is part of the Calligra Suite.
- 
- Package: calligraflow
- Architecture: any
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Description: empty dummy package
-  This is a dummy package as the Flow app has been removed.
- 
- Package: calligrawords
- Architecture: any
- Section: text
- Replaces: kword (<< 1:2.4)
- Breaks: kword (<< 1:2.4)
- Depends: calligra-libs (= ${binary:Version}),
-          calligrawords-data (>= ${source:Version}),
-          ${misc:Depends},
-          ${shlibs:Depends}
- Suggests: khelpcenter
- Recommends: okular-backend-odt
- Homepage: http://www.calligra.org/words/
- Description: word processor for the Calligra Suite
-  A FrameMaker-like word processing and desktop publishing  application.
-  It is capable of creating polished and professional  looking documents.
-  It can be used for desktop publishing, but also for  "normal" word
-  processing, like writing letters, reports and so on.
-  .
-  This package is part of the Calligra Suite.
- 
- Package: calligrawords-data
- Architecture: all
- Section: text
- Depends: ${misc:Depends}
- Conflicts: koffice-data
- Breaks: calligra-data (<< 1:2.4.3-2)
- Replaces: calligra-data (<< 1:2.4.3-2), koffice-data
- Homepage: http://www.calligra.org/words/
- Description: data files for Words word processor
-  This package contains architecture-independent data files for Words,
-  the word processor shipped with the Calligra Suite.
-  .
-  See the calligrawords package for further information.
-  .
-  This package is part of the Calligra Suite.
- 
- Package: calligrastage
- Architecture: any
- Replaces: calligra-data (<< 1:2.4.3-2),
-           koffice-data (<< 1:2.4),
-           kpresenter (<< 1:2.4)
- Breaks: calligra-data (<< 1:2.4.3-2),
-         koffice-data (<< 1:2.4),
-         kpresenter (<< 1:2.4)
- Depends: calligra-libs (= ${binary:Version}),
-          calligrastage-data (>=${source:Version}),
-          ${misc:Depends},
-          ${shlibs:Depends}
- Suggests: khelpcenter
- Recommends: okular-backend-odp
- Homepage: http://www.calligra.org/stage/
- Description: presentation program for the Calligra Suite
-  An easy to use yet still flexible presentation application. You can
-  easily create presentations containing a rich variety of elements, from
-  graphics to text, from charts to images. Stage is extensible through a
-  plugin system, so it is easy to add new effects, new content elements or even
-  new ways of managing your presentation.
-  .
-  Stage natively uses the OpenDocument file format standard, for easy
-  interchange with all ODF supporting applications, which includes Microsoft
-  Office. Examples of its easy-to-use features are support for layouts, a
-  special slide overview view during presentations for the presenter, support
-  for many different master sliders in one presentation, cool transitions and
-  a useful notes feature.
-  .
-  This package is part of the Calligra Suite.
- 
- Package: calligrastage-data
- Architecture: all
- Depends: ${misc:Depends}
- Breaks: calligrastage (<< 1:2.6.3-1~)
- Replaces: calligrastage (<< 1:2.6.3-1~)
- Description: data files for Calligra Stage
-  This package contains architecture-independent data files for Stage,
-  the presentation program shipped with the Calligra Suite.
-  .
-  See the calligrastage package for further information.
-  .
-  This package is part of the Calligra Suite.
- 
- Package: calligra-libs
- Section: libs
- Architecture: any
- Replaces: kexi (<< 1:2.6.1), kformula, koffice-libs
- Conflicts: kformula, koffice-libs
- Breaks: kexi (<< 1:2.6.1)
- Depends: calligra-data (>= ${source:Version}),
-          ${misc:Depends},
-          ${shlibs:Depends}
- Recommends: fonts-lyx, libqca2-plugins, python3, ruby
- Suggests: texlive, wordnet
- Description: common libraries and binaries for the Calligra Suite
-  This package provides the libraries and binaries that are shared amongst
-  the various components of Calligra.
-  .
-  This package is part of the Calligra Suite.
- 
- Package: calligra-data
- Section: libs
- Architecture: all
- Depends: ${misc:Depends}
- Replaces: kexi (<< 1:2.6.1), kformula, koffice-data
- Conflicts: kformula, koffice-data
- Breaks: kexi (<< 1:2.6.1)
- Suggests: khelpcenter
- Description: common shared data for the Calligra Suite
-  This package provides the architecture-independent data that is shared
-  amongst the various components of Calligra.
-  .
-  This package is part of the Calligra Suite.
- 
- Package: calligra-gemini
- Architecture: any
- Depends: calligra-libs (= ${binary:Version}),
-          qml-module-org-kde-kirigami2,
-          qml-module-qtquick-controls,
-          qml-module-qtquick-controls2,
-          qml-module-qtwebengine,
-          ${misc:Depends},
-          ${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
-  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.
- 
- Package: calligragemini
- Architecture: all
- Depends: calligra-gemini, ${misc:Depends}, ${shlibs:Depends}
- Description: unified interface for stage and words - transitional
-  Transitional dummy package.
- 
- Package: braindump
- Architecture: all
- Depends: ${misc:Depends}, ${shlibs:Depends}
- Description: braindump - transitional
-  Transitional dummy package.
- 
- Package: okular-backend-odp
- Architecture: any
- Section: graphics
- Depends: calligra-libs (= ${binary:Version}),
-          ${misc:Depends},
-          ${shlibs:Depends}
- Recommends: okular
- Enhances: okular
- Description: Okular backend for ODP documents
-  This package provides a backend for Okular to view OpenDocument Presentation
-  (ODP) documents.
-  .
-  This package is part of the Calligra Suite.
- 
- Package: okular-backend-odt
- Architecture: any
- Section: graphics
- Depends: calligra-libs (= ${binary:Version}),
-          ${misc:Depends},
-          ${shlibs:Depends}
- Recommends: okular
- Enhances: okular
- Description: Okular backend for ODT documents
-  This package provides a backend for Okular to view OpenDocument Text
-  (ODT) documents, but also DOC, DOCX and WPD documents.
-  .
-  This package is part of the Calligra Suite.
++ and vector graphics tools, etc.
diff --cc debian/rules
index f6a54c9,c6f48f2..62ef640
--- a/debian/rules
+++ b/debian/rules
@@@ -23,19 -23,19 +23,19 @@@ override_dh_auto_install
  	dh_auto_install
  	# Remove development stuff:
  	# - symlinks of libraries
- 	find debian/tmp/usr/lib -name '*.so' -type l -print -delete
+ 	find debian/calligra/usr/lib -name '*.so' -type l -print -delete
  	# - headers
- 	rm -rfv debian/tmp/usr/include
+ 	rm -rfv debian/calligra/usr/include
  	# - cmake configuration files
- 	rm -rfv debian/tmp/usr/share/kde4/apps/cmake
+ 	rm -rfv debian/calligra/usr/share/kde4/apps/cmake
  	# Remove mimetypes already provided by shared-mime-info
- 	rm -f debian/tmp/usr/share/mime/packages/msooxml-all.xml
- 	rm -f debian/tmp/usr/share/mime/packages/x-iwork-keynote-sffkey.xml
+ 	rm -f debian/calligra/usr/share/mime/packages/msooxml-all.xml
+ 	rm -f debian/calligra/usr/share/mime/packages/x-iwork-keynote-sffkey.xml
  	# remove calligra plan translations now in separated plan source
- 	rm -f debian/tmp/usr/share/locale/*/*/*plan*
+ 	rm -f debian/calligra/usr/share/locale/*/*/*plan*
  
  
 -override_dh_link:
 +#override_dh_link:
  	# the calligra-gemini components are installed in a multi-arch library
  	# directory, but kdelibs 4.x does not support that -- instead,
  	# create a simple symlink to avoid shuffling things too much


More information about the Neon-commits mailing list