rev 15854 - in trunk/packages/koffice/debian: . patches

Mon Aug 31 18:57:15 UTC 2009

Author: ana
Date: 2009-08-31 18:57:15 +0000 (Mon, 31 Aug 2009)
New Revision: 15854

Added:
   trunk/packages/koffice/debian/patches/
   trunk/packages/koffice/debian/patches/disable_kformula
   trunk/packages/koffice/debian/patches/series
Modified:
   trunk/packages/koffice/debian/changelog
   trunk/packages/koffice/debian/control
   trunk/packages/koffice/debian/karbon.lintian-overrides
   trunk/packages/koffice/debian/kchart.lintian-overrides
   trunk/packages/koffice/debian/koffice-libs.lintian-overrides
   trunk/packages/koffice/debian/kplato.lintian-overrides
   trunk/packages/koffice/debian/kpresenter.lintian-overrides
   trunk/packages/koffice/debian/krita.lintian-overrides
   trunk/packages/koffice/debian/kspread.lintian-overrides
   trunk/packages/koffice/debian/kword.lintian-overrides
Log:
do not ship kofrmula and other updates



Modified: trunk/packages/koffice/debian/changelog
===================================================================

--- trunk/packages/koffice/debian/changelog	2009-08-31 18:18:33 UTC (rev 15853)
+++ trunk/packages/koffice/debian/changelog	2009-08-31 18:57:15 UTC (rev 15854)
@@ -1,11 +1,13 @@
 koffice (1:2.0.81-1) UNRELEASED; urgency=low
 
-  * New upstream release, KDE 2.1 first beta.
-  * TODO: Re-add kformula ? No sure it is ready, at least the binary is not.
+  * New upstream release, KDE 2.1 first beta. Do not release kformula yet on
+    purpose (patch disable_kformula)
+  * Update to Standards-Version 3.8.3, no changes required.
   * Update installed files.
-  * Update not-installed files: remove kformula files.
+  * Update not-installed file.
+  * Update lintian overrides.
 
- -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 31 Aug 2009 16:01:35 +0200
+ -- Ana Beatriz Guerrero Lopez <ana at debian.org>  Mon, 31 Aug 2009 20:47:28 +0200
 
 koffice (1:2.0.2-2) experimental; urgency=low
 

Modified: trunk/packages/koffice/debian/control
===================================================================
--- trunk/packages/koffice/debian/control	2009-08-31 18:18:33 UTC (rev 15853)
+++ trunk/packages/koffice/debian/control	2009-08-31 18:57:15 UTC (rev 15854)
@@ -12,7 +12,7 @@
  libgsl0-dev, libwpd8-dev, libwpg-dev,
  libxslt1-dev, libqt4-opengl-dev (>= 4.5.0), 
  pstoedit, libgmm++-dev,
-Standards-Version: 3.8.2
+Standards-Version: 3.8.3
 Homepage: http://www.koffice.org/
 
 Package: koffice
@@ -94,19 +94,19 @@
 # .
 # This package is part of the KDE Office Suite.
 
-Package: kformula
-Architecture: any
-Depends: ${shlibs:Depends}, koffice-libs (>= ${source:Version})
-Suggests: khelpcenter4, koffice-doc-html
-Description: a formula editor for the KDE Office Suite
- KFormula is a formula editor that provides the basic input facilities
- and the support functionality expected of a KOffice application.
- .
- Features include easy Greek letter insertion, intelligent cursor
- movement, advanced syntax highlighting, multi-level undo support,
- LaTeX export and MathML import.
- .
- This package is part of the KDE Office Suite.
+#Package: kformula
+#Architecture: any
+#Depends: ${shlibs:Depends}, koffice-libs (>= ${source:Version})
+#Suggests: khelpcenter4, koffice-doc-html
+#Description: a formula editor for the KDE Office Suite
+# KFormula is a formula editor that provides the basic input facilities
+# and the support functionality expected of a KOffice application.
+# .
+# Features include easy Greek letter insertion, intelligent cursor
+# movement, advanced syntax highlighting, multi-level undo support,
+# LaTeX export and MathML import.
+# .
+# This package is part of the KDE Office Suite.
 
 #Package: kivio
 #Architecture: any

Modified: trunk/packages/koffice/debian/karbon.lintian-overrides
===================================================================
--- trunk/packages/koffice/debian/karbon.lintian-overrides	2009-08-31 18:18:33 UTC (rev 15853)
+++ trunk/packages/koffice/debian/karbon.lintian-overrides	2009-08-31 18:57:15 UTC (rev 15854)
@@ -1,6 +1,6 @@
-karbon: package-name-doesnt-match-sonames libkarboncommon5 libkarbonui5 libkdeinit4-karbon
+karbon: package-name-doesnt-match-sonames libkarboncommon6 libkarbonui6 libkdeinit4-karbon
 karbon: no-symbols-control-file usr/lib/libkdeinit4_karbon.so
