Rebuilt for mysql-5.5
authorYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Fri, 11 Nov 2011 22:35:11 +0000 (16:35 -0600)
committerYaakov Selkowitz <yselkowitz@users.sourceforge.net>
Sun, 13 Nov 2011 01:01:13 +0000 (19:01 -0600)
12 files changed:
2.3.83-libwpd09.patch [deleted file]
calligra-2.3.83-2.cygport [moved from calligra-2.3.83-1.cygport with 96% similarity]
calligra-flow.list
calligra-libs.list
calligra-plan.list
calligra-stage.list
calligra-tables.list
calligra-tools.list
karbon.list
kexi.hint
kexi.list
krita.list

diff --git a/2.3.83-libwpd09.patch b/2.3.83-libwpd09.patch
deleted file mode 100644 (file)
index 2ace767..0000000
+++ /dev/null
@@ -1,56 +0,0 @@
---- origsrc/calligra-2.3.83/cmake/modules/FindWPD.cmake        2011-10-22 02:39:32.000000000 -0500
-+++ src/calligra-2.3.83/cmake/modules/FindWPD.cmake    2011-11-02 21:26:40.458280600 -0500
-@@ -19,18 +19,18 @@
- #else (WPD_INCLUDE_DIR AND WPD_LIBRARIES)
- if(NOT WIN32)
-   INCLUDE(FindPkgConfig)
--  pkg_check_modules(WPD libwpd-0.8)
-   pkg_check_modules(WPD libwpd-0.9)
-+  pkg_check_modules(WPD libwpd-0.8)
- endif(NOT WIN32)
-   FIND_PATH(WPD_INCLUDE_DIR libwpd/libwpd.h
-     PATHS
-         ${WPD_INCLUDE_DIR}
--      /usr/include/libwpd-0.8
-       /usr/include/libwpd-0.9
-+      /usr/include/libwpd-0.8
-       PATH_SUFFIXES
--        libwpd-0.8
-         libwpd-0.9
-+        libwpd-0.8
-   )
-   IF(NOT WPD_LIBRARIES)
---- origsrc/calligra-2.3.83/cmake/modules/FindWPG.cmake        2011-10-22 02:39:32.000000000 -0500
-+++ src/calligra-2.3.83/cmake/modules/FindWPG.cmake    2011-11-02 21:27:33.483172800 -0500
-@@ -18,8 +18,8 @@ ELSE (LIBWPG_INCLUDE_DIR AND LIBWPG_LIBR
-   IF (NOT WIN32)
-     INCLUDE(FindPkgConfig)
--    pkg_check_modules(LIBWPG libwpg-0.1)
-     pkg_check_modules(LIBWPG libwpg-0.2)
-+    pkg_check_modules(LIBWPG libwpg-0.1)
-     IF(LIBWPG_FOUND)
-         SET(LIBWPG_LIBRARY ${LIBWPG_LIBRARIES})
-     ENDIF(LIBWPG_FOUND)
-@@ -32,8 +32,8 @@ ELSE (LIBWPG_INCLUDE_DIR AND LIBWPG_LIBR
-   FIND_LIBRARY(LIBWPG_STREAM_LIBRARY
-       NAMES 
--        libwpg-stream-0.1 
--        wpg-stream-0.1 
-+        libwpg-stream-0.2 
-+        wpg-stream-0.2 
-         libwpd-stream-0.9 
-         wpd-stream-0.9
-         libwpd-stream
-@@ -45,7 +45,7 @@ ELSE (LIBWPG_INCLUDE_DIR AND LIBWPG_LIBR
-   FIND_PATH(LIBWPG_INCLUDE_DIR libwpg/libwpg.h
-       PATHS
-       ${LIBWPG_INCLUDE_DIRS}
--      PATH_SUFFIXES libwpg-0.1 libwpg-0.2 libwpg 
-+      PATH_SUFFIXES libwpg-0.2 libwpg-0.1 libwpg 
-   )
-   SET(LIBWPG_LIBRARIES ${LIBWPG_LIBRARY} ${LIBWPG_STREAM_LIBRARY})
similarity index 96%
rename from calligra-2.3.83-1.cygport
rename to calligra-2.3.83-2.cygport
index 249862df94334c89ec3600755b61f18e776391ea..e79feda816b8181dded3acfa254efafe8d13d809 100644 (file)
@@ -9,7 +9,6 @@ PATCH_URI="
        2.3.83-dcmtk-static.patch
        2.3.83-find-libkcal.patch
        2.3.83-find-librcps.patch
-       2.3.83-libwpd09.patch
        2.3.83-quickprint-exec.patch
 "
 
index ebd83fa38998ceb51af4d30bf95d416d64c773ef..408d19b1ee731f683a89ccdc2527e54b6544d8a5 100644 (file)
@@ -5,6 +5,7 @@ usr/bin/cygkdeinit4_calligraflow.dll
 usr/lib/kde4/flowdockersplugin.dll
 usr/lib/kde4/flowpart.dll
 usr/share/applications/kde4/flow.desktop
+usr/share/doc/calligra-flow/
 usr/share/kde4/apps/flow/
 usr/share/kde4/config/flowrc
 usr/share/kde4/config/flow_stencils.knsrc
index 857e7fb6171aa125c6a8f51bf6399041262672fe..a44e2c94b2c6e05fbe9fa465986873f8c42e0fa1 100644 (file)
@@ -54,6 +54,7 @@ usr/lib/kde4/vectorshape.dll
 usr/lib/kde4/videoshape.dll
 usr/lib/kde4/xsltexport.dll
 usr/lib/kde4/xsltimport.dll
+usr/share/doc/calligra-libs/
 usr/share/kde4/apps/formulashape/
 usr/share/kde4/apps/koproperty/
 usr/share/kde4/apps/musicshape/
index ae6b8633768214a2914f19f3caeaa032dad5a2a8..4bba87f5300ba4a8708d42df9f32f15e7613d7e5 100644 (file)
@@ -26,6 +26,7 @@ usr/lib/libplanworkfactory.dll.a
 usr/lib/librcps_plan.dll.a
 usr/share/applications/kde4/plan.desktop
 usr/share/applications/kde4/planwork.desktop
+usr/share/doc/calligra-plan/
 usr/share/icons/hicolor/128x128/apps/calligraplan.png
 usr/share/icons/hicolor/128x128/apps/planwork.png
 usr/share/icons/hicolor/128x128/mimetypes/application-x-vnd.kde.plan.png
index c5f3f1168e34aedabee012b4f36f38e72348e7c7..596f06a4078a32ecbc7a845028f70a7a4290edc5 100644 (file)
@@ -11,6 +11,7 @@ usr/lib/kde4/powerpointimport.dll
 usr/lib/kde4/pptximport.dll
 usr/lib/libcalligrastageprivate.dll.a
 usr/share/applications/kde4/stage.desktop
+usr/share/doc/calligra-stage/
 usr/share/icons/hicolor/16x16/actions/black.png
 usr/share/icons/hicolor/16x16/actions/highlight.png
 usr/share/icons/hicolor/16x16/actions/pen.png
index 424a4a1e4f2681df45aa6d1a48de7c4751dbf062..fe9cba3934e59df52fbb8e0d8afda67e776eb06f 100644 (file)
@@ -21,6 +21,7 @@ usr/lib/kde4/xlsximport.dll
 usr/lib/libcalligratables*
 usr/share/applications/kde4/tables.desktop
 usr/share/doc/HTML/en/tables/
+usr/share/doc/calligra-tables/
 usr/share/icons/hicolor/*/apps/kspread.*
 usr/share/kde4/apps/tables/
 usr/share/kde4/config/tablesrc
index 2e019dac1623b483d3e9cbacea90ceb9d5ebe061..2fbcab1f1e67e9ca295d583648fa8e6456097ed9 100644 (file)
@@ -3,3 +3,4 @@ usr/bin/calligraconverter.exe
 usr/bin/cstester.exe
 usr/bin/cstrunner.exe
 usr/bin/visualimagecompare.exe
+usr/share/doc/calligra-tools/
index cb8c89aba3ffef764920a6e38a66fd02d4497313..ad37b8c0825f50498c1b72281da8eb7e18bd4e10 100644 (file)
@@ -7,6 +7,7 @@ usr/lib/kde4/wmfexport.dll
 usr/lib/kde4/wmfimport.dll
 usr/lib/kde4/wpgimport.dll
 usr/share/applications/kde4/karbon.desktop
+usr/share/doc/karbon/
 usr/share/icons/hicolor/*/apps/karbon.*
 usr/share/kde4/apps/karbon/
 usr/share/kde4/config/karbonrc
index e003d6d9d4ca64a2a5278828c0c20d41e2a76370..8a69e40ff29c5c4131181e016154cea51592763b 100644 (file)
--- a/kexi.hint
+++ b/kexi.hint
@@ -1,5 +1,5 @@
 category: KDE Database
-requires: calligra-libs libgcc1 libglib2.0_0 libiconv2 libkdecore5 libmarblewidget12 libmysqlclient16 libpqxx3.1 libQt3Support4 libQtCore4 libQtGui4 libQtWebKit4 libQtXml4 libsqlite3_0 libstdc++6 libsybdb5 libxbase2.0_0
+requires: calligra-libs libgcc1 libglib2.0_0 libiconv2 libkdecore5 libmarblewidget12 libmysqlclient18 libpqxx3.1 libQt3Support4 libQtCore4 libQtGui4 libQtWebKit4 libQtXml4 libsqlite3_0 libstdc++6 libsybdb5 libxbase2.0_0
 external-source: calligra
 sdesc: "KDE data management application"
 ldesc: "Kexi is an integrated data management application. It can be 
index 5eff88290eb5c501e74ff5dff80d01d650a14296..66dce9ec800e146b0f56138a517e2da3631b7ce4 100644 (file)
--- a/kexi.list
+++ b/kexi.list
@@ -9,6 +9,7 @@ usr/lib/kde4/krossmodulekexidb.dll
 usr/lib/libkexi*
 usr/lib/libkformdesigner.dll.a
 usr/share/applications/kde4/kexi.desktop
+usr/share/doc/kexi/
 usr/share/kde4/apps/kexi/
 usr/share/kde4/config/kexirc
 usr/share/kde4/services/kexi*
index edc486c615947116057c4848d0bfa427f3304240..32ae6165675abd29d6335a56bfdfc8ef3a4b3cf4 100644 (file)
@@ -8,6 +8,7 @@ usr/lib/kde4/krita*
 usr/lib/libkrita*
 usr/share/applications/kde4/krita*
 usr/share/color/icc/krita/
+usr/share/doc/krita/
 usr/share/icons/hicolor/*/apps/krita.*
 usr/share/kde4/apps/krita/
 usr/share/kde4/apps/kritaplugins/
This page took 0.027828 seconds and 5 git commands to generate.