[SCM] qtbase packaging branch, master, updated. debian/5.2.0+dfsg-6-3-gdd85a4c

Lisandro Damián Nicanor Pérez lisandro at moszumanska.debian.org
Fri Jan 31 15:35:35 UTC 2014


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

The following commit has been merged in the master branch:
commit 15c6828b1898993f59894b0d757e7b167dc6ceab
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Tue Dec 31 19:06:12 2013 -0300

    Patch out Google AdSense tracker from examples.
---
 debian/changelog                           |  1 +
 debian/patches/remove_google_adsense.patch | 17 +++++++++++++++++
 debian/patches/series                      |  1 +
 3 files changed, 19 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 69e43e0..f8e5814 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,7 @@ qtbase-opensource-src (5.2.0+dfsg-4) UNRELEASED; urgency=medium
   * Enable processor detection for s390[x] and sparc.
     - Do not use Wcast-align on header's tests on sparc, thus avoiding a FTBFS.
   * Update symbols files using buildds' logs.
+  * Patch out Google-AdSense tracker from examples.
 
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Thu, 26 Dec 2013 21:21:17 +0400
 
diff --git a/debian/patches/remove_google_adsense.patch b/debian/patches/remove_google_adsense.patch
new file mode 100644
index 0000000..8311275
--- /dev/null
+++ b/debian/patches/remove_google_adsense.patch
@@ -0,0 +1,17 @@
+--- a/examples/xml/htmlinfo/trolltech_com.html
++++ b/examples/xml/htmlinfo/trolltech_com.html
+@@ -23,14 +23,6 @@
+               content="Trolltech creates application development platforms for desktop and mobile device innovation." />
+         <meta name="keywords" content="" />
+     
+-<script src="http://www.google-analytics.com/urchin.js" type="text/javascript"><!--  --></script>
+-<script type="text/javascript">
+-    <!-- Urchin script
+-                _uacct = "UA-4457116-1";
+-                urchinTracker();
+-    -->
+-	</script>
+-      
+         <base href="http://trolltech.com/homepage" />
+       
+     
diff --git a/debian/patches/series b/debian/patches/series
index 527f0af..e3c33cb 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -11,3 +11,4 @@ enable_sparc_detection.patch
 do_not_pass_wcast-align_on_sparc.patch
 
 # Debian specific.
+remove_google_adsense.patch

-- 
qtbase packaging



More information about the pkg-kde-commits mailing list