-karbon: no-symbols-control-file usr/lib/libkarboncommon.so.5.0.0
-karbon: no-symbols-control-file usr/lib/libkarbonui.so.5.0.0
+karbon: no-symbols-control-file usr/lib/libkarboncommon.so.6.0.0
+karbon: no-symbols-control-file usr/lib/libkarbonui.so.6.0.0
 karbon: shlib-without-versioned-soname usr/lib/libkdeinit4_karbon.so libkdeinit4_karbon.so
 

Modified: trunk/packages/koffice/debian/kchart.lintian-overrides
===================================================================
--- trunk/packages/koffice/debian/kchart.lintian-overrides	2009-08-31 18:18:33 UTC (rev 15853)
+++ trunk/packages/koffice/debian/kchart.lintian-overrides	2009-08-31 18:57:15 UTC (rev 15854)
@@ -1,4 +1,4 @@
-kchart: no-symbols-control-file usr/lib/libkdchart.so.5.0.0
-kchart: no-symbols-control-file usr/lib/libkchartcommon.so.5.0.0
-kchart: no-symbols-control-file usr/lib/libchartshapelib.so.5.0.0
-kchart: package-name-doesnt-match-sonames libchartshapelib5 libkchartcommon5 libkdchart5
+kchart: no-symbols-control-file usr/lib/libkdchart.so.6.0.0
+kchart: no-symbols-control-file usr/lib/libkchartcommon.so.6.0.0
+kchart: no-symbols-control-file usr/lib/libchartshapelib.so.6.0.0
+kchart: package-name-doesnt-match-sonames libchartshapelib6 libkchartcommon5 libkdchart6

Modified: trunk/packages/koffice/debian/koffice-libs.lintian-overrides
===================================================================
--- trunk/packages/koffice/debian/koffice-libs.lintian-overrides	2009-08-31 18:18:33 UTC (rev 15853)
+++ trunk/packages/koffice/debian/koffice-libs.lintian-overrides	2009-08-31 18:57:15 UTC (rev 15854)
@@ -1,17 +1,17 @@
-koffice-libs: package-name-doesnt-match-sonames libflake5 libkochart5 libkoffice-graya-u16-5 libkofficegrayau8colorspace5 libkoguiutils5 libkokross5 libkomain5 libkoodf5 libkopageapp5 libkoresources5 libkostore5 libkotext5 libkowmf5 libkwmf5 libkwordexportfilters5 libpigmentcms5
-koffice-libs: no-symbols-control-file usr/lib/libkwmf.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkoodf.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkoresources.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkochart.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libflake.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkoffice_graya_u16.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkotext.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkofficegrayau8colorspace.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkomain.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkokross.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkwordexportfilters.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkowmf.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkoguiutils.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkopageapp.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libkostore.so.5.0.0
-koffice-libs: no-symbols-control-file usr/lib/libpigmentcms.so.5.0.0 
+koffice-libs: package-name-doesnt-match-sonames libflake6 libkochart5 libkoffice-graya-u16-5 libkofficegrayau8colorspace5 libkoguiutils5 libkokross5 libkomain5 libkoodf5 libkopageapp5 libkoresources5 libkostore5 libkotext5 libkowmf5 libkwmf5 libkwordexportfilters5 libpigmentcms5
+koffice-libs: no-symbols-control-file usr/lib/libkwmf.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkoodf.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkoresources.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkochart.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libflake.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkoffice_graya_u16.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkotext.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkofficegrayau8colorspace.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkomain.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkokross.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkwordexportfilters.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkowmf.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkoguiutils.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkopageapp.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libkostore.so.6.0.0
+koffice-libs: no-symbols-control-file usr/lib/libpigmentcms.so.6.0.0 

Modified: trunk/packages/koffice/debian/kplato.lintian-overrides
===================================================================
--- trunk/packages/koffice/debian/kplato.lintian-overrides	2009-08-31 18:18:33 UTC (rev 15853)
+++ trunk/packages/koffice/debian/kplato.lintian-overrides	2009-08-31 18:57:15 UTC (rev 15854)
@@ -4,11 +4,11 @@
 kplato: unusual-interpreter ./usr/share/kde4/apps/kplato/scripts/extensions/resourcesimport.py #!kross
 kplato: unusual-interpreter ./usr/share/kde4/apps/kplato/scripts/samples/sample_busyinfocheck.py #!kross
 kplato: unusual-interpreter ./usr/share/kde4/apps/kplato/scripts/samples/sample_project.py #!kross
