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

Pino Toscano pino at moszumanska.debian.org
Thu Feb 1 17:24:13 UTC 2018


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

The following commit has been merged in the master branch:
commit b65f41d134c2ef9be868febefc3c590dc0bde15c
Author: Pino Toscano <pino at debian.org>
Date:   Sun Jan 28 22:54:21 2018 +0100

    drop braindump & calligraplan
---
 debian/braindump.install              | 14 ------
 debian/braindump.lintian-overrides    |  4 --
 debian/braindump.manpages             |  1 -
 debian/calligraplan.install           | 42 -----------------
 debian/calligraplan.lintian-overrides | 14 ------
 debian/calligraplan.manpages          |  2 -
 debian/changelog                      |  3 ++
 debian/control                        | 30 +-----------
 debian/man/braindump.1                | 83 ---------------------------------
 debian/man/braindump.rst              | 45 ------------------
 debian/man/calligraplan.1             | 86 -----------------------------------
 debian/man/calligraplan.rst           | 48 -------------------
 debian/man/calligraplanwork.1         | 85 ----------------------------------
 debian/man/calligraplanwork.rst       | 47 -------------------
 14 files changed, 5 insertions(+), 499 deletions(-)

diff --git a/debian/braindump.install b/debian/braindump.install
deleted file mode 100644
index b613d64..0000000
--- a/debian/braindump.install
+++ /dev/null
@@ -1,14 +0,0 @@
-usr/bin/braindump
-usr/lib/*/libbraindumpcore.so.1*
-usr/lib/*/qt5/plugins/calligra/shapes/braindump_shape_state.so
-usr/lib/*/qt5/plugins/calligra/shapes/braindump_shape_web.so
-usr/share/applications/org.kde.braindump.desktop
-usr/share/calligra/icons/hicolor/*/actions/stateshape.png
-usr/share/calligra/icons/hicolor/*/actions/statetool.png
-usr/share/calligra/icons/hicolor/scalable/actions/stateshape.svg
-usr/share/calligra_shape_state/
-usr/share/icons/hicolor/*/apps/braindump.png
-usr/share/icons/hicolor/scalable/apps/braindump.svgz
-usr/share/kxmlgui5/braindump/braindumpui.rc
-usr/share/kxmlgui5/braindump/braindumpview.rc
-usr/share/metainfo/org.kde.braindump.appdata.xml
diff --git a/debian/braindump.lintian-overrides b/debian/braindump.lintian-overrides
deleted file mode 100644
index 3d9b856..0000000
--- a/debian/braindump.lintian-overrides
+++ /dev/null
@@ -1,4 +0,0 @@
-# private library
-no-symbols-control-file *
-# private library
-package-name-doesnt-match-sonames *
diff --git a/debian/braindump.manpages b/debian/braindump.manpages
deleted file mode 100644
index 6e797ef..0000000
--- a/debian/braindump.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/braindump.1
diff --git a/debian/calligraplan.install b/debian/calligraplan.install
deleted file mode 100644
index b62f62d..0000000
--- a/debian/calligraplan.install
+++ /dev/null
@@ -1,42 +0,0 @@
-etc/xdg/calligraplanrc
-etc/xdg/calligraplanworkrc
-usr/bin/calligraplan
-usr/bin/calligraplanwork
-usr/lib/*/libkdeinit5_calligraplan.so
-usr/lib/*/libkdeinit5_calligraplanwork.so
-usr/lib/*/libkplatokernel.so.1*
-usr/lib/*/libkplatomodels.so.1*
-usr/lib/*/libkplatoui.so.1*
-usr/lib/*/libplanprivate.so.1*
-usr/lib/*/libplanworkfactory.so.1*
-usr/lib/*/qt5/plugins/calligra/formatfilters/planicalexport.so
-usr/lib/*/qt5/plugins/calligra/formatfilters/plankplatoimport.so
-usr/lib/*/qt5/plugins/calligra/parts/calligraplanpart.so
-usr/lib/*/qt5/plugins/calligraplan/extensions/libkrossmoduleplan.so
-usr/lib/*/qt5/plugins/calligraplan/schedulers/libplantjscheduler.so
-usr/lib/*/qt5/plugins/calligraplanworkpart.so
-usr/lib/*/qt5/plugins/kreport/planreport_textplugin.so
-usr/share/applications/org.kde.calligraplan.desktop
-usr/share/applications/org.kde.calligraplanwork.desktop
-usr/share/calligraplan/
-usr/share/calligraplanwork/
-usr/share/config.kcfg/calligraplansettings.kcfg
-usr/share/config.kcfg/calligraplanworksettings.kcfg
-usr/share/icons/hicolor/*/apps/calligraplan.png
-usr/share/icons/hicolor/*/apps/calligraplanwork.png
-usr/share/icons/hicolor/*/mimetypes/application-x-vnd.kde.kplato.png
-usr/share/icons/hicolor/*/mimetypes/application-x-vnd.kde.kplato.work.png
-usr/share/icons/hicolor/*/mimetypes/application-x-vnd.kde.plan.png
-usr/share/icons/hicolor/*/mimetypes/application-x-vnd.kde.plan.work.png
-usr/share/icons/hicolor/scalable/apps/calligraplan.svgz
-usr/share/icons/hicolor/scalable/apps/calligraplanwork.svgz
-usr/share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.kplato.svgz
-usr/share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.kplato.work.svgz
-usr/share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.plan.svgz
-usr/share/icons/hicolor/scalable/mimetypes/application-x-vnd.kde.plan.work.svgz
-usr/share/kxmlgui5/calligraplan/calligraplan.rc
-usr/share/kxmlgui5/calligraplan/calligraplan_readonly.rc
-usr/share/kxmlgui5/calligraplanwork/calligraplanwork.rc
-usr/share/kxmlgui5/calligraplanwork/calligraplanwork_readonly.rc
-usr/share/kxmlgui5/calligraplanwork/calligraplanworkui.rc
-usr/share/metainfo/org.kde.calligraplan.appdata.xml
diff --git a/debian/calligraplan.lintian-overrides b/debian/calligraplan.lintian-overrides
deleted file mode 100644
index 2f0b7a1..0000000
--- a/debian/calligraplan.lintian-overrides
+++ /dev/null
@@ -1,14 +0,0 @@
-# private library
-no-symbols-control-file *
-# private library
-package-name-doesnt-match-sonames *
-calligraplan: unusual-interpreter usr/share/calligraplan/scripts/extensions/busyinfoclear.py #!kross
-calligraplan: unusual-interpreter usr/share/calligraplan/scripts/extensions/busyinfoexport.py #!kross
-calligraplan: unusual-interpreter usr/share/calligraplan/scripts/extensions/busyinfoimport.py #!kross
-calligraplan: unusual-interpreter usr/share/calligraplan/scripts/extensions/resourcesimport.py #!kross
-calligraplan: unusual-interpreter usr/share/calligraplan/scripts/samples/sample_busyinfocheck.py #!kross
-calligraplan: unusual-interpreter usr/share/calligraplan/scripts/samples/sample_project.py #!kross
-calligraplan: unusual-interpreter usr/share/calligraplan/scripts/extensions/plan2csvexport.py #!kross
-calligraplan: unusual-interpreter usr/share/calligraplan/scripts/extensions/plan2odsexport.py #!kross
-shlib-without-versioned-soname usr/lib/*/libkdeinit5_calligraplan.so libkdeinit5_calligraplan.so
-shlib-without-versioned-soname usr/lib/*/libkdeinit5_calligraplanwork.so libkdeinit5_calligraplanwork.so
diff --git a/debian/calligraplan.manpages b/debian/calligraplan.manpages
deleted file mode 100644
index 7cc933a..0000000
--- a/debian/calligraplan.manpages
+++ /dev/null
@@ -1,2 +0,0 @@
-debian/man/calligraplan.1
-debian/man/calligraplanwork.1
diff --git a/debian/changelog b/debian/changelog
index 63883cf..740f8b7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -8,6 +8,9 @@ calligra (1:3.1.0+dfsg-0r1) UNRELEASED; urgency=medium
     - add libkf5archive-dev, libx11-dev: already used, but installed by some
       other package
     - remove libkgantt-dev, and libpoppler-qt5-dev: no more used
