[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-10-g6feb5be
Raúl Sánchez Siles
kebianizao-guest at moszumanska.debian.org
Mon Oct 6 10:24:53 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/calligra.git;a=commitdiff;h=6499d71
The following commit has been merged in the master branch:
commit 6499d71efbcf0000c981fb5f14cf4eb3c99e6c24
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date: Mon Oct 6 10:56:11 2014 +0200
Refresh switch-to-librevenge-based-import-libs.patch so dpkg-source accepts it.
--HG--
extra : amend_source : 34308dc37515d0f9a5c096927a42511a9c800671
---
debian/changelog | 1 +
.../switch-to-librevenge-based-import-libs.patch | 148 +++++++--------------
2 files changed, 51 insertions(+), 98 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index b81123c..40cc925 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ calligra (1:2.8.6+dfsg-1) UNRELEASED; urgency=medium
* New upstream version 2.8.6
- Refresh xbase64.diff patch
+ - Refresh switch-to-librevenge-based-import-libs.patch
[ Pino Toscano ]
* watch file: ignore +dfsg suffix in Debian version number.
diff --git a/debian/patches/switch-to-librevenge-based-import-libs.patch b/debian/patches/switch-to-librevenge-based-import-libs.patch
index de9c587..a479bab 100644
--- a/debian/patches/switch-to-librevenge-based-import-libs.patch
+++ b/debian/patches/switch-to-librevenge-based-import-libs.patch
@@ -33,10 +33,8 @@ Subject: [PATCH] switch to librevenge-based import libs
26 files changed, 177 insertions(+), 134 deletions(-)
create mode 100644 cmake/modules/FindLibRevenge.cmake
-Index: calligra/CMakeLists.txt
-===================================================================
---- calligra.orig/CMakeLists.txt 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/CMakeLists.txt 2014-07-12 22:58:04.965749343 +0200
+--- a/CMakeLists.txt
++++ b/CMakeLists.txt
@@ -661,6 +661,16 @@
macro_log_feature(OKULAR_FOUND "Okular" "Okular ODP Plugin" "http://okular.kde.org/" FALSE "" "Required to build the Okular OpenDocument Presenter plugin")
@@ -54,10 +52,8 @@ Index: calligra/CMakeLists.txt
## Test for libodfgen
##
macro_optional_find_package(LibOdfGen)
-Index: calligra/cmake/modules/FindLibEtonyek.cmake
-===================================================================
---- calligra.orig/cmake/modules/FindLibEtonyek.cmake 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/cmake/modules/FindLibEtonyek.cmake 2014-07-12 22:58:04.965749343 +0200
+--- a/cmake/modules/FindLibEtonyek.cmake
++++ b/cmake/modules/FindLibEtonyek.cmake
@@ -10,16 +10,16 @@
include(LibFindMacros)
@@ -78,10 +74,8 @@ Index: calligra/cmake/modules/FindLibEtonyek.cmake
HINTS ${LIBETONYEK_PKGCONF_LIBRARY_DIRS} ${LIBETONYEK_PKGCONF_LIBDIR}
)
-Index: calligra/cmake/modules/FindLibOdfGen.cmake
-===================================================================
---- calligra.orig/cmake/modules/FindLibOdfGen.cmake 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/cmake/modules/FindLibOdfGen.cmake 2014-07-12 22:58:04.965749343 +0200
+--- a/cmake/modules/FindLibOdfGen.cmake
++++ b/cmake/modules/FindLibOdfGen.cmake
@@ -9,16 +9,16 @@
# Redistribution and use is allowed according to the terms of the BSD license.
@@ -102,10 +96,8 @@ Index: calligra/cmake/modules/FindLibOdfGen.cmake
HINTS ${LIBODFGEN_PKGCONF_LIBRARY_DIRS} ${LIBODFGEN_PKGCONF_LIBDIR}
)
-Index: calligra/cmake/modules/FindLibRevenge.cmake
-===================================================================
---- /dev/null 1970-01-01 00:00:00.000000000 +0000
-+++ calligra/cmake/modules/FindLibRevenge.cmake 2014-07-12 22:58:04.965749343 +0200
+--- /dev/null
++++ b/cmake/modules/FindLibRevenge.cmake
@@ -0,0 +1,37 @@
+# - Try to find the librevenge
+# Once done this will define
@@ -144,10 +136,8 @@ Index: calligra/cmake/modules/FindLibRevenge.cmake
+set(LIBREVENGE_PROCESS_LIBS REVENGE_LIBRARY REVENGE_STREAM_LIBRARY)
+set(LIBREVENGE_PROCESS_INCLUDES REVENGE_INCLUDE_DIR REVENGE_STREAM_INCLUDE_DIR)
+libfind_process(LIBREVENGE)
-Index: calligra/cmake/modules/FindLibVisio.cmake
-===================================================================
---- calligra.orig/cmake/modules/FindLibVisio.cmake 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/cmake/modules/FindLibVisio.cmake 2014-07-12 22:58:04.965749343 +0200
+--- a/cmake/modules/FindLibVisio.cmake
++++ b/cmake/modules/FindLibVisio.cmake
@@ -12,16 +12,16 @@
include(LibFindMacros)
libfind_package(LIBWPD LibWpd)
@@ -168,10 +158,8 @@ Index: calligra/cmake/modules/FindLibVisio.cmake
HINTS ${LIBVISIO_PKGCONF_LIBRARY_DIRS} ${LIBVISIO_PKGCONF_LIBDIR}
)
-Index: calligra/cmake/modules/FindLibWpd.cmake
-===================================================================
---- calligra.orig/cmake/modules/FindLibWpd.cmake 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/cmake/modules/FindLibWpd.cmake 2014-07-12 22:58:04.965749343 +0200
+--- a/cmake/modules/FindLibWpd.cmake
++++ b/cmake/modules/FindLibWpd.cmake
@@ -8,31 +8,19 @@
#
@@ -209,10 +197,8 @@ Index: calligra/cmake/modules/FindLibWpd.cmake
+set(LIBWPD_PROCESS_LIBS WPD_LIBRARY)
+set(LIBWPD_PROCESS_INCLUDES WPD_INCLUDE_DIR)
libfind_process(LIBWPD)
-Index: calligra/cmake/modules/FindLibWpg.cmake
-===================================================================
---- calligra.orig/cmake/modules/FindLibWpg.cmake 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/cmake/modules/FindLibWpg.cmake 2014-07-12 22:58:04.965749343 +0200
+--- a/cmake/modules/FindLibWpg.cmake
++++ b/cmake/modules/FindLibWpg.cmake
@@ -11,16 +11,16 @@
include(LibFindMacros)
@@ -233,10 +219,8 @@ Index: calligra/cmake/modules/FindLibWpg.cmake
HINTS ${LIBWPG_PKGCONF_LIBRARY_DIRS} ${LIBWPG_PKGCONF_LIBDIR}
)
-Index: calligra/cmake/modules/FindLibWps.cmake
-===================================================================
---- calligra.orig/cmake/modules/FindLibWps.cmake 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/cmake/modules/FindLibWps.cmake 2014-07-12 22:58:04.965749343 +0200
+--- a/cmake/modules/FindLibWps.cmake
++++ b/cmake/modules/FindLibWps.cmake
@@ -10,16 +10,16 @@
include(LibFindMacros)
@@ -257,10 +241,8 @@ Index: calligra/cmake/modules/FindLibWps.cmake
HINTS ${LIBWPS_PKGCONF_LIBRARY_DIRS} ${LIBWPS_PKGCONF_LIBDIR}
)
-Index: calligra/filters/flow/visio/import/CMakeLists.txt
-===================================================================
---- calligra.orig/filters/flow/visio/import/CMakeLists.txt 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/flow/visio/import/CMakeLists.txt 2014-07-12 22:58:04.965749343 +0200
+--- a/filters/flow/visio/import/CMakeLists.txt
++++ b/filters/flow/visio/import/CMakeLists.txt
@@ -1,6 +1,7 @@
include_directories(
../../../libodfhandler/
@@ -278,10 +260,8 @@ Index: calligra/filters/flow/visio/import/CMakeLists.txt
install(TARGETS calligra_filter_vsdx2odg DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES calligra_filter_vsdx2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-Index: calligra/filters/flow/visio/import/VSDXImport.cpp
-===================================================================
---- calligra.orig/filters/flow/visio/import/VSDXImport.cpp 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/flow/visio/import/VSDXImport.cpp 2014-07-12 22:58:04.965749343 +0200
+--- a/filters/flow/visio/import/VSDXImport.cpp
++++ b/filters/flow/visio/import/VSDXImport.cpp
@@ -17,7 +17,7 @@
#include "VSDXImport.h"
@@ -313,19 +293,17 @@ Index: calligra/filters/flow/visio/import/VSDXImport.cpp
return libvisio::VisioDocument::parse(input, &exporter);
}
};
-Index: calligra/filters/flow/wpg/import/CMakeLists.txt
-===================================================================
---- calligra.orig/filters/flow/wpg/import/CMakeLists.txt 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/flow/wpg/import/CMakeLists.txt 2014-07-12 22:58:04.965749343 +0200
+--- a/filters/flow/wpg/import/CMakeLists.txt
++++ b/filters/flow/wpg/import/CMakeLists.txt
@@ -1,6 +1,7 @@
include_directories(
../../../libodfhandler/
${LIBODFGEN_INCLUDE_DIRS}
+ ${LIBREVENGE_INCLUDE_DIRS}
${LIBVISIO_INCLUDE_DIRS}
+ ${LIBWPG_INCLUDE_DIRS}
${KOMAIN_INCLUDES}
- )
-@@ -15,7 +16,7 @@
+@@ -16,7 +17,7 @@
kde4_add_plugin(calligra_filter_wpg2odg ${wpg2odg_PART_SRCS})
@@ -334,10 +312,8 @@ Index: calligra/filters/flow/wpg/import/CMakeLists.txt
install(TARGETS calligra_filter_wpg2odg DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES calligra_filter_wpg2odg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-Index: calligra/filters/flow/wpg/import/WPGImport.cpp
-===================================================================
---- calligra.orig/filters/flow/wpg/import/WPGImport.cpp 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/flow/wpg/import/WPGImport.cpp 2014-07-12 22:58:04.965749343 +0200
+--- a/filters/flow/wpg/import/WPGImport.cpp
++++ b/filters/flow/wpg/import/WPGImport.cpp
@@ -17,7 +17,7 @@
#include "WPGImport.h"
@@ -369,10 +345,8 @@ Index: calligra/filters/flow/wpg/import/WPGImport.cpp
return libwpg::WPGraphics::parse(input, &exporter);
}
};
-Index: calligra/filters/karbon/wpg/CMakeLists.txt
-===================================================================
---- calligra.orig/filters/karbon/wpg/CMakeLists.txt 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/karbon/wpg/CMakeLists.txt 2014-07-12 22:58:04.965749343 +0200
+--- a/filters/karbon/wpg/CMakeLists.txt
++++ b/filters/karbon/wpg/CMakeLists.txt
@@ -1,11 +1,11 @@
-include_directories(${CMAKE_BINARY_DIR}/filters/ ${LIBWPD_INCLUDE_DIRS} ${LIBWPG_INCLUDE_DIR}/)
@@ -387,10 +361,8 @@ Index: calligra/filters/karbon/wpg/CMakeLists.txt
install(TARGETS calligra_filter_wpg2svg DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES calligra_filter_wpg2svg.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-Index: calligra/filters/karbon/wpg/WPGImport.cpp
-===================================================================
---- calligra.orig/filters/karbon/wpg/WPGImport.cpp 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/karbon/wpg/WPGImport.cpp 2014-07-12 22:58:04.965749343 +0200
+--- a/filters/karbon/wpg/WPGImport.cpp
++++ b/filters/karbon/wpg/WPGImport.cpp
@@ -32,14 +32,12 @@
#include <QString>
#include <QFile>
@@ -468,10 +440,8 @@ Index: calligra/filters/karbon/wpg/WPGImport.cpp
outputFile.close();
return KoFilter::OK;
-Index: calligra/filters/libodfhandler/DiskDocumentHandler.cxx
-===================================================================
---- calligra.orig/filters/libodfhandler/DiskDocumentHandler.cxx 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/libodfhandler/DiskDocumentHandler.cxx 2014-07-12 22:58:04.965749343 +0200
+--- a/filters/libodfhandler/DiskDocumentHandler.cxx
++++ b/filters/libodfhandler/DiskDocumentHandler.cxx
@@ -37,7 +37,7 @@
{
}
@@ -514,10 +484,8 @@ Index: calligra/filters/libodfhandler/DiskDocumentHandler.cxx
if (sEscapedCharacters.len() > 0)
PUTSTRING(sEscapedCharacters.cstr());
}
-Index: calligra/filters/libodfhandler/DiskDocumentHandler.hxx
-===================================================================
---- calligra.orig/filters/libodfhandler/DiskDocumentHandler.hxx 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/libodfhandler/DiskDocumentHandler.hxx 2014-07-12 22:58:04.969749185 +0200
+--- a/filters/libodfhandler/DiskDocumentHandler.hxx
++++ b/filters/libodfhandler/DiskDocumentHandler.hxx
@@ -23,7 +23,7 @@
#ifndef _DISKDOCUMENTHANDLER_H
#define _DISKDOCUMENTHANDLER_H
@@ -548,10 +516,8 @@ Index: calligra/filters/libodfhandler/DiskDocumentHandler.hxx
};
#endif
-Index: calligra/filters/libodfhandler/OutputFileHelper.cxx
-===================================================================
---- calligra.orig/filters/libodfhandler/OutputFileHelper.cxx 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/libodfhandler/OutputFileHelper.cxx 2014-07-12 22:58:04.969749185 +0200
+--- a/filters/libodfhandler/OutputFileHelper.cxx
++++ b/filters/libodfhandler/OutputFileHelper.cxx
@@ -37,7 +37,7 @@
#include "DiskDocumentHandler.hxx"
@@ -576,10 +542,8 @@ Index: calligra/filters/libodfhandler/OutputFileHelper.cxx
OdfDocumentHandler *pHandler;
#ifdef USE_GSF_OUTPUT
-Index: calligra/filters/libodfhandler/OutputFileHelper.hxx
-===================================================================
---- calligra.orig/filters/libodfhandler/OutputFileHelper.hxx 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/libodfhandler/OutputFileHelper.hxx 2014-07-12 22:58:04.969749185 +0200
+--- a/filters/libodfhandler/OutputFileHelper.hxx
++++ b/filters/libodfhandler/OutputFileHelper.hxx
@@ -22,9 +22,10 @@
#ifndef _OUTPUTFILEHELPER_HXX
#define _OUTPUTFILEHELPER_HXX
@@ -604,10 +568,8 @@ Index: calligra/filters/libodfhandler/OutputFileHelper.hxx
OutputFileHelperImpl *m_impl;
private:
-Index: calligra/filters/libodfhandler/StdOutHandler.cxx
-===================================================================
---- calligra.orig/filters/libodfhandler/StdOutHandler.cxx 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/libodfhandler/StdOutHandler.cxx 2014-07-12 22:58:04.969749185 +0200
+--- a/filters/libodfhandler/StdOutHandler.cxx
++++ b/filters/libodfhandler/StdOutHandler.cxx
@@ -31,7 +31,7 @@
printf("<?xml version=\"1.0\"?>
");
}
@@ -650,10 +612,8 @@ Index: calligra/filters/libodfhandler/StdOutHandler.cxx
}
void StdOutHandler::endDocument()
-Index: calligra/filters/libodfhandler/StdOutHandler.hxx
-===================================================================
---- calligra.orig/filters/libodfhandler/StdOutHandler.hxx 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/libodfhandler/StdOutHandler.hxx 2014-07-12 22:58:04.969749185 +0200
+--- a/filters/libodfhandler/StdOutHandler.hxx
++++ b/filters/libodfhandler/StdOutHandler.hxx
@@ -23,7 +23,7 @@
#ifndef _STDOUTHANDLER_H
#define _STDOUTHANDLER_H
@@ -679,10 +639,8 @@ Index: calligra/filters/libodfhandler/StdOutHandler.hxx
};
#endif
-Index: calligra/filters/words/wordperfect/import/CMakeLists.txt
-===================================================================
---- calligra.orig/filters/words/wordperfect/import/CMakeLists.txt 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/words/wordperfect/import/CMakeLists.txt 2014-07-12 22:58:04.969749185 +0200
+--- a/filters/words/wordperfect/import/CMakeLists.txt
++++ b/filters/words/wordperfect/import/CMakeLists.txt
@@ -1,6 +1,7 @@
include_directories(
../../../libodfhandler/
@@ -700,10 +658,8 @@ Index: calligra/filters/words/wordperfect/import/CMakeLists.txt
install(TARGETS calligra_filter_wpd2odt DESTINATION ${PLUGIN_INSTALL_DIR})
-Index: calligra/filters/words/wordperfect/import/WPDImport.cpp
-===================================================================
---- calligra.orig/filters/words/wordperfect/import/WPDImport.cpp 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/words/wordperfect/import/WPDImport.cpp 2014-07-12 22:58:04.969749185 +0200
+--- a/filters/words/wordperfect/import/WPDImport.cpp
++++ b/filters/words/wordperfect/import/WPDImport.cpp
@@ -18,8 +18,7 @@
#include <libwpd/libwpd.h>
@@ -808,10 +764,8 @@ Index: calligra/filters/words/wordperfect/import/WPDImport.cpp
return true;
return false;
}
-Index: calligra/filters/words/works/import/CMakeLists.txt
-===================================================================
---- calligra.orig/filters/words/works/import/CMakeLists.txt 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/words/works/import/CMakeLists.txt 2014-07-12 22:58:04.969749185 +0200
+--- a/filters/words/works/import/CMakeLists.txt
++++ b/filters/words/works/import/CMakeLists.txt
@@ -1,6 +1,7 @@
include_directories(
../../../libodfhandler/
@@ -829,10 +783,8 @@ Index: calligra/filters/words/works/import/CMakeLists.txt
install(TARGETS calligra_filter_wps2odt DESTINATION ${PLUGIN_INSTALL_DIR})
install(FILES calligra_filter_wps2odt.desktop DESTINATION ${SERVICES_INSTALL_DIR})
-Index: calligra/filters/words/works/import/WPSImport.cpp
-===================================================================
---- calligra.orig/filters/words/works/import/WPSImport.cpp 2014-07-12 22:58:04.973749026 +0200
-+++ calligra/filters/words/works/import/WPSImport.cpp 2014-07-12 22:58:04.969749185 +0200
+--- a/filters/words/works/import/WPSImport.cpp
++++ b/filters/words/works/import/WPSImport.cpp
@@ -16,9 +16,9 @@
#include "WPSImport.h"
--
Calligra suite packaging
More information about the pkg-kde-commits
mailing list