-kplato: package-name-doesnt-match-sonames libkdeinit4-kplato libkplatokernel5 libkplatomodels5 libkplatoprivate5 libkplatoui5
+kplato: package-name-doesnt-match-sonames libkdeinit4-kplato libkplatokernel6 libkplatomodels5 libkplatoprivate5 libkplatoui5
 kplato: no-symbols-control-file usr/lib/libkdeinit4_kplato.so
-kplato: no-symbols-control-file usr/lib/libkplatokernel.so.5.0.0
-kplato: no-symbols-control-file usr/lib/libkplatoprivate.so.5.0.0
-kplato: no-symbols-control-file usr/lib/libkplatomodels.so.5.0.0
-kplato: no-symbols-control-file usr/lib/libkplatoui.so.5.0.0
+kplato: no-symbols-control-file usr/lib/libkplatokernel.so.6.0.0
+kplato: no-symbols-control-file usr/lib/libkplatoprivate.so.6.0.0
+kplato: no-symbols-control-file usr/lib/libkplatomodels.so.6.0.0
+kplato: no-symbols-control-file usr/lib/libkplatoui.so.6.0.0
 kplato: shlib-without-versioned-soname usr/lib/libkdeinit4_kplato.so libkdeinit4_kplato.so
 

Modified: trunk/packages/koffice/debian/kpresenter.lintian-overrides
===================================================================
--- trunk/packages/koffice/debian/kpresenter.lintian-overrides	2009-08-31 18:18:33 UTC (rev 15853)
+++ trunk/packages/koffice/debian/kpresenter.lintian-overrides	2009-08-31 18:57:15 UTC (rev 15854)
@@ -1,5 +1,5 @@
-kpresenter: package-name-doesnt-match-sonames libkdeinit4-kpresenter libkpresenterprivate5
-kpresenter: no-symbols-control-file usr/lib/libkpresenterprivate.so.5.0.0
+kpresenter: package-name-doesnt-match-sonames libkdeinit4-kpresenter libkpresenterprivate6
+kpresenter: no-symbols-control-file usr/lib/libkpresenterprivate.so.6.0.0
 kpresenter: no-symbols-control-file usr/lib/libkdeinit4_kpresenter.so
 kpresenter: shlib-without-versioned-soname usr/lib/libkdeinit4_kpresenter.so libkdeinit4_kpresenter.so
 

Modified: trunk/packages/koffice/debian/krita.lintian-overrides
===================================================================
--- trunk/packages/koffice/debian/krita.lintian-overrides	2009-08-31 18:18:33 UTC (rev 15853)
+++ trunk/packages/koffice/debian/krita.lintian-overrides	2009-08-31 18:57:15 UTC (rev 15854)
@@ -1,13 +1,13 @@
-krita: no-symbols-control-file usr/lib/libkritadynamicbrush.so.5.0.0
-krita: no-symbols-control-file usr/lib/libkritabasicdynamicshapeprogram.so.5.0.0
-krita: no-symbols-control-file usr/lib/libkritaimage.so.5.0.0
-krita: no-symbols-control-file usr/lib/libkrita_xyz_u16.so.5.0.0
-krita: no-symbols-control-file usr/lib/libkritalibpaintop.so.5.0.0
+krita: no-symbols-control-file usr/lib/libkritadynamicbrush.so.6.0.0
+krita: no-symbols-control-file usr/lib/libkritabasicdynamicshapeprogram.so.6.0.0
+krita: no-symbols-control-file usr/lib/libkritaimage.so.6.0.0
+krita: no-symbols-control-file usr/lib/libkrita_xyz_u16.so.6.0.0
+krita: no-symbols-control-file usr/lib/libkritalibpaintop.so.6.0.0
 krita: no-symbols-control-file usr/lib/libkdeinit4_krita.so
-krita: no-symbols-control-file usr/lib/libKritaRulerAssistantCommon.so.5.0.0
-krita: no-symbols-control-file usr/lib/libkritagrayscale.so.5.0.0
-krita: no-symbols-control-file usr/lib/libkritaui.so.5.0.0
+krita: no-symbols-control-file usr/lib/libKritaRulerAssistantCommon.so.6.0.0
+krita: no-symbols-control-file usr/lib/libkritagrayscale.so.6.0.0
+krita: no-symbols-control-file usr/lib/libkritaui.so.6.0.0
 krita: shlib-without-versioned-soname usr/lib/libkdeinit4_krita.so libkdeinit4_krita.so
