[SCM] Qt 4 packaging branch, master, updated. debian/4.8.5+git192-g085f851+dfsg-2-10-g3c72732

[Lisandro Damián Nicanor Pérez]

Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qt4-x11.git;a=commitdiff;h=6810ade

The following commit has been merged in the master branch:
commit 6810ade6a25bdbb90ae962531b679089b3d9faed
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Sun Jan 12 00:26:35 2014 -0300

    Remove commented out AddSense script from static webpage
    
    Even if the script is commented out and so not functional lintian
    would find it and complain.
    I could also override lintian, but some people might not find that enough.
---
 debian/changelog                     |  2 ++
 debian/patches/remove_addsense.patch | 25 +++++++++++++++++++++++++
 debian/patches/series                |  1 +
 3 files changed, 28 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1b112aa..7110767 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ qt4-x11 (4:4.8.5+git209-g718fae5+dfsg-1) UNRELEASED; urgency=medium
   * New upstream git snapshot.
   * Update symbols files with buildd's and current build's logs.
   * Update Standards-Version to 3.9.5, no changes required.
+  * Remove commented out AddSense script from static webpage to keep lintian
+    calm.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Dec 2013 21:17:33 +0400
 
diff --git a/debian/patches/remove_addsense.patch b/debian/patches/remove_addsense.patch
new file mode 100644
index 0000000..b31f606
--- /dev/null
+++ b/debian/patches/remove_addsense.patch
@@ -0,0 +1,25 @@
+Description: remove commented out AddSense script from static webpage
+ Even if the script is commented out and so not functional lintian
+ would find it and complain.
+ I could also override lintian, but some people might not find that enough.
+Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
+Forwarded: not-needed
+
+--- a/examples/webkit/webkit-guide/_index.html
++++ b/examples/webkit/webkit-guide/_index.html
+@@ -308,15 +308,5 @@ entered (localStorage), but credit-card
+   <div id="blurpage">
+   </div>
+   <script src="scripts/functions.js" type="text/javascript"></script>
+-  <!-- <script type="text/javascript">
+-  var _gaq = _gaq || [];
+-  _gaq.push(['_setAccount', 'UA-4457116-5']);
+-  _gaq.push(['_trackPageview']);
+-  (function() {
+-  var ga = document.createElement('script'); ga.type = 'text/javascript'; ga.async = true;
+-  ga.src = ('https:' == document.location.protocol ? 'https://ssl' : 'http://www') + '.google-analytics.com/ga.js';
+-  var s = document.getElementsByTagName('script')[0]; s.parentNode.insertBefore(ga, s);
+-  })();
+-  </script> -->
+ </body>
+ </html>
diff --git a/debian/patches/series b/debian/patches/series
index 979ab22..317f9be 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -43,3 +43,4 @@ no_libicu_message.diff
 QTBUG-25324_assistant_segfault_on_start_with_gcc_4.7.patch
 qt-everywhere-opensource-src-4.8.5-QTBUG-22829.patch
 qtdoc-build-offline-docs.patch
+remove_addsense.patch

-- 
Qt 4 packaging