[SCM] Calligra suite packaging branch, master, updated. 01201eb6182387e5cfda94e118213a1e66f0dd9d

Raúl Sánchez Siles kebianizao-guest at alioth.debian.org
Mon Mar 26 20:25:55 UTC 2012


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

The following commit has been merged in the master branch:
commit ae9539c93d6f1168cf5f2d3e6f9c6738edebb7aa
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Mon Mar 26 09:15:36 2012 +0200

    Renaming calligratables to calligrasheets
    
    --HG--
    rename : debian/calligratables.install => debian/calligrasheets.install
    rename : debian/calligratables.lintian-overrides => debian/calligrasheets.lintian-overrides
    rename : debian/calligratables.manpages => debian/calligrasheets.manpages
    rename : debian/kexi-calligratables-driver.install => debian/kexi-calligrasheets-driver.install
    rename : debian/man/calligratables.1 => debian/man/calligrasheets.1
    rename : debian/man/calligratables.rst => debian/man/calligrasheets.rst
    extra : rebase_source : 486d9dd04516097f8f7c9be986ee90b0ccf67e29
---
 debian/calligra-dev.install                        |    4 +-
 ...lligratables.install => calligrasheets.install} |   29 ++++++++++---------
 debian/calligrasheets.lintian-overrides            |   18 ++++++++++++
 debian/calligrasheets.manpages                     |    1 +
 debian/calligratables.lintian-overrides            |   18 ------------
 debian/calligratables.manpages                     |    1 -
 debian/control                                     |   10 +++---
 debian/copyright                                   |   10 +++---
 ....install => kexi-calligrasheets-driver.install} |    0
 debian/man/{calligratables.1 => calligrasheets.1}  |    0
 .../man/{calligratables.rst => calligrasheets.rst} |    0
 11 files changed, 46 insertions(+), 45 deletions(-)

diff --git a/debian/calligra-dev.install b/debian/calligra-dev.install
index de68fa3..ec735c9 100644
--- a/debian/calligra-dev.install
+++ b/debian/calligra-dev.install
@@ -1,6 +1,6 @@
 usr/include/
-usr/lib/libcalligratablescommon.so
-usr/lib/libcalligratablesodf.so
+usr/lib/libcalligrasheetscommon.so
+usr/lib/libcalligrasheetsodf.so
 usr/lib/libchartshapelib.so
 usr/lib/libflake.so
 usr/lib/libkarboncommon.so
diff --git a/debian/calligratables.install b/debian/calligrasheets.install
similarity index 85%
rename from debian/calligratables.install
rename to debian/calligrasheets.install
index 146be6c..8482c76 100644
--- a/debian/calligratables.install
+++ b/debian/calligrasheets.install
@@ -1,6 +1,6 @@
-usr/bin/calligratables
+usr/bin/calligrasheets
 usr/lib/kde4/applixspreadimport.so
-usr/lib/kde4/calligratablespart.so
+usr/lib/kde4/calligrasheetspart.so
 usr/lib/kde4/csvexport.so
 usr/lib/kde4/csvimport.so
 usr/lib/kde4/dbaseimport.so
@@ -32,20 +32,19 @@ usr/lib/kde4/qproimport.so
 usr/lib/kde4/spreadsheetshape-deferred.so
 usr/lib/kde4/spreadsheetshape.so
 usr/lib/kde4/xlsximport.so
-usr/lib/libcalligratablescommon.so.9
-usr/lib/libcalligratablescommon.so.9.0.0
-usr/lib/libcalligratablesodf.so.9
-usr/lib/libcalligratablesodf.so.9.0.0
-usr/lib/libkdeinit4_calligratables.so
-usr/share/applications/kde4/tables.desktop
-usr/share/doc/kde/HTML/en/tables
+usr/lib/libcalligrasheetscommon.so.9
+usr/lib/libcalligrasheetscommon.so.9.0.0
+usr/lib/libcalligrasheetsodf.so.9
+usr/lib/libcalligrasheetsodf.so.9.0.0
+usr/lib/libkdeinit4_calligrasheets.so
+usr/share/applications/kde4/sheets.desktop
 usr/share/icons/hicolor/16x16/apps/kspread.png
 usr/share/icons/hicolor/22x22/apps/kspread.png
 usr/share/icons/hicolor/32x32/apps/kspread.png
 usr/share/icons/hicolor/48x48/apps/kspread.png
