[SCM] Calligra suite packaging branch, master, updated. debian/2.8.5+dfsg-1-7-gfd60ca3

[Raúl Sánchez Siles]

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

The following commit has been merged in the master branch:
commit fd60ca3eb405392e9e416be2878c6a53bbc2ab12
Author: Raúl Sánchez Siles <rasasi78 at gmail.com>
Date:   Sun Oct 5 00:36:40 2014 +0200

    Refresh xbase64.diff patch
---
 debian/changelog            |  1 +
 debian/patches/xbase64.diff | 16 ++++------------
 2 files changed, 5 insertions(+), 12 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3dca925..e4ea777 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,7 @@
 calligra (1:2.8.6+dfsg-1) UNRELEASED; urgency=medium
 
   * New upstream version 2.8.6
+  	- Refresh xbase64.diff patch
 
   [ Pino Toscano ]
   * watch file: ignore +dfsg suffix in Debian version number.
diff --git a/debian/patches/xbase64.diff b/debian/patches/xbase64.diff
index 73764d7..06ef73c 100644
--- a/debian/patches/xbase64.diff
+++ b/debian/patches/xbase64.diff
@@ -1,5 +1,3 @@
-Index: b/cmake/modules/FindXBase.cmake
-===================================================================
 --- a/cmake/modules/FindXBase.cmake
 +++ b/cmake/modules/FindXBase.cmake
 @@ -13,11 +13,11 @@
@@ -17,8 +15,6 @@ Index: b/cmake/modules/FindXBase.cmake
  
         include(FindPackageHandleStandardArgs)
         FIND_PACKAGE_HANDLE_STANDARD_ARGS(XBase DEFAULT_MSG XBase_INCLUDE_DIR XBase_LIBRARIES )
-Index: b/kexi/kexidb/drivers/xbase/xbaseexport.cpp
-===================================================================
 --- a/kexi/kexidb/drivers/xbase/xbaseexport.cpp
 +++ b/kexi/kexidb/drivers/xbase/xbaseexport.cpp
 @@ -33,7 +33,7 @@
@@ -30,24 +26,20 @@ Index: b/kexi/kexidb/drivers/xbase/xbaseexport.cpp
  
  using namespace KexiDB;
  
-Index: b/kexi/migration/xbase/xbasemigrate.h
-===================================================================
 --- a/kexi/migration/xbase/xbasemigrate.h
 +++ b/kexi/migration/xbase/xbasemigrate.h
-@@ -24,7 +24,7 @@
+@@ -23,7 +23,7 @@
+ #include <QHash>
  
  #include <migration/keximigrate.h>
- #include <migration/keximigrate_p.h>
 -#include "xbase.h"
 +#include "xbase64.h"
  
  namespace KexiMigration
  {
-Index: b/kexi/migration/xbase/xbasemigrate.cpp
-===================================================================
 --- a/kexi/migration/xbase/xbasemigrate.cpp
 +++ b/kexi/migration/xbase/xbasemigrate.cpp
-@@ -254,7 +254,7 @@
+@@ -255,7 +255,7 @@
            memoBuffer = new char[blobFieldLength];
  
            #ifdef XB_LOCKING_ON
@@ -56,7 +48,7 @@ Index: b/kexi/migration/xbase/xbasemigrate.cpp
            #endif
  
            if ( ( returnCode = tableDbf->GetMemoField( j , blobFieldLength, memoBuffer, F_SETLKW ) ) != XB_NO_ERROR ) {
-@@ -263,7 +263,7 @@
+@@ -264,7 +264,7 @@
              val = KexiDB::cstringToVariant( memoBuffer, fieldsExpanded.at(j)->field, blobFieldLength );
            }
            #ifdef XB_LOCKING_ON

-- 
Calligra suite packaging