[SCM] Calligra suite packaging branch, master, updated. debian/3.0.1+dfsg-2

Pino Toscano pino at moszumanska.debian.org
Wed Sep 6 06:50:39 UTC 2017


Gitweb-URL: http://git.debian.org/?p=pkg-kde/calligra/calligra.git;a=commitdiff;h=9b13fbb

The following commit has been merged in the master branch:
commit 9b13fbbbf63e252680b680fc9697d1fd2d03031b
Author: Pino Toscano <pino at debian.org>
Date:   Sun Aug 20 12:52:38 2017 +0200

    remove unported/dropped components
---
 debian/calligra-gemini-data.install           |  1 -
 debian/calligra-gemini-data.links             | 25 -------
 debian/calligra-gemini-data.lintian-overrides |  4 --
 debian/calligra-gemini.install                |  7 --
 debian/calligra-semanticitems.install         |  6 --
 debian/calligraactive.install                 |  3 -
 debian/calligraactive.manpages                |  1 -
 debian/calligraauthor.install                 |  9 ---
 debian/calligraauthor.manpages                |  1 -
 debian/calligraflow-data.install              |  5 --
 debian/calligraflow.install                   | 17 -----
 debian/calligraflow.lintian-overrides         |  2 -
 debian/calligraflow.manpages                  |  1 -
 debian/changelog                              |  5 ++
 debian/control                                | 96 ---------------------------
 debian/man/calligraactive.1                   | 78 ----------------------
 debian/man/calligraactive.rst                 | 48 --------------
 debian/man/calligraauthor.1                   | 81 ----------------------
 debian/man/calligraauthor.rst                 | 52 ---------------
 debian/man/calligraflow.1                     | 87 ------------------------
 debian/man/calligraflow.rst                   | 49 --------------
 debian/rules                                  | 11 ---
 22 files changed, 5 insertions(+), 584 deletions(-)