-usr/share/kde4/apps/tables/
-usr/share/kde4/config.kcfg/tables.kcfg
-usr/share/kde4/config/tablesrc
+usr/share/kde4/apps/sheets/
+usr/share/kde4/config.kcfg/sheets.kcfg
+usr/share/kde4/config/sheetsrc
 usr/share/kde4/services/krossmodulekspread.desktop
 usr/share/kde4/services/kspread_applixspread_import.desktop
 usr/share/kde4/services/kspreadbitopsmodule.desktop
@@ -78,5 +77,7 @@ usr/share/kde4/services/kspread_xlsx_import.desktop
 usr/share/kde4/services/ServiceMenus/kspread_konqi.desktop
 usr/share/kde4/services/spreadsheetshape-deferred.desktop
 usr/share/kde4/services/spreadsheetshape.desktop
-usr/share/kde4/services/tablespart.desktop
-usr/share/kde4/servicetypes/tables_plugin.desktop
+usr/share/kde4/services/sheetspart.desktop
+usr/share/kde4/servicetypes/sheets_plugin.desktop
+#scripts should be integrated into apps/sheets
+usr/share/kde4/apps/tables/
diff --git a/debian/calligrasheets.lintian-overrides b/debian/calligrasheets.lintian-overrides
new file mode 100644
index 0000000..11038a9
--- /dev/null
+++ b/debian/calligrasheets.lintian-overrides
@@ -0,0 +1,18 @@
+calligrasheets: package-name-doesnt-match-sonames libcalligrasheetscommon9 libcalligrasheetsodf9
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/docker/consoledocker.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/csvexport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/csvimport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/htmlexport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/kexidbexport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/kexidbimport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/logger.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/myorca.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/odfpyexport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/vcardimport.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/xmlviewer.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/functions/functions.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/functions/pyregexp.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/functions/pytime.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/functions/rpyfunctions.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/functions/yfinance.py #!kross
+calligrasheets: unusual-interpreter usr/share/kde4/apps/tables/scripts/functions/yweather.py #!kross
diff --git a/debian/calligrasheets.manpages b/debian/calligrasheets.manpages
new file mode 100644
index 0000000..04ca22e
--- /dev/null
+++ b/debian/calligrasheets.manpages
@@ -0,0 +1 @@
+debian/man/calligrasheets.1
diff --git a/debian/calligratables.lintian-overrides b/debian/calligratables.lintian-overrides
deleted file mode 100644
index 787d6f6..0000000
--- a/debian/calligratables.lintian-overrides
+++ /dev/null
@@ -1,18 +0,0 @@
-calligratables: package-name-doesnt-match-sonames libcalligratablescommon9 libcalligratablesodf9
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/docker/consoledocker.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/csvexport.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/csvimport.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/htmlexport.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/kexidbexport.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/kexidbimport.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/logger.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/myorca.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/odfpyexport.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/vcardimport.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/extensions/xmlviewer.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/functions/functions.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/functions/pyregexp.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/functions/pytime.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/functions/rpyfunctions.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/functions/yfinance.py #!kross
-calligratables: unusual-interpreter usr/share/kde4/apps/tables/scripts/functions/yweather.py #!kross
diff --git a/debian/calligratables.manpages b/debian/calligratables.manpages
deleted file mode 100644
index 2121c18..0000000
--- a/debian/calligratables.manpages
+++ /dev/null
@@ -1 +0,0 @@
-debian/man/calligratables.1
diff --git a/debian/control b/debian/control
index f6c83ff..dcb2b14 100644
--- a/debian/control
+++ b/debian/control
@@ -35,7 +35,7 @@ Section: kde
 Replaces: koffice
 Conflicts: koffice
 Depends: ${misc:Depends}, karbon (>= ${source:Version}), calligraflow (>= ${source:Version}), calligraplan (>= ${source:Version}),
