[SCM] qtbase packaging branch, experimental, updated. debian/5.4.0+dfsg-2-3-gb268885
Dmitry Shachnev
mitya57 at moszumanska.debian.org
Wed Dec 17 18:27:31 UTC 2014
Gitweb-URL: http://git.debian.org/?p=pkg-kde/qt/qtbase.git;a=commitdiff;h=b268885
The following commit has been merged in the experimental branch:
commit b268885616da53cb040e720b541eb9fc9c814be1
Author: Dmitry Shachnev <mitya57 at gmail.com>
Date: Wed Dec 17 21:26:58 2014 +0300
Do not ship htmlinfo example which contains non-free HTML pages.
---
debian/changelog | 3 ++
debian/patches/no_htmlinfo_example.diff | 15 ++++++
debian/patches/remove_google_adsense.patch | 69 ---------------------------
debian/patches/remove_icon_from_example.patch | 24 ----------
debian/patches/series | 3 +-
debian/rules | 2 +
6 files changed, 21 insertions(+), 95 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 0df21f4..d9fe30c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,9 @@ qtbase-opensource-src (5.4.0+dfsg-3) UNRELEASED; urgency=medium
[ Dmitry Shachnev ]
* More debian/copyright updates.
+ * Do not ship htmlinfo example which contains non-free HTML pages.
+ * Drop remove_icon_from_example.patch and remove_google_adsense.patch,
+ no longer needed with the above change.
-- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org> Wed, 17 Dec 2014 21:05:31 +0300
diff --git a/debian/patches/no_htmlinfo_example.diff b/debian/patches/no_htmlinfo_example.diff
new file mode 100644
index 0000000..8632c4a
--- /dev/null
+++ b/debian/patches/no_htmlinfo_example.diff
@@ -0,0 +1,15 @@
+Description: disable htmlinfo example which contains non-free files
+Author: Dmitry Shachnev <mitya57 at debian.org>
+Forwarded: not-needed
+Last-Update: 2014-12-17
+
+--- a/examples/xml/xml.pro
++++ b/examples/xml/xml.pro
+@@ -1,6 +1,5 @@
+ TEMPLATE = subdirs
+-SUBDIRS = htmlinfo \
+- xmlstreamlint
++SUBDIRS = xmlstreamlint
+
+ qtHaveModule(widgets) {
+ SUBDIRS += dombookmarks \
diff --git a/debian/patches/remove_google_adsense.patch b/debian/patches/remove_google_adsense.patch
deleted file mode 100644
index bbad7fb..0000000
--- a/debian/patches/remove_google_adsense.patch
+++ /dev/null
@@ -1,69 +0,0 @@
-Description: remove tracking javascript from examples
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Last-Update: 2014-02-17
-
----
- examples/xml/htmlinfo/trolltech_com.html | 45 -------------------------------
- 1 file changed, 45 deletions(-)
-
---- 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" />
-
-
-@@ -910,43 +902,6 @@ are here:</span>
- </div>
-
- </div>
--<!-- ProspectXtractor tracker script -->
--<script type="text/javascript"><!--
--function _pxPar()
--{
--var p="";
--p+="&ref="+escape(top.document.referrer);
--p+="&dt="+escape(document.title);
--p+="&sr="+screen.width+"x"+screen.height;
--p+="&sd="+screen.colorDepth;
--p+="&fv="+_pxFV();
--return p;
--}
--function _pxFV()
--{
--var f=0,n=navigator;
--if (n.plugins && n.mimeTypes.length) {
--var x=n.plugins["Shockwave Flash"];
--if(x && x.description) {
--var y=x.description;
--f=y.charAt(y.indexOf('.')-1);
--}
--} else {
--r=false;
--for(var i=15;i>=3&&r!=true;i-=1){
--execScript('on error resume next: r=IsObject(CreateObject("ShockwaveFlash.ShockwaveFlash.'+i+'"))','VBScript');
--f=i;
--}
--}
--return f;
--}
--document.write('<img src="http://pxreg.onlineservicesas.com/pxreg/?id=50C9FD2F-61D5-4824-B726-50D6B1F89999'+_pxPar()+'" width="1" heigth="1" />');
--//-->
--</script>
--<noscript>
--<div><img src="http://pxreg.onlineservicesas.com/pxreg/?id=50C9FD2F-61D5-4824-B726-50D6B1F89999" width="1" height="1" alt="" /></div>
--</noscript>
--<!-- END ProspectXtractor tracker script -->
- </body>
- </html>
-
diff --git a/debian/patches/remove_icon_from_example.patch b/debian/patches/remove_icon_from_example.patch
deleted file mode 100644
index 17e0f88..0000000
--- a/debian/patches/remove_icon_from_example.patch
+++ /dev/null
@@ -1,24 +0,0 @@
-Description: remove icon link from example html file
- This patch removes a suposedly privacy breach detected by lintian.
- As the Trolltech site is down and the example is simply not working I am
- just removing the link to it.
-Author: Lisandro Damián Nicanor Pérez Meyer <lisandro at debian.org>
-Forwarded: not-needed
-Last-Update: 2014-06-25
-
----
- examples/xml/htmlinfo/trolltech_com.html | 3 ---
- 1 file changed, 3 deletions(-)
-
---- a/examples/xml/htmlinfo/trolltech_com.html
-+++ b/examples/xml/htmlinfo/trolltech_com.html
-@@ -110,9 +110,6 @@
- <style type="text/css" media="all">@import url(http://trolltech.com/IEFixes.css);</style>
- <![endif]-->
-
-- <link rel="shortcut icon" type="image/x-icon"
-- href="http://trolltech.com/favicon.ico" />
--
- <link rel="home" href="http://trolltech.com"
- title="Front page" />
- <link rel="search"
diff --git a/debian/patches/series b/debian/patches/series
index 4324065..3f7da24 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-remove_icon_from_example.patch
hurd_opengl_incldir.diff
mips_more_pre-mips32.diff
gnukfreebsd.diff
@@ -6,5 +5,5 @@ bsd_statfs.diff
bigendian_qimage_conversions.diff
# Debian specific.
-remove_google_adsense.patch
revert_upstream_bsymbolic_change.patch
+no_htmlinfo_example.diff
diff --git a/debian/rules b/debian/rules
index 39e6c81..74edea8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -349,3 +349,5 @@ prune-nonfree:
rm -fv lib/fonts/l*
# Delete Adobe's Utopia fonts. They do not seem to allow modification.
rm -fv lib/fonts/U*
+ # Contains non-free copies of webpages like youtube.com, etc
+ rm -fv examples/xml/htmlinfo/
--
qtbase packaging
More information about the pkg-kde-commits
mailing list