diff --git a/debian/calligra-gemini-data.install b/debian/calligra-gemini-data.install
deleted file mode 100644
index ea672cf..0000000
--- a/debian/calligra-gemini-data.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/share/kde4/apps/calligragemini
diff --git a/debian/calligra-gemini-data.links b/debian/calligra-gemini-data.links
deleted file mode 100644
index 660b446..0000000
--- a/debian/calligra-gemini-data.links
+++ /dev/null
@@ -1,25 +0,0 @@
-## texlive-fonts-extra:
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-Black.otf
-        /usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-Black.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-BlackIt.otf
-        /usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-BlackIt.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-Bold.otf
-        /usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-Bold.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-BoldIt.otf
-        /usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-BoldIt.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-ExtraLight.otf
-        /usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-ExtraLight.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-ExtraLightIt.otf
-        /usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-ExtraLightIt.otf
-#/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-It.otf
-#        /usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-It.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-Light.otf
-        /usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-Light.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-LightIt.otf
-        /usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-LightIt.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-Regular.otf
-        /usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-Regular.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-Semibold.otf
-        /usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-Semibold.otf
-/usr/share/texlive/texmf-dist/fonts/opentype/adobe/sourcesanspro/SourceSansPro-SemiboldIt.otf
-        /usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-SemiboldIt.otf
diff --git a/debian/calligra-gemini-data.lintian-overrides b/debian/calligra-gemini-data.lintian-overrides
deleted file mode 100644
index 03d715e..0000000
--- a/debian/calligra-gemini-data.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-## texlive-fonts-extra
-package-contains-broken-symlink usr/share/kde4/apps/calligragemini/themes/default/fonts/SourceSansPro-* *
-# private font
-font-in-non-font-package
diff --git a/debian/calligra-gemini.install b/debian/calligra-gemini.install
deleted file mode 100644
index 5308014..0000000
--- a/debian/calligra-gemini.install
+++ /dev/null
@@ -1,7 +0,0 @@
-usr/bin/calligragemini
-usr/bin/calligrageminithumbnailhelper
-usr/lib/*/calligra/imports/Calligra/Gemini/
-usr/lib/*/calligra/imports/org/calligra/CalligraComponents/libcalligraqtquickcomponentsplugin.so
-usr/lib/*/calligra/imports/org/calligra/CalligraComponents/qmldir
-usr/share/applications/kde4/calligragemini.desktop
-usr/share/icons/hicolor/*x*/apps/calligragemini.png
diff --git a/debian/calligra-semanticitems.install b/debian/calligra-semanticitems.install
deleted file mode 100644
index 8f4ea3c..0000000
--- a/debian/calligra-semanticitems.install
+++ /dev/null
@@ -1,6 +0,0 @@
-usr/lib/kde4/calligra_semanticitem_contact.so
-usr/lib/kde4/calligra_semanticitem_event.so
-usr/lib/kde4/calligra_semanticitem_location.so
-usr/share/kde4/services/calligra/calligra_semanticitem_contact.desktop
-usr/share/kde4/services/calligra/calligra_semanticitem_event.desktop
-usr/share/kde4/services/calligra/calligra_semanticitem_location.desktop
diff --git a/debian/calligraactive.install b/debian/calligraactive.install
deleted file mode 100644
index 85fbe20..0000000
--- a/debian/calligraactive.install
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/bin/calligraactive
-usr/share/applications/kde4/calligraactive.desktop
-usr/share/calligraactive/qml/
diff --git a/debian/calligraactive.manpages b/debian/calligraactive.manpages
deleted file mode 100644
index dbcc360..0000000
--- a/debian/calligraactive.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/calligraactive.1
diff --git a/debian/calligraauthor.install b/debian/calligraauthor.install
deleted file mode 100644
index 40ad830..0000000
--- a/debian/calligraauthor.install
+++ /dev/null
@@ -1,9 +0,0 @@
-usr/bin/calligraauthor
-usr/lib/kde4/authorpart.so
-usr/lib/libkdeinit4_calligraauthor.so
-usr/share/applications/kde4/author.desktop
-usr/share/icons/hicolor/*/apps/calligraauthor.png
-usr/share/icons/hicolor/scalable/apps/calligraauthor.svgz
-usr/share/kde4/apps/author/
-usr/share/kde4/config/authorrc
-usr/share/kde4/services/calligra/authorpart.desktop
diff --git a/debian/calligraauthor.manpages b/debian/calligraauthor.manpages
deleted file mode 100644
index 68a7d8f..0000000
--- a/debian/calligraauthor.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/calligraauthor.1
diff --git a/debian/calligraflow-data.install b/debian/calligraflow-data.install
deleted file mode 100644
index 4e58aa2..0000000
--- a/debian/calligraflow-data.install
+++ /dev/null
@@ -1,5 +0,0 @@
-usr/share/icons/hicolor/*/apps/calligraflow.png
-usr/share/icons/hicolor/scalable/apps/calligraflow.svgz
-usr/share/kde4/apps/flow
-usr/share/kde4/config/flow_stencils.knsrc
-usr/share/kde4/config/flowrc
diff --git a/debian/calligraflow.install b/debian/calligraflow.install
deleted file mode 100644
index 59edd23..0000000
--- a/debian/calligraflow.install
+++ /dev/null
@@ -1,17 +0,0 @@
-usr/bin/calligraflow
-usr/lib/kde4/calligra_filter_vsdx2odg.so
-usr/lib/kde4/calligra_filter_wpg2odg.so
-usr/lib/kde4/flowdockersplugin.so
-usr/lib/kde4/flowpart.so
-usr/lib/libflowprivate.so.1*
-usr/lib/libkdeinit4_calligraflow.so
-usr/share/appdata/flow.appdata.xml
-usr/share/applications/kde4/flow.desktop
-usr/share/kde4/services/ServiceMenus/calligra/flow_print.desktop
-usr/share/kde4/services/calligra/calligra_filter_vsdx2odg.desktop
-usr/share/kde4/services/calligra/calligra_filter_wpg2odg.desktop
-usr/share/kde4/services/calligra/flowdockersplugin.desktop
-usr/share/kde4/services/calligra/flowpart.desktop
-usr/share/kde4/services/flow_vsdx_thumbnail.desktop
-usr/share/kde4/services/flow_wpg_thumbnail.desktop
-usr/share/kde4/servicetypes/flow_dock.desktop
diff --git a/debian/calligraflow.lintian-overrides b/debian/calligraflow.lintian-overrides
deleted file mode 100644
index 0293554..0000000
--- a/debian/calligraflow.lintian-overrides
+++ /dev/null
@@ -1,2 +0,0 @@
-no-symbols-control-file *
-package-name-doesnt-match-sonames *
diff --git a/debian/calligraflow.manpages b/debian/calligraflow.manpages
deleted file mode 100644
index cffbc6b..0000000
--- a/debian/calligraflow.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/calligraflow.1
diff --git a/debian/changelog b/debian/changelog
index 0ed4889..52e44c1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -29,6 +29,11 @@ calligra (1:3.0.1+dfsg-0r1) UNRELEASED; urgency=medium
       libkf5windowsystem-dev, libkf5xmlgui-dev, kross-dev, libkchart-dev,
       libkgantt-dev, libkproperty3-dev,  libkreport3-dev,  libpoppler-qt5-dev,
       and libqca-qt5-2-dev
