[SCM] Calligra suite packaging. branch, debhelper8, updated. 4b80fb8576ead536c22f064e95c0f1083997123e

Raúl Sánchez Siles kebianizao-guest at alioth.debian.org
Mon Sep 12 17:21:57 UTC 2011


The following commit has been merged in the debhelper8 branch:
commit 4e72b1f0f2d09dbf4191c1177258e3d4dfdd0b2c
Merge: d4f63cc4b7e0b47e3fda609d9a535f35aa1e837a 61f849dce152a4f9222c4d6e0dc1b28c705907e9
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Fri Aug 12 20:31:35 2011 +0200

    Merge from master.
    
    --HG--
    branch : DH8

 debian/braindump.install                          |   14 +-
 debian/calligra-data.install                      |  569 ++--
 debian/calligra-dev.install                       |   24 +-
 debian/calligra-doc-html.install                  |    3 -
 debian/calligra-libs.install                      |   20 +-
 debian/calligra-libs.lintian-overrides            |    1 +
 debian/calligraflow.install                       |   14 +
 debian/calligraflow.lintian-overrides             |    1 +
 debian/calligramobile.install                     |   20 +-
 debian/calligramobile.lintian-overrides           |    1 +
 debian/{plan.install => calligraplan.install}     |   29 +-
 debian/calligraplan.lintian-overrides             |    7 +
 debian/{stage.install => calligrastage.install}   |  206 +-
 debian/calligrastage.lintian-overrides            |    1 +
 debian/{tables.install => calligratables.install} |  148 +-
 debian/calligratables.lintian-overrides           |   18 +
 debian/calligrawords-data.install                 |    8 +
 debian/calligrawords.install                      |   63 +
 debian/calligrawords.lintian-overrides            |    1 +
 debian/changelog                                  |    6 +-
 debian/control                                    |  238 +-
 debian/copyright                                  |  922 ++++++-
 debian/flow.install                               | 3352 ---------------------
 debian/karbon.install                             |   37 +-
 debian/karbon.lintian-overrides                   |    1 +
 debian/kexi-plugin-calligratables.install         |    2 +
 debian/kexi-plugin-mysql.install                  |    2 +
 debian/kexi-plugin-postgresql.install             |    4 +-
 debian/kexi-plugin-sybase.install                 |    2 +
 debian/kexi-plugin-xbase.install                  |    2 +
 debian/kexi.install                               |   64 +-
 debian/kexi.lintian-overrides                     |    1 +
 debian/kformula.install                           |  173 +-
 debian/kformula.lintian-overrides                 |    1 +
 debian/krita-data.install                         |   42 +-
 debian/krita.install                              |  122 +-
 debian/krita.lintian-overrides                    |    1 +
 debian/not-installed                              |    9 +
 debian/okular-backend-odp.install                 |    2 +-
 debian/okular-backend-odp.lintian-overrides       |    1 +
 debian/watch                                      |    3 +
 debian/words-data.install                         |    9 -
 debian/words.install                              |   63 -
 43 files changed, 1878 insertions(+), 4329 deletions(-)

diff --cc debian/braindump.install
index 431fc2d,4f8b3e5..4860df0
--- a/debian/braindump.install
+++ b/debian/braindump.install
@@@ -1,24 -1,12 +1,26 @@@
  usr/bin/braindump
+ usr/lib/kde4/stateshape.so
+ usr/lib/kde4/webshape.so
+ usr/lib/libbraindumpcore.so
  usr/share/applications/kde4/braindump.desktop
+ usr/share/icons/hicolor/22x22/actions/stateshape.png
+ usr/share/icons/hicolor/22x22/actions/statetool.png
  usr/share/kde4/apps/braindump
- usr/share/kde4/apps/braindump/braindumpview.rc
- usr/share/kde4/apps/braindump/icons/hicolor/22x22/actions/zoom-width.png
- usr/share/kde4/apps/braindump/icons/hicolor/22x22/actions/zoom-page.png
- usr/share/kde4/apps/braindump/icons/hicolor/22x22/actions/zoom-pixels.png
- usr/share/kde4/apps/braindump/braindumpui.rc
+ usr/share/kde4/apps/stateshape
+ usr/share/kde4/services/stateshape.desktop
+ usr/share/kde4/services/webshape.desktop
  usr/share/kde4/servicetypes/braindump_extensions.desktop
