[SCM] qtbase packaging branch, kubuntu_unstable, updated. debian/5.4.0+dfsg-4-35-geff4780

[Rohan Garg]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=63c74c5

The following commit has been merged in the kubuntu_unstable branch:
commit 63c74c58ee32e46d0befa9c8db6eb4165317de77
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Wed Feb 18 19:59:19 2015 -0300

    Add remove_privacy_breachs.diff
    
    In order to remove some non-used javascript
    code. It is not really needed, but it's the best way to calm down Lintian
    and be sure nothing will break in the future.
---
 debian/changelog                           |  3 +++
 debian/patches/remove_privacy_breachs.diff | 26 ++++++++++++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 30 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 522e3b4..f93044e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -23,6 +23,9 @@ qtbase-opensource-src (5.4.0+dfsg-5) UNRELEASED; urgency=medium
   * Add libinput-dev as build dependency, a test is looking for it.
   * Simplify debian/qtbase5-dev.install-common. It will easy the development
     of the packages.
+  * Add remove_privacy_breachs.diff in order to remove some non-used javascript
+    code. It is not really needed, but it's the best way to calm down Lintian
+    and be sure nothing will break in the future.
 
   [ Dmitry Shachnev ]
   * Drop private marks from QCollator, QOpenGLWidget and QAccessible*
diff --git a/debian/patches/remove_privacy_breachs.diff b/debian/patches/remove_privacy_breachs.diff
new file mode 100644
index 0000000..e911149
--- /dev/null
+++ b/debian/patches/remove_privacy_breachs.diff
@@ -0,0 +1,26 @@
+Description: remove non-used privacy-breach code
+ This code makes Lintian unhappy. But we are really not using it, it only
+ gets inserted when building the online doc.
+ Anyways the best way to calm down Lintian is to simply remove it.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: not-needed
+Last-Update: 2015-02-18
+
+---
+ doc/global/template/scripts/main.js |    5 -----
+ 1 file changed, 5 deletions(-)
+
+--- a/doc/global/template/scripts/main.js
++++ b/doc/global/template/scripts/main.js
+@@ -94,11 +94,6 @@ $(document).ready(function($) {
+ });
+ 
+ $( window ).load(function() {
+-    load_sdk('script', 'facebook-jssdk','//connect.facebook.net/en_US/sdk.js#xfbml=1&appId=207346529386114&version=v2.0');
+-    load_sdk('script', 'twitter-wjs', '//platform.twitter.com/widgets.js');
+-    $.getScript("//www.google.com/jsapi", function(){
+-        google.load("feeds", "1", {"callback": oneQt.liveFeeds});
+-    });
+ });
+ 
+ var oneQt = {
diff --git a/debian/patches/series b/debian/patches/series
index fe4f9d2..9591ea2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -7,3 +7,4 @@ gnukfreebsd.diff
 # Debian specific.
 revert_upstream_bsymbolic_change.patch
 no_htmlinfo_example.diff
+remove_privacy_breachs.diff

-- 
qtbase packaging