[SCM] kross packaging branch, master, updated. a5c54d2e93907b96870eddc474990c54d89d026b

[Maximiliano Curia]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kross.git;a=commitdiff;h=5e46147

The following commit has been merged in the master branch:
commit 5e4614753b2040d7cd3cd0f4ea6f4875ffcf505e
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Mon Mar 23 16:45:46 2015 +0100

    Remove upstream applied patch: metafunction_header_char_to_qbytearraydata
---
 debian/changelog                                          |  2 ++
 debian/patches/metafunction_header_char_to_qbytearraydata | 13 -------------
 debian/patches/series                                     |  1 -
 3 files changed, 2 insertions(+), 14 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b9fcd11..153367a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ kross (5.8.0-1~) UNRELEASED; urgency=medium
 
   * New upstream release (5.7.0).
   * New upstream release (5.8.0).
+  * Remove upstream applied patch:
+    metafunction_header_char_to_qbytearraydata
 
  -- Maximiliano Curia <maxy at debian.org>  Sat, 14 Mar 2015 10:20:43 +0100
 
diff --git a/debian/patches/metafunction_header_char_to_qbytearraydata b/debian/patches/metafunction_header_char_to_qbytearraydata
deleted file mode 100644
index aee9d02..0000000
--- a/debian/patches/metafunction_header_char_to_qbytearraydata
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: kross/src/core/metafunction.h
-===================================================================
---- kross.orig/src/core/metafunction.h	2015-02-04 18:30:57.339367387 +0100
-+++ kross/src/core/metafunction.h	2015-02-04 18:31:30.130029517 +0100
-@@ -86,7 +86,7 @@
- 
-         // static metaobject
-         staticMetaObject.d.superdata = &QObject::staticMetaObject;
--        staticMetaObject.d.stringdata = m_stringData.data();
-+        staticMetaObject.d.stringdata = m_stringData.data_ptr();
-         staticMetaObject.d.data = m_data;
-         staticMetaObject.d.extradata = 0;
-     }
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 4484923..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-metafunction_header_char_to_qbytearraydata

-- 
kross packaging