- usr/lib/libbraindumpcore.so
 +usr/lib/kde4/stateshape.so
 +usr/lib/kde4/webshape.so
 +usr/share/kde4/services/webshape.desktop
 +usr/share/kde4/services/stateshape.desktop
 +usr/share/kde4/apps/stateshape/states/progress-00.svg
 +usr/share/kde4/apps/stateshape/states/progress-25.svg
 +usr/share/kde4/apps/stateshape/states/progress-50.svg
 +usr/share/kde4/apps/stateshape/states/progress-75.svg
 +usr/share/kde4/apps/stateshape/states/checked.svg
 +usr/share/kde4/apps/stateshape/states/progress-100.svg
 +usr/share/kde4/apps/stateshape/states/states.xml
 +usr/share/kde4/apps/stateshape/states/unchecked.svg
 +usr/share/icons/hicolor/22x22/actions/statetool.png
 +usr/share/icons/hicolor/22x22/actions/stateshape.png
diff --cc debian/calligramobile.install
index f64e339,b6747cc..180e0cb
--- a/debian/calligramobile.install
+++ b/debian/calligramobile.install
@@@ -1,22 -1,11 +1,14 @@@
  usr/bin/calligramobile
  usr/lib/libkoabstraction.so.8
  usr/lib/libkoabstraction.so.8.0.0
 +usr/share/icons/hicolor/48x48/hildon/SpreadSheet.png
 +usr/share/icons/hicolor/48x48/hildon/Document.png
 +usr/share/icons/hicolor/48x48/hildon/Presenter.png
- usr/share/icons/hicolor/64x64/apps/calligramobile.png
- usr/share/icons/hicolor/178x200/apps/calligramobile.png
- usr/share/dbus-1
- usr/share/dbus-1/services
- usr/share/dbus-1/services/com.nokia.CalligraMobile.service
  usr/share/applications/hildon/calligramobile.desktop
  usr/share/calligramobile-templates
- usr/share/calligramobile-templates/.presentationtemplates
- usr/share/calligramobile-templates/.presentationtemplates/Text_With_Outline.odp
- usr/share/calligramobile-templates/.presentationtemplates/Text_With_Image.odp
- usr/share/calligramobile-templates/.presentationtemplates/Text_Only.odp
- usr/share/calligramobile-templates/.presentationtemplates/Text_With_Chart.odp
- usr/share/calligramobile-templates/.presentationtemplates/Text_With_Header.odp
- usr/share/calligramobile-templates/.templates
- usr/share/calligramobile-templates/.templates/NewSpread.ods
- usr/share/calligramobile-templates/.templates/NewDocument.odt
+ usr/share/dbus-1/services/com.nokia.CalligraMobile.service
+ usr/share/icons/hicolor/178x200/apps/calligramobile.png
+ usr/share/icons/hicolor/48x48/hildon/Document.png
+ usr/share/icons/hicolor/48x48/hildon/Presenter.png
+ usr/share/icons/hicolor/48x48/hildon/SpreadSheet.png
+ usr/share/icons/hicolor/64x64/apps/calligramobile.png
diff --cc debian/changelog
index 8127398,eb97771..022e3d5
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,8 -1,9 +1,12 @@@
- calligra (2.3.72-1) UNRELEASED; urgency=low
+ calligra (1:2.3.73+git20110808.d29fd45-0r1) UNRELEASED; urgency=low
  
    * Initial release.
+   TODO: think about the following packages:
+     - kformula - fold in calligra-libs? rename to eg calligra-formulashape?
+     - krita-dev - remove or split from calligra-dev?
+     - kplato - provide transitional package (once upstream fully renames it to "plan")?
  
 - -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Fri, 20 May 2011 11:45:52 +0200
 +  [ Raúl Sánchez Siles ]
 +  * Update packaging to debhelper 8.
 +
 + -- Raúl Sánchez Siles <rasasi78 at gmail.com>  Wed, 29 Jun 2011 21:08:26 +0200
diff --cc debian/control
index f3c7bc3,8cf741d..559460c
--- a/debian/control
+++ b/debian/control
@@@ -1,10 -1,10 +1,10 @@@
  Source: calligra
  Section: kde
  # single application should be placed in more proper sections.
- Priority: extra
+ Priority: optional
  Maintainer: Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
  Uploaders: Ana Beatriz Guerrero Lopez <ana at debian.org>
 -Build-Depends: cdbs, debhelper (>= 7.0.50~), cmake (>= 2.6.2), pkg-kde-tools (>= 0.9),
 +Build-Depends: debhelper (>= 8.0.0~), cmake (>= 2.6.2), pkg-kde-tools (>= 0.9),
    kdelibs5-dev (>= 4:4.4.0), kdepimlibs5-dev (>= 4:4.4.3),
    libkdcraw-dev (>= 4:4.4.3), okular-dev (>= 4:4.4.3),
    libqt4-dev, libqt4-opengl-dev, libqtwebkit-dev,

-- 
Calligra suite packaging.



More information about the pkg-kde-commits mailing list