[SCM] Calligra suite packaging. branch, master, updated. 7e50034db68a2f8dbc13d50027f3f2d55a06a355
Pino Toscano
pino at alioth.debian.org
Thu Sep 15 19:12:29 UTC 2011
The following commit has been merged in the master branch:
commit 7e50034db68a2f8dbc13d50027f3f2d55a06a355
Author: Pino Toscano <pino at debian.org>
Date: Thu Sep 15 21:10:58 2011 +0200
kill calligra-doc-html
- make the application documentations entirely in the application (data) packages
- simplify .install files
- add proper conflict/replaces for koffice-doc-html in kexi and kthesaurus
---
debian/calligra-data.install | 2 -
debian/calligra-doc-html.install | 4 ---
debian/calligratables.install | 48 --------------------------------------
debian/control | 45 ++++++++++-------------------------
debian/kexi.install | 15 ------------
debian/kthesaurus.install | 2 -
6 files changed, 13 insertions(+), 103 deletions(-)
diff --git a/debian/calligra-data.install b/debian/calligra-data.install
index bd2c364..d95255b 100644
--- a/debian/calligra-data.install
+++ b/debian/calligra-data.install
@@ -2,8 +2,6 @@ usr/share/applications/kde4/calligra.desktop
usr/share/color/icc/pigment/CMY.icm
usr/share/color/icc/pigment/fogra27l.icm
usr/share/doc/kde/HTML/en/calligra
-usr/share/doc/kde/HTML/en/calligra/index.cache.bz2
-usr/share/doc/kde/HTML/en/calligra/index.docbook
usr/share/icons/oxygen/16x16/actions/object-align-horizontal-center-calligra.png
usr/share/icons/oxygen/16x16/actions/object-align-horizontal-left-calligra.png
usr/share/icons/oxygen/16x16/actions/object-align-horizontal-right-calligra.png
diff --git a/debian/calligra-doc-html.install b/debian/calligra-doc-html.install
deleted file mode 100644
index f9e34d1..0000000
--- a/debian/calligra-doc-html.install
+++ /dev/null
@@ -1,4 +0,0 @@
-usr/share/doc/kde/HTML/en/calligra/common
-usr/share/doc/kde/HTML/en/kexi/common
-usr/share/doc/kde/HTML/en/tables/common
-usr/share/doc/kde/HTML/en/thesaurus/common
diff --git a/debian/calligratables.install b/debian/calligratables.install
index 76d05da..29cd7c5 100644
--- a/debian/calligratables.install
+++ b/debian/calligratables.install
@@ -39,54 +39,6 @@ usr/lib/libcalligratablesodf.so.8.0.0
usr/lib/libkdeinit4_calligratables.so
usr/share/applications/kde4/tables.desktop
usr/share/doc/kde/HTML/en/tables
-usr/share/doc/kde/HTML/en/tables/a11y.docbook
-usr/share/doc/kde/HTML/en/tables/advanced.docbook
-usr/share/doc/kde/HTML/en/tables/basics.docbook
-usr/share/doc/kde/HTML/en/tables/cellformat0.png
-usr/share/doc/kde/HTML/en/tables/cellformat1.png
-usr/share/doc/kde/HTML/en/tables/cellformat2.png
-usr/share/doc/kde/HTML/en/tables/cellformat3.png
-usr/share/doc/kde/HTML/en/tables/cellformat4.png
-usr/share/doc/kde/HTML/en/tables/cellformat5.png
-usr/share/doc/kde/HTML/en/tables/cellformat6.png
-usr/share/doc/kde/HTML/en/tables/cellformat7.png
-usr/share/doc/kde/HTML/en/tables/cellprotection1.png
-usr/share/doc/kde/HTML/en/tables/cellprotection2.png
-usr/share/doc/kde/HTML/en/tables/chart1.png
-usr/share/doc/kde/HTML/en/tables/commands.docbook
-usr/share/doc/kde/HTML/en/tables/configdialog.docbook
-usr/share/doc/kde/HTML/en/tables/config.docbook
-usr/share/doc/kde/HTML/en/tables/configure1.png
-usr/share/doc/kde/HTML/en/tables/configure2.png
-usr/share/doc/kde/HTML/en/tables/configure3.png
-usr/share/doc/kde/HTML/en/tables/configure4.png
-usr/share/doc/kde/HTML/en/tables/configure5.png
-usr/share/doc/kde/HTML/en/tables/configure6.png
-usr/share/doc/kde/HTML/en/tables/copy1.png
-usr/share/doc/kde/HTML/en/tables/currency.png
-usr/share/doc/kde/HTML/en/tables/decreasedecimal.png
-usr/share/doc/kde/HTML/en/tables/faq.docbook
-usr/share/doc/kde/HTML/en/tables/format.docbook
-usr/share/doc/kde/HTML/en/tables/hideformula1.png
-usr/share/doc/kde/HTML/en/tables/hideformula2.png
-usr/share/doc/kde/HTML/en/tables/hideformula3.png
-usr/share/doc/kde/HTML/en/tables/hideformula4.png
-usr/share/doc/kde/HTML/en/tables/hideformula5.png
-usr/share/doc/kde/HTML/en/tables/importexport.docbook
-usr/share/doc/kde/HTML/en/tables/increasedecimal.png
-usr/share/doc/kde/HTML/en/tables/index.cache.bz2
-usr/share/doc/kde/HTML/en/tables/index.docbook
-usr/share/doc/kde/HTML/en/tables/kbd-focus-ext.png
-usr/share/doc/kde/HTML/en/tables/mousenav.png
-usr/share/doc/kde/HTML/en/tables/newdocument.png
-usr/share/doc/kde/HTML/en/tables/percent.png
-usr/share/doc/kde/HTML/en/tables/sheetproperties.png
-usr/share/doc/kde/HTML/en/tables/shortcut1.png
-usr/share/doc/kde/HTML/en/tables/shortcut2.png
-usr/share/doc/kde/HTML/en/tables/shortcut3.png
-usr/share/doc/kde/HTML/en/tables/sort1.png
-usr/share/doc/kde/HTML/en/tables/starting1.png
-usr/share/doc/kde/HTML/en/tables/tts.png
usr/share/icons/hicolor/16x16/apps/kspread.png
usr/share/icons/hicolor/22x22/apps/kspread.png
usr/share/icons/hicolor/32x32/apps/kspread.png
diff --git a/debian/control b/debian/control
index d51cf1a..efbeb18 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Depends: ${misc:Depends}, karbon (>= ${source:Version}), calligraflow (>= ${sour
calligrastage (>= ${source:Version}), krita (>= ${source:Version}), calligratables (>= ${source:Version}),
calligrawords (>= ${source:Version}), kthesaurus (>= ${source:Version}),
kexi (>= ${source:Version}), kformula (>= ${source:Version})
-Suggests: calligra-doc-html (>= ${source:Version}), create-resources
+Suggests: create-resources
Homepage: http://www.calligra-suite.org
Description: Calligra Office Suite
Calligra is an integrated office suite for KDE. It offers a word processor,
@@ -43,29 +43,6 @@ Description: Calligra Office Suite
.
This package provides all the components of Calligra.
-Package: calligra-doc-html
-Architecture: all
-Section: doc
-Depends: ${misc:Depends}
-Replaces: koffice-doc-html
-Conflicts: koffice-doc-html
-Suggests: konqueror | www-browser, calligra
-Description: Calligra Office Suite documentation in HTML format
- Calligra is an integrated office suite for KDE, the K Desktop
- Environment. It offers a word processor, spreadsheet, presentation
- program, graphics tools and more.
- .
- By default the Calligra applications only provide their documentation in
- KDE DocBook format, which can only be read by Konqueror or KHelpCenter.
- This package provides all of the Calligra documentation converted to HTML
- format so it can be read with any web browser.
- .
- The documentation will be installed into the usual directories
- /usr/share/doc/kde/HTML/<language>/<app>/, for instance
- /usr/share/doc/kde/HTML/en/words/.
- .
- This package is part of the Calligra Office Suite.
-
Package: karbon
Architecture: any
Section: graphics
@@ -107,6 +84,8 @@ Architecture: any
Section: database
Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (>= ${source:Version})
#Suggests: kexi-mdb-plugin
+Replaces: koffice-doc-html
+Conflicts: koffice-doc-html
Homepage: http://www.calligra-suite.org/kexi/
Description: integrated database environment for the Calligra Office Suite
Kexi is an integrated data management application. It can be used for
@@ -210,7 +189,7 @@ Package: krita
Architecture: any
Section: graphics
Depends: ${misc:Depends}, ${shlibs:Depends}, krita-data (>= ${source:Version}), calligra-libs (>= ${source:Version})
-Suggests: khelpcenter4, calligra-doc-html
+Suggests: khelpcenter4
Homepage: http://www.calligra-suite.org/krita/
Description: pixel-based image manipulation program for the Calligra Office Suite
Krita is a creative application for raster images. Whether you want to create
@@ -247,7 +226,9 @@ Package: kthesaurus
Architecture: any
Section: text
Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (>= ${source:Version})
-Suggests: khelpcenter4, calligra-doc-html
+Suggests: khelpcenter4
+Replaces: koffice-doc-html
+Conflicts: koffice-doc-html
Description: thesaurus for the Calligra Office Suite
KThesaurus lists words related to a given term and offers a user interface
to WordNet, a powerful lexical reference system. By default, only the English
@@ -261,7 +242,7 @@ Section: math
Replaces: kspread
Conflicts: kspread
Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (>= ${source:Version})
-Suggests: khelpcenter4, calligra-doc-html
+Suggests: khelpcenter4
Homepage: http://www.calligra-suite.org/tables/
Description: spreadsheet for the Calligra Office Suite
Tables is a powerful spreadsheet application. It is scriptable and
@@ -276,7 +257,7 @@ Section: kde
Replaces: kplato
Conflicts: kplato
Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (>= ${source:Version})
-Suggests: khelpcenter4, calligra-doc-html
+Suggests: khelpcenter4
Homepage: http://www.calligra-suite.org/plan/
Description: integrated project management and planning tool
Plan is a project management application, allowing for the planning and
@@ -290,7 +271,7 @@ Section: text
Replaces: kword
Conflicts: kword
Depends: ${misc:Depends}, ${shlibs:Depends}, calligrawords-data (>= ${source:Version})
-Suggests: khelpcenter4, calligra-doc-html
+Suggests: khelpcenter4
Homepage: http://www.calligra-suite.org/words/
Description: word processor for the Calligra Office Suite
Words is a FrameMaker-like word processing and desktop publishing
@@ -320,7 +301,7 @@ Section: kde
Replaces: kpresenter
Conflicts: kpresenter
Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (>= ${source:Version})
-Suggests: khelpcenter4, calligra-doc-html
+Suggests: khelpcenter4
Homepage: http://www.calligra-suite.org/stage/
Description: presentation program for the Calligra Office Suite
Stage is an easy to use yet still flexible presentation application. You can
@@ -379,7 +360,7 @@ Package: kformula
Architecture: any
Section: math
Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (>= ${source:Version}), ttf-lyx
-#Suggests: khelpcenter4, koffice-doc-html
+#Suggests: khelpcenter4
Description: formula drawing component for the Calligra Office Suite
KFormula contains the formula drawing components. It can be used to embed
formulas into Calligra documents.
@@ -432,7 +413,7 @@ Architecture: all
Depends: ${misc:Depends}
Replaces: koffice-data
Conflicts: koffice-data
-Suggests: khelpcenter4, calligra-doc-html
+Suggests: khelpcenter4
Description: common shared data for the Calligra Office Suite
This package provides the architecture-independent data that is shared
amongst the various components of Calligra.
diff --git a/debian/kexi.install b/debian/kexi.install
index 67321a6..dd322e2 100644
--- a/debian/kexi.install
+++ b/debian/kexi.install
@@ -41,21 +41,6 @@ usr/lib/libkformdesigner.so.8
usr/lib/libkformdesigner.so.8.0.0
usr/share/applications/kde4/kexi.desktop
usr/share/doc/kde/HTML/en/kexi
-usr/share/doc/kde/HTML/en/kexi/basics.docbook
-usr/share/doc/kde/HTML/en/kexi/building.docbook
-usr/share/doc/kde/HTML/en/kexi/comparing.docbook
-usr/share/doc/kde/HTML/en/kexi/configuration.docbook
-usr/share/doc/kde/HTML/en/kexi/contact-example.png
-usr/share/doc/kde/HTML/en/kexi/credits.docbook
-usr/share/doc/kde/HTML/en/kexi/database.docbook
-usr/share/doc/kde/HTML/en/kexi/designingforms.docbook
-usr/share/doc/kde/HTML/en/kexi/enteringdataintotables.docbook
-usr/share/doc/kde/HTML/en/kexi/enteringdatausingforms.docbook
-usr/share/doc/kde/HTML/en/kexi/index.cache.bz2
-usr/share/doc/kde/HTML/en/kexi/index.docbook
-usr/share/doc/kde/HTML/en/kexi/intro.docbook
-usr/share/doc/kde/HTML/en/kexi/menus.docbook
-usr/share/doc/kde/HTML/en/kexi/querydesigning.docbook
usr/share/kde4/apps/kexi
usr/share/kde4/config/kexirc
usr/share/kde4/services/kexi
diff --git a/debian/kthesaurus.install b/debian/kthesaurus.install
index bb8cfa2..b49336c 100644
--- a/debian/kthesaurus.install
+++ b/debian/kthesaurus.install
@@ -2,5 +2,3 @@ usr/bin/kthesaurus
usr/lib/libkdeinit4_kthesaurus.so
usr/share/applications/kde4/KThesaurus.desktop
usr/share/doc/kde/HTML/en/thesaurus
-usr/share/doc/kde/HTML/en/thesaurus/index.cache.bz2
-usr/share/doc/kde/HTML/en/thesaurus/index.docbook
--
Calligra suite packaging.
More information about the pkg-kde-commits
mailing list