-krita: no-symbols-control-file usr/lib/libkritabasicdynamiccoloringprogram.so.5.0.0
-krita: no-symbols-control-file usr/lib/libkritalibbrush.so.5.0.0
-krita: package-name-doesnt-match-sonames libKritaRulerAssistantCommon5 libkdeinit4-krita libkrita-xyz-u16-5 libkritabasicdynamiccoloringprogram5 libkritabasicdynamicshapeprogram5 libkritadynamicbrush5 libkritagrayscale5 libkritaimage5 libkritalibbrush5 libkritalibpaintop5 libkritaui5
+krita: no-symbols-control-file usr/lib/libkritabasicdynamiccoloringprogram.so.6.0.0
+krita: no-symbols-control-file usr/lib/libkritalibbrush.so.6.0.0
+krita: package-name-doesnt-match-sonames libKritaRulerAssistantCommon6 libkdeinit4-krita libkrita-xyz-u16-5 libkritabasicdynamiccoloringprogram5 libkritabasicdynamicshapeprogram5 libkritadynamicbrush5 libkritagrayscale5 libkritaimage5 libkritalibbrush5 libkritalibpaintop5 libkritaui5

Modified: trunk/packages/koffice/debian/kspread.lintian-overrides
===================================================================
--- trunk/packages/koffice/debian/kspread.lintian-overrides	2009-08-31 18:18:33 UTC (rev 15853)
+++ trunk/packages/koffice/debian/kspread.lintian-overrides	2009-08-31 18:57:15 UTC (rev 15854)
@@ -1,7 +1,7 @@
 kspread: shlib-without-versioned-soname usr/lib/libkdeinit4_kspread.so libkdeinit4_kspread.so
-kspread: package-name-doesnt-match-sonames libkdeinit4-kspread libkspreadcommon5
+kspread: package-name-doesnt-match-sonames libkdeinit4-kspread libkspreadcommon6
 kspread: no-symbols-control-file usr/lib/libkdeinit4_kspread.so
-kspread: no-symbols-control-file usr/lib/libkspreadcommon.so.5.0.0
+kspread: no-symbols-control-file usr/lib/libkspreadcommon.so.6.0.0
 kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/docker/consoledocker.py #!kross
 kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/extensions/csvexport.py #!kross
 kspread: unusual-interpreter ./usr/share/kde4/apps/kspread/scripts/extensions/csvimport.py #!kross

Modified: trunk/packages/koffice/debian/kword.lintian-overrides
===================================================================
--- trunk/packages/koffice/debian/kword.lintian-overrides	2009-08-31 18:18:33 UTC (rev 15853)
+++ trunk/packages/koffice/debian/kword.lintian-overrides	2009-08-31 18:57:15 UTC (rev 15854)
@@ -1,6 +1,6 @@
-kword: package-name-doesnt-match-sonames libkdeinit4-kword libkwordprivate5
+kword: package-name-doesnt-match-sonames libkdeinit4-kword libkwordprivate6
 kword: menu-icon-missing /usr/share/pixmaps/kword.xpm
-kword: no-symbols-control-file usr/lib/libkwordprivate.so.5.0.0
+kword: no-symbols-control-file usr/lib/libkwordprivate.so.6.0.0
 kword: no-symbols-control-file usr/lib/libkdeinit4_kword.so
 kword: shlib-without-versioned-soname usr/lib/libkdeinit4_kword.so libkdeinit4_kword.so
 

Added: trunk/packages/koffice/debian/patches/disable_kformula
===================================================================
--- trunk/packages/koffice/debian/patches/disable_kformula	                        (rev 0)
+++ trunk/packages/koffice/debian/patches/disable_kformula	2009-08-31 18:57:15 UTC (rev 15854)
@@ -0,0 +1,13 @@
+Disable kformula until it is decided whether will be shipped in Koffice 2.1 or
+not.
+--- koffice-2.0.81.orig/CMakeLists.txt
++++ koffice-2.0.81/CMakeLists.txt
+@@ -391,6 +391,8 @@
+     macro_optional_add_subdirectory(kword)
+ endif(SHOULD_BUILD_KWORD)
+ 
++# Disable kformula for now
++set(SHOULD_BUILD_KFORMULA FALSE)
+ if (SHOULD_BUILD_KFORMULA)
+     macro_optional_add_subdirectory(kformula)
+ endif (SHOULD_BUILD_KFORMULA)

Added: trunk/packages/koffice/debian/patches/series
===================================================================
--- trunk/packages/koffice/debian/patches/series	                        (rev 0)
+++ trunk/packages/koffice/debian/patches/series	2009-08-31 18:57:15 UTC (rev 15854)
@@ -0,0 +1 @@
+disable_kformula