+  * Drop the calligraflow, calligraflow-data, calligraactive,
+    calligra-semanticitems, calligraauthor, calligra-gemini, and
+    calligra-gemini-data binaries, since all refer to unported/dropped
+    stuff
+    - remove symlinking done in calligra-gemini
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 19 Aug 2017 15:51:55 +0200
 
diff --git a/debian/control b/debian/control
index eb38989..c63fa11 100644
--- a/debian/control
+++ b/debian/control
@@ -91,8 +91,6 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/calligra/calligra.git
 Package: calligra
 Architecture: all
 Depends: braindump (>= ${source:Version}),
-         calligraauthor (>= ${source:Version}),
-         calligraflow (>= ${source:Version}),
          calligraplan (>= ${source:Version}),
          calligrasheets (>= ${source:Version}),
          calligrastage (>= ${source:Version}),
@@ -101,7 +99,6 @@ Depends: braindump (>= ${source:Version}),
 #         kexi (>= ${source:Version}),
 #         krita (>= ${source:Version}),
          ${misc:Depends}
-Recommends: calligra-semanticitems
 Homepage: http://www.calligra.org
 Description: extensive productivity and creative suite
  Calligra Suite is a set of applications written to help you to accomplish
@@ -259,34 +256,6 @@ Description: data files for Calligra Stage
  .
  This package is part of the Calligra Suite.
 