- calligrastage (>= ${source:Version}), krita (>= ${source:Version}), calligratables (>= ${source:Version}),
+ calligrastage (>= ${source:Version}), krita (>= ${source:Version}), calligrasheets (>= ${source:Version}),
  calligrawords (>= ${source:Version}), kthesaurus (>= ${source:Version}),
  kexi (>= ${source:Version}) 
 Recommends: calligra-map-shape (>= ${source:Version})
@@ -108,10 +108,10 @@ Description: integrated database environment for the Calligra Office Suite
  .
  This package is part of the Calligra Office Suite.
 
-Package: kexi-calligratables-driver
+Package: kexi-calligrasheets-driver
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, kexi (= ${binary:Version}),
- calligratables (>= ${source:Version})
+ calligrasheets (>= ${source:Version})
 Description: Tables plugin for kexi
  Kexi is an integrated data management application. It can be used for
  creating database schemas, inserting data, performing queries, and
@@ -322,14 +322,14 @@ Description: thesaurus for the Calligra Office Suite
  .
  This package is part of the Calligra Office Suite.
 
-Package: calligratables
+Package: calligrasheets
 Architecture: any
 Section: math
 Replaces: kspread
 Conflicts: kspread
 Depends: ${misc:Depends}, ${shlibs:Depends}, calligra-libs (= ${binary:Version})
 Suggests: khelpcenter4
-Homepage: http://www.calligra-suite.org/tables/
+Homepage: http://www.calligra-suite.org/sheets/
 Description: spreadsheet for the Calligra Office Suite
  Tables is a powerful spreadsheet application.  It is scriptable and
  provides both table-oriented sheets and support for complex mathematical
diff --git a/debian/copyright b/debian/copyright
index b295c9d..9f0d8f5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -364,18 +364,18 @@ Copyright: Trolltech ASA
 Licences: GPL-2
 
 
-Files:tables/*
+Files: sheets/*
 Copyright:
            2005-2006 Raphael Langerhorst <raphael-langerhorst at gmx.at>
 Licences: MIT
-Fils: tables/*
+Fils: sheets/*
 Copyright:
            2000 901 San
            2000 Antonio Road
            2000 Microsystems Inc.
            2000 Palo Alto
 Licences: LGPL-2.1
-Files: tables/*
+Files: sheets/*
 Copyright:
            1998-1999 Reginald Stadlbauer <reggie at kde.org>
            1998-2000 Stephan Kulow <coolo at kde.org>
@@ -424,7 +424,7 @@ Copyright:
            2011 Arjen Hiemstra <ahiemstra at heimr.nl>
            2011 Juan Aquino <utcl95 at gmail.com>
 Licences: LGPL-2+
-Files: tables/*
+Files: sheets/*
 Copyright:
            1998-1999 Reginald Stadlbauer <reggie at kde.org>
            1998-2000 Stephan Kulow <coolo at kde.org>
@@ -457,7 +457,7 @@ Copyright:
            2010 Carlos Licea <carlos at kdab.com>
            2010 Suresh Chande <suresh.chande at nokia.com>
 Licences: LGPL-2
-Files: tables/*
+Files: sheets/*
 Copyright:
            2005-2010 Stefan Nikolaus <stefan.nikolaus at kdemail.net>
            2008-2011 Marijn Kruisselbrink <mkruisselbrink at kde.org>
diff --git a/debian/kexi-calligratables-driver.install b/debian/kexi-calligrasheets-driver.install
similarity index 100%
rename from debian/kexi-calligratables-driver.install
rename to debian/kexi-calligrasheets-driver.install
diff --git a/debian/man/calligratables.1 b/debian/man/calligrasheets.1
similarity index 100%
rename from debian/man/calligratables.1
rename to debian/man/calligrasheets.1
diff --git a/debian/man/calligratables.rst b/debian/man/calligrasheets.rst
similarity index 100%
rename from debian/man/calligratables.rst
rename to debian/man/calligrasheets.rst

-- 
Calligra suite packaging



More information about the pkg-kde-commits mailing list