From 3fce90161730188c79396d3ac69e9927eaee7924 Mon Sep 17 00:00:00 2001 From: Patrick Franz Date: Mon, 30 Aug 2021 14:02:19 +0200 Subject: [PATCH] Various fixes. --- debian/changelog | 2 +- debian/control | 2 +- debian/copyright | 59 ++++++++++----------- debian/patches/remove_privacy_breaches.diff | 26 +++++++++ debian/patches/series | 2 + debian/rules | 5 +- 6 files changed, 58 insertions(+), 38 deletions(-) create mode 100644 debian/patches/remove_privacy_breaches.diff create mode 100644 debian/patches/series diff --git a/debian/changelog b/debian/changelog index 2f9e1ba..bf98a36 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,4 @@ -qt6base (6.1.2-1) unstable; urgency=medium +qt6base (6.1.2+dfsg-1) unstable; urgency=medium * Initial release (Closes: #nnnn) diff --git a/debian/control b/debian/control index 70fda73..9e3fff6 100644 --- a/debian/control +++ b/debian/control @@ -326,7 +326,7 @@ Depends: libqt6concurrent6 (= ${binary:Version}), libqt6test6 (= ${binary:Version}), libqt6widgets6 (= ${binary:Version}), libqt6xml6 (= ${binary:Version}), - qt6base (= ${binary:Version}), + qt6base-dev-tools (= ${binary:Version}), ${misc:Depends} Description: Qt 6 base development files Qt is a cross-platform C++ application framework. Qt's primary feature diff --git a/debian/copyright b/debian/copyright index df37edc..3eed84b 100644 --- a/debian/copyright +++ b/debian/copyright @@ -1,39 +1,34 @@ Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Upstream-Name: qtbase-everywhere-src -Upstream-Contact: -Source: +Source: https://download.qt.io/archive/qt/*/submodules/ +Files-Excluded: bin/licheck* + examples/xml/htmlinfo + src/3rdparty/gradle/gradle/wrapper/gradle-wrapper.jar + src/3rdparty/iaccessible2 + src/3rdparty/sqlite + src/3rdparty/wintab + tests/auto/corelib/serialization/qtextstream/rfc3261.txt + tests/auto/corelib/text/qbytearray/rfc3252.txt + tests/auto/network/access/qnetworkreply/bigfile + tests/auto/network/access/qnetworkreply/resource + tests/auto/network/access/qnetworkreply/rfc3252.txt + tests/manual/network_stresstest/qtest + tests/testserver/apache2/testdata/www/htdocs/protected/rfc3252.txt + tests/testserver/apache2/testdata/www/htdocs/rfcs/rfc2616.html + +# Removed non-free files: +# * RFCs (see QTBUG-30544 and QTBUG-30545) +# * htmlinfo example which contains non-free websites snapshots +# * src/3rdparty/gradle — built .jar file without source code +# * src/3rdparty/iaccessible2 — not preferred form of modification +# * src/3rdparty/sqlite — not preferred form of modification +# * src/3rdparty/wintab — license does not permit modification + Files: * -Copyright: - -License: GPL-3.0+ +Copyright: 2016-2021 The Qt Company Ltd. +License: LGPL-3 or GPL-2 Files: debian/* Copyright: 2021 Patrick Franz -License: GPL-3.0+ - -License: GPL-3.0+ - This program is free software: you can redistribute it and/or modify - it under the terms of the GNU General Public License as published by - the Free Software Foundation, either version 3 of the License, or - (at your option) any later version. - . - This package is distributed in the hope that it will be useful, - but WITHOUT ANY WARRANTY; without even the implied warranty of - MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the - GNU General Public License for more details. - . - You should have received a copy of the GNU General Public License - along with this program. If not, see . - . - On Debian systems, the complete text of the GNU General - Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". - -# Please also look if there are files or directories which have a -# different copyright/license attached and list them here. -# Please avoid picking licenses with terms that are more restrictive than the -# packaged work, as it may make Debian's contributions unacceptable upstream. -# -# If you need, there are some extra license texts available in two places: -# /usr/share/debhelper/dh_make/licenses/ -# /usr/share/common-licenses/ +License: LGPL-3 or GPL-2 diff --git a/debian/patches/remove_privacy_breaches.diff b/debian/patches/remove_privacy_breaches.diff new file mode 100644 index 0000000..e911149 --- /dev/null +++ b/debian/patches/remove_privacy_breaches.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 +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 new file mode 100644 index 0000000..007a6af --- /dev/null +++ b/debian/patches/series @@ -0,0 +1,2 @@ +# Debian specific +remove_privacy_breaches.diff diff --git a/debian/rules b/debian/rules index 0288bd0..c1080c3 100755 --- a/debian/rules +++ b/debian/rules @@ -1,13 +1,10 @@ #!/usr/bin/make -f -# See debhelper(7) (uncomment to enable) -# output every command that modifies files on the build system. #export DH_VERBOSE = 1 # Use already defined DEB_HOST_* variables. include /usr/share/dpkg/architecture.mk -# see FEATURE AREAS in dpkg-buildflags(1) -#export DEB_BUILD_MAINT_OPTIONS = hardening=+all +export DEB_BUILD_MAINT_OPTIONS = hardening=+all # see ENVIRONMENT in dpkg-buildflags(1) # package maintainers to append CFLAGS