-Package: calligraflow
-Architecture: any
-Section: graphics
-Depends: calligra-libs (= ${binary:Version}),
-         calligraflow-data (>= ${source:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Homepage: http://www.calligra.org/flow/
-Description: flowcharting program for the Calligra Suite
- Flow offers basic flowcharting abilities, but with a twist. Objects are
- scriptable, and a backend plugin system offers the ability to make objects
- do just about anything.
- .
- This package is part of the Calligra Suite.
-
-Package: calligraflow-data
-Architecture: all
-Section: graphics
-Depends: ${misc:Depends}
-Homepage: http://www.calligra.org/flow/
-Description: data files for Flow flowcharting program
- This package contains architecture-independent data files for Flow,
- the flowcharting program shipped with the Calligra Suite.
- .
- See the calligraflow package for further information.
- .
- This package is part of the Calligra Suite.
-
 Package: braindump
 Architecture: any
 Depends: calligra-libs (= ${binary:Version}),
@@ -299,17 +268,6 @@ Description: ideas organizer application for the Calligra Suite
  .
  This package is part of the Calligra Suite.
 
-Package: calligraactive
-Architecture: any
-Depends: calligra-libs (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: Tablet version of Calligra
- Calligra Active is a project to bring Calligra to the Plasma Active Desktop,
- designed for tablets, smartphones, and touching devices.
- .
- This package is part of the Calligra Suite.
-
 Package: calligra-libs
 Section: libs
 Architecture: any
@@ -324,17 +282,6 @@ Description: common libraries and binaries for the Calligra Suite
  .
  This package is part of the Calligra Suite.
 
-Package: calligra-semanticitems
-Section: libs
-Architecture: any
-Depends: calligra-libs (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Description: semantic item plugins for the Calligra Suite
- This package provides the semantic item plugins for Calligra.
- .
- This package is part of the Calligra Suite.
-
 Package: calligra-data
 Section: libs
 Architecture: all
@@ -373,46 +320,3 @@ Description: Okular backend for ODT documents
  (ODT) documents, but also DOC, DOCX and WPD documents.
  .
  This package is part of the Calligra Suite.
-
-Package: calligraauthor
-Architecture: any
-Section: text
-Depends: calligra-libs (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Suggests: khelpcenter
-Description: Authoring tool for the Calligra Suite
- A specialized tool for serious writers, like novelists or textbook writers,
- aiming to become what Krita is for painters. The application will support a
- writer in the process of creating an eBook from concept to publication.
- Calligra Author will provide interactive content elements like multimedia,
- 2D and 3D animations, embedded web content and support for javascript
- scripting.
- .
- This package is part of the Calligra Suite.
-
-Package: calligra-gemini
-Architecture: any
-Depends: calligra-libs (= ${binary:Version}),
-         calligra-gemini-data (>= ${source:Version}),
-         libqtwebkit-qmlwebkitplugin,
-         ${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.
- .
- This package is part of the Calligra Suite.
-
-Package: calligra-gemini-data
-Architecture: all
-Depends: ${misc:Depends}, texlive-fonts-extra
-Homepage: https://www.calligra.org/gemini/
-Description: Calligra Gemini - data files
- Calligra Gemini provide a unified applications which combines
- traditional desktop application and touch friendly interface for
- the Words and Stage components.
- .
- This package provides data files for Calligra Gemini.
diff --git a/debian/man/calligraactive.1 b/debian/man/calligraactive.1
deleted file mode 100644
index a6acaee..0000000
--- a/debian/man/calligraactive.1
+++ /dev/null
@@ -1,78 +0,0 @@
-.\" Man page generated from reStructuredText.
-.
-.TH CALLIGRAACTIVE 1 "13 juillet 2013" "" "office"
-.SH NAME
-CalligraActive \- Bring Calligra to the smarphones and Tablets
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\$1 \n[an-margin]
-level \n[rst2man-indent-level]
-level margin: \n[rst2man-indent\n[rst2man-indent-level]]
--
-\n[rst2man-indent0]
-\n[rst2man-indent1]
-\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \$1
-. nr rst2man-indent\n[rst2man-indent-level] \n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \n[an-margin]
-.\" old: \n[rst2man-indent\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \n[rst2man-indent\n[rst2man-indent-level]]
-.in \n[rst2man-indent\n[rst2man-indent-level]]u
-..
-.SH SYNOPSIS
-.INDENT 0.0
-.INDENT 3.5
-calligraactive [Qt\-options] [KDE\-options] [file]
-.UNINDENT
-.UNINDENT
-.SH DESCRIPTION
-.sp
-Calligra Active aims to port the Calligra Office suite to the tablets and smartphones, using the QML technology.
-.SH OPTIONS
-.sp
-Generic options:
-.INDENT 0.0
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-kde
-Show KDE specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v,  \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.UNINDENT
-.sp
-Arguments:
-.sp
-file                      File to open
-.SH SEE ALSO
-.sp
-More detailed user documentation is available on the website 
I\%http://calligra.org
P.
-.SH AUTHOR
-This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
-.\" Generated by docutils manpage writer.
-.
diff --git a/debian/man/calligraactive.rst b/debian/man/calligraactive.rst
deleted file mode 100644
index fb370c8..0000000
--- a/debian/man/calligraactive.rst
+++ /dev/null
@@ -1,48 +0,0 @@
-===============
-CalligraActive 
-===============
-
----------------------------------------------
-Bring Calligra to the smarphones and Tablets
----------------------------------------------
-
-:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
-:Date: |date|
-:Manual section: 1
-:Manual group: office
-
-
-Synopsis
-========
-
-  calligraactive [Qt-options] [KDE-options] [file]
-
-Description
-===========
-
-Calligra Active aims to port the Calligra Office suite to the tablets and smartphones, using the QML technology.
-
-Options
-=======
-
-Generic options:
-
---help                    Show help about options
---help-qt                 Show Qt specific options
---help-kde                Show KDE specific options
---help-all                Show all options
---author                  Show author information
--v, --version             Show version information
---license                 Show license information
-
-Arguments:
-
-file                      File to open
-
-SEE ALSO
-=========
-
-More detailed user documentation is available on the website http://calligra.org.
-
-
-.. |date| date:: %y %B %Y
diff --git a/debian/man/calligraauthor.1 b/debian/man/calligraauthor.1
deleted file mode 100644
index 4562a6a..0000000
--- a/debian/man/calligraauthor.1
+++ /dev/null
@@ -1,81 +0,0 @@
-.\" Man page generated from reStructeredText.
-.
-.TH CALLIGRAWORDS 1 "13 mai 2013" "" "office"
-.SH NAME
-CalligraWords \- Calligra Word Processor
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\$1 \n[an-margin]
-level \n[rst2man-indent-level]
-level margin: \n[rst2man-indent\n[rst2man-indent-level]]
--
-\n[rst2man-indent0]
-\n[rst2man-indent1]
-\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \$1
-. nr rst2man-indent\n[rst2man-indent-level] \n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \n[an-margin]
-.\" old: \n[rst2man-indent\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \n[rst2man-indent\n[rst2man-indent-level]]
-.in \n[rst2man-indent\n[rst2man-indent-level]]u
-..
-.SH SYNOPSIS
-.sp
-calligrawords [Qt\-options] [KDE\-options] [Calligra\-options] [file]
-.SH DESCRIPTION
-.sp
-Calligra Author is a specialized tool for serious writers aiming to become what
-Krita is for painters. The application will support a writer in the process of
-creating an eBook from concept to publication.
-.SH OPTIONS
-.sp
-Generic options:
-.INDENT 0.0
-.TP
-.B \-\-help
-Show help about options
-.TP
-.B \-\-help\-qt
-Show Qt specific options
-.TP
-.B \-\-help\-kde
-Show KDE specific options
-.TP
-.B \-\-help\-calligra
-Show Calligra specific options
-.TP
-.B \-\-help\-all
-Show all options
-.TP
-.B \-\-author
-Show author information
-.TP
-.B \-v,  \-\-version
-Show version information
-.TP
-.B \-\-license
-Show license information
-.UNINDENT
-.sp
-Arguments:
-.sp
-
Bfile
P                  File to open
-.SH SEE ALSO
-.sp
-More detailed user documentation is available at 
I\%http://www.calligra.org/news/calligra\-announces\-author/
P
-.SH AUTHOR
-This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
-.\" Generated by docutils manpage writer.
-.\" 
-.
diff --git a/debian/man/calligraauthor.rst b/debian/man/calligraauthor.rst
deleted file mode 100644
index 8a64aa5..0000000
--- a/debian/man/calligraauthor.rst
+++ /dev/null
@@ -1,52 +0,0 @@
-=============
-CalligraWords
-=============
-
-------------------------
-Calligra Word Processor
-------------------------
-
-:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
-:Date: |date|
-:Manual section: 1
-:Manual group: office
-
-
-Synopsis
-========
-
-calligrawords [Qt-options] [KDE-options] [Calligra-options] [file]
-
-Description
-===========
-
-Calligra Author is a specialized tool for serious writers aiming to become what
-Krita is for painters. The application will support a writer in the process of 
-creating an eBook from concept to publication.
-
-Options
-=======
-
-Generic options:
-
---help                    Show help about options
---help-qt                 Show Qt specific options
---help-kde                Show KDE specific options
---help-calligra           Show Calligra specific options
---help-all                Show all options
---author                  Show author information
--v, --version             Show version information
---license                 Show license information
-
-Arguments:
-
-**file**                  File to open
-
-
-SEE ALSO
-=========
-
-More detailed user documentation is available at http://www.calligra.org/news/calligra-announces-author/
-
-
-.. |date| date:: %y %B %Y
diff --git a/debian/man/calligraflow.1 b/debian/man/calligraflow.1
deleted file mode 100644
index fa09d04..0000000
--- a/debian/man/calligraflow.1
+++ /dev/null
@@ -1,87 +0,0 @@
-.\" Man page generated from reStructeredText.
-.
-.TH CALLIGRAFLOW 1 "11 septembre 2011" "" "office"
-.SH NAME
-CalligraFlow \- Calligra Flowchart And Diagram Tool
-.
-.nr rst2man-indent-level 0
-.
-.de1 rstReportMargin
-\$1 \n[an-margin]
-level \n[rst2man-indent-level]
-level margin: \n[rst2man-indent\n[rst2man-indent-level]]
--
-\n[rst2man-indent0]
-\n[rst2man-indent1]
-\n[rst2man-indent2]
-..
-.de1 INDENT
-.\" .rstReportMargin pre:
-. RS \$1
-. nr rst2man-indent\n[rst2man-indent-level] \n[an-margin]
-. nr rst2man-indent-level +1
-.\" .rstReportMargin post:
-..
-.de UNINDENT
-. RE
-.\" indent \n[an-margin]
-.\" old: \n[rst2man-indent\n[rst2man-indent-level]]
-.nr rst2man-indent-level -1
-.\" new: \n[rst2man-indent\n[rst2man-indent-level]]
-.in \n[rst2man-indent\n[rst2man-indent-level]]u
-..
-.SH SYNOPSIS
-.INDENT 0.0
-.INDENT 3.5
-.sp
-calligraflow [Qt\-options] [KDE\-options] [Calligra\-options] [file]
-.UNINDENT
-.UNINDENT
-.SH DESCRIPTION
-.sp
-Flow is a flowcharting program that offers basic flowcharting abilities,
-but with a twist.  Objects are scriptable, and a backend plugin system
-offers the ability to make objects do just about anything.
-.SH OPTIONS
-.sp
-
Bfile
P  File to open
-.sp
-Generic options:
-.INDENT 0.0
-.TP
-.B \-\-help
-.
-Show help about options
-.TP
-.B \-\-help\-qt
-.
-Show Qt specific options
-.TP
-.B \-\-help\-kde
-.
-Show KDE specific options
-.TP
-.B \-\-help\-all
-.
-Show all options
-.TP
-.B \-\-author
-.
-Show author information
-.TP
-.B \-v,  \-\-version
-.
-Show version information
-.TP
-.B \-\-license
-.
-Show license information
-.UNINDENT
-.SH SEE ALSO
-.sp
-More detailed user documentation is available from 
Bhelp:/calligraflow
P (either enter this URL into Konqueror, or run 
Bkhelpcenter
P 
Ihelp:/calligraflow
P).
-.SH AUTHOR
-This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
-.\" Generated by docutils manpage writer.
-.\" 
-.
diff --git a/debian/man/calligraflow.rst b/debian/man/calligraflow.rst
deleted file mode 100644
index 27214b2..0000000
--- a/debian/man/calligraflow.rst
+++ /dev/null
@@ -1,49 +0,0 @@
-=============
-CalligraFlow 
-=============
-
------------------------------------
-Calligra Flowchart And Diagram Tool
------------------------------------
-
-:Author: This manual page was written by Adrien Grellier <perso at adrieng.fr> for the Debian project (but may be used by others).
-:Date: |date|
-:Manual section: 1
-:Manual group: office
-
-
-Synopsis
-========
-
-  calligraflow [Qt-options] [KDE-options] [Calligra-options] [file] 
-
-Description
-===========
-
-Flow is a flowcharting program that offers basic flowcharting abilities,
-but with a twist.  Objects are scriptable, and a backend plugin system
-offers the ability to make objects do just about anything.
-
-Options
-=======
-
-**file**  File to open
-
-Generic options:
-
---help                    Show help about options
---help-qt                 Show Qt specific options
---help-kde                Show KDE specific options
---help-all                Show all options
---author                  Show author information
--v, --version             Show version information
---license                 Show license information
-
-
-SEE ALSO
-=========
-
-More detailed user documentation is available from **help:/calligraflow** (either enter this URL into Konqueror, or run **khelpcenter** *help:/calligraflow*).
-
-
-.. |date| date:: %y %B %Y
diff --git a/debian/rules b/debian/rules
index 0533dc9..322967c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -8,8 +8,6 @@ lib_pkgs := calligra-libs
 export DEB_LDFLAGS_MAINT_APPEND := -Wl,--as-needed
 export QT_SELECT=4
 
-DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
-
 %:
 	dh $@ --parallel --with kde
 
@@ -34,15 +32,6 @@ override_dh_auto_install:
 override_dh_install:
 	dh_install --list-missing
 
-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
-	if [ -d debian/calligra-gemini ]; then \
-	    ln -s $(DEB_HOST_MULTIARCH)/calligra $(CURDIR)/debian/calligra-gemini/usr/lib/calligra; \
-	fi
-	dh_link
-
 override_dh_strip:
 	dh_strip --dbgsym-migration='calligra-dbg (<< 1:2.9.11)'
 

-- 
Calligra suite packaging



More information about the pkg-kde-commits mailing list