+  * Drop the braindump binary, since it is disabled upstream.
+  * Drop the calligraplan binary, since a newer version of it is going to be
+    provided by a separate calligraplan source.
   * Drop from debian/tmp the stuff belonging to the unported calligraflow
     (they are not shipped, anyway).
   * Do not ship calligra_filter_odt2docx.desktop, since it is not an
diff --git a/debian/control b/debian/control
index 294bdf3..ed764ca 100644
--- a/debian/control
+++ b/debian/control
@@ -87,9 +87,8 @@ Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/calligra/calligra.git
 
 Package: calligra
 Architecture: all
-Depends: braindump (>= ${source:Version}),
-         calligraplan (>= ${source:Version}),
-         calligrasheets (>= ${source:Version}),
+Depends: calligrasheets (>= ${source:Version}),
+#         calligraplan (>= ${source:Version}),
          calligrastage (>= ${source:Version}),
          calligrawords (>= ${source:Version}),
          karbon (>= ${source:Version}),
@@ -169,19 +168,6 @@ Description: spreadsheet for the Calligra Suite
  .
  This package is part of the Calligra Suite.
 
-Package: calligraplan
-Architecture: any
-Depends: calligra-libs (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Suggests: khelpcenter
-Homepage: http://www.calligra.org/plan/
-Description: integrated project management and planning tool
- Plan is a project management application, allowing for the planning and
- scheduling of projects. It was formerly known as KPlato.
- .
- This package is part of the Calligra Suite.
-
 Package: calligrawords
 Architecture: any
 Section: text
@@ -247,18 +233,6 @@ Description: data files for Calligra Stage
  .
  This package is part of the Calligra Suite.
 
-Package: braindump
-Architecture: any
-Depends: calligra-libs (= ${binary:Version}),
-         ${misc:Depends},
-         ${shlibs:Depends}
-Homepage: http://www.calligra.org/braindump/
-Description: ideas organizer application for the Calligra Suite
- BrainDump is a tool to help to organize the ideas from your brain to your
- computer.
- .
- This package is part of the Calligra Suite.
-
 Package: calligra-libs
 Section: libs
 Architecture: any
diff --git a/debian/man/braindump.1 b/debian/man/braindump.1
deleted file mode 100644
index d9863ea..0000000
--- a/debian/man/braindump.1
+++ /dev/null
@@ -1,83 +0,0 @@
-.\" Man page generated from reStructeredText.
-.
-.TH BRAINDUMP 1 "11 septembre 2011" "" "office"
-.SH NAME
-Braindump \- Directly from your brain to the computer
-.
-.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
-braindump [Qt\-options] [KDE\-options]
-.UNINDENT
-.UNINDENT
-.SH DESCRIPTION
-.sp
-BrainDump is a tool to help to organize the ideas from your brain to your computer.
-.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
-.SH SEE ALSO
-.sp
-More detailed user documentation is available from 
Bhelp:/braindump
P (either enter this URL into Konqueror, or run 
Bkhelpcenter
P 
Ihelp:/braindump
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/braindump.rst b/debian/man/braindump.rst
deleted file mode 100644
index d6850a3..0000000
--- a/debian/man/braindump.rst
+++ /dev/null
@@ -1,45 +0,0 @@
-=========
-Braindump 
-=========
-
------------------------------------------
-Directly from your brain to the computer
------------------------------------------
-
-: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
-========
-
-  braindump [Qt-options] [KDE-options]
-
-Description
-===========
-
-BrainDump is a tool to help to organize the ideas from your brain to your computer.
-
-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
-
-
-SEE ALSO
-=========
-
-More detailed user documentation is available from **help:/braindump** (either enter this URL into Konqueror, or run **khelpcenter** *help:/braindump*).
-
-
-.. |date| date:: %y %B %Y
diff --git a/debian/man/calligraplan.1 b/debian/man/calligraplan.1
deleted file mode 100644
index 24f1c87..0000000
--- a/debian/man/calligraplan.1
+++ /dev/null
@@ -1,86 +0,0 @@
-.\" Man page generated from reStructeredText.
-.
-.TH CALLIGRAPLAN 1 "11 septembre 2011" "" "office"
-.SH NAME
-CalligraPlan \- KDE Project Planning and Management 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
-calligraplan [Qt\-options] [KDE\-options] [Calligra\-options] [file]
-.UNINDENT
-.UNINDENT
-.SH DESCRIPTION
-.sp
-Plan is a project management application, allowing for the planning and
-scheduling of projects. It is the successor of KPlato.
-.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:/calligraplan
P (either enter this URL into Konqueror, or run 
Bkhelpcenter
P 
Ihelp:/calligraplan
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/calligraplan.rst b/debian/man/calligraplan.rst
deleted file mode 100644
index 8debde6..0000000
--- a/debian/man/calligraplan.rst
+++ /dev/null
@@ -1,48 +0,0 @@
-============
-CalligraPlan 
-============
-
-----------------------------------------
-KDE Project Planning and Management 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
-========
-
-  calligraplan [Qt-options] [KDE-options] [Calligra-options] [file]
-
-Description
-===========
-
-Plan is a project management application, allowing for the planning and
-scheduling of projects. It is the successor of KPlato.
-
-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:/calligraplan** (either enter this URL into Konqueror, or run **khelpcenter** *help:/calligraplan*).
-
-
-.. |date| date:: %y %B %Y
diff --git a/debian/man/calligraplanwork.1 b/debian/man/calligraplanwork.1
deleted file mode 100644
index c52508d..0000000
--- a/debian/man/calligraplanwork.1
+++ /dev/null
@@ -1,85 +0,0 @@
-.\" Man page generated from reStructeredText.
-.
-.TH PLANWORK 1 "11 septembre 2011" "" "office"
-.SH NAME
-PlanWork \- Work Package handler for the Plan Project Planning 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
-calligraplanwork [Qt\-options] [KDE\-options] [Calligra\-options] [file]
-.UNINDENT
-.UNINDENT
-.SH DESCRIPTION
-.sp
-PlanWork is part of calligraplan.
-.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:/calligraplan
P (either enter this URL into Konqueror, or run 
Bkhelpcenter
P 
Ihelp:/calligraplan
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/calligraplanwork.rst b/debian/man/calligraplanwork.rst
deleted file mode 100644
index 5c59a22..0000000
--- a/debian/man/calligraplanwork.rst
+++ /dev/null
@@ -1,47 +0,0 @@
-========
-PlanWork 
-========
-
--------------------------------------------------------
-Work Package handler for the Plan Project Planning 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
-========
-
-  calligraplanwork [Qt-options] [KDE-options] [Calligra-options] [file]
-
-Description
-===========
-
-PlanWork is part of calligraplan.
-
-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:/calligraplan** (either enter this URL into Konqueror, or run **khelpcenter** *help:/calligraplan*).
-
-
-.. |date| date:: %y %B %Y

-- 
Calligra suite packaging



More information about the pkg-kde-commits mailing list