[SCM] kjs packaging branch, master, updated. debian/5.21.0-1-7-g71e331c

Maximiliano Curia maxy at moszumanska.debian.org
Fri May 20 07:17:54 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/frameworks/kjs.git;a=commitdiff;h=0eff15f

The following commit has been merged in the master branch:
commit 0eff15f859b0fa859add1b32dd8ba90fb48cf5f1
Author: Automatic packaging <maxy+jenkins at gnuservers.com.ar>
Date:   Mon May 16 00:28:08 2016 +0200

    Refresh patches
---
 debian/patches/add_missing_ifndef      | 17 +++++++++++++----
 debian/patches/install_missing_headers | 17 +++++++++++++----
 2 files changed, 26 insertions(+), 8 deletions(-)

diff --git a/debian/patches/add_missing_ifndef b/debian/patches/add_missing_ifndef
index 08cf59f..b7d06c9 100644
--- a/debian/patches/add_missing_ifndef
+++ b/debian/patches/add_missing_ifndef
@@ -1,7 +1,16 @@
-Index: kjs/src/wtf/RefPtrHashMap.h
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Mon, 16 May 2016 00:28:07 +0200
+Subject: add_missing_ifndef
+
 ===================================================================
---- kjs.orig/src/wtf/RefPtrHashMap.h	2015-02-05 10:30:30.532783170 +0100
-+++ kjs/src/wtf/RefPtrHashMap.h	2015-02-05 15:44:25.579499347 +0100
+---
+ src/wtf/RefPtrHashMap.h | 7 ++++++-
+ 1 file changed, 6 insertions(+), 1 deletion(-)
+
+diff --git a/src/wtf/RefPtrHashMap.h b/src/wtf/RefPtrHashMap.h
+index c044efb..a8e003f 100644
+--- a/src/wtf/RefPtrHashMap.h
++++ b/src/wtf/RefPtrHashMap.h
 @@ -16,7 +16,10 @@
   * the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
   * Boston, MA 02110-1301, USA.
@@ -14,7 +23,7 @@ Index: kjs/src/wtf/RefPtrHashMap.h
  
  namespace WTF
  {
-@@ -347,3 +350,5 @@
+@@ -347,3 +350,5 @@ HashMap<RefPtr<T>, U, V, W, MappedTraits>::take(RawKeyType key)
  }
  
  } // namespace WTF
diff --git a/debian/patches/install_missing_headers b/debian/patches/install_missing_headers
index 02aa364..c15316e 100644
--- a/debian/patches/install_missing_headers
+++ b/debian/patches/install_missing_headers
@@ -1,8 +1,17 @@
-Index: kjs/src/kjs/CMakeLists.txt
+From: Debian/Kubuntu Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>
+Date: Mon, 16 May 2016 00:28:07 +0200
+Subject: install_missing_headers
+
 ===================================================================
---- kjs.orig/src/kjs/CMakeLists.txt	2015-03-23 15:59:49.011850825 +0100
-+++ kjs/src/kjs/CMakeLists.txt	2015-03-23 16:01:09.524640872 +0100
-@@ -305,10 +305,14 @@
+---
+ src/kjs/CMakeLists.txt | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/src/kjs/CMakeLists.txt b/src/kjs/CMakeLists.txt
+index a51a71d..6fc5361 100644
+--- a/src/kjs/CMakeLists.txt
++++ b/src/kjs/CMakeLists.txt
+@@ -305,10 +305,14 @@ install(FILES
    ustring.h
    value.h
    ${CMAKE_CURRENT_BINARY_DIR}/global.h

-- 
kjs packaging



More information about the pkg-kde-commits mailing list