From de531e68d466de3c9ed6efdca49a3144a3d1bac6 Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Wed, 12 Aug 2015 20:01:54 +0200 Subject: [PATCH] some improvements in debian $foo delete not used licensing for _qt4* only take DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed in rules --- debian/copyright | 57 ------------------------------------------------ debian/rules | 3 --- 2 files changed, 60 deletions(-) diff --git a/debian/copyright b/debian/copyright index 6048f31..55ad962 100644 --- a/debian/copyright +++ b/debian/copyright @@ -11,10 +11,6 @@ Files: qiconfix/* Copyright: 2013 Digia Plc and/or its subsidiary(-ies) License: LGPL-2.1-or-3-with-Digia-1.1-exception -Files: qiconfix/*_qt4* -Copyright: Copyright (C) 2011 Nokia Corporation and/or its subsidiary(-ies). -License: LGPL-2.1-with-Digia-1.1-exception or GPL-3 - Files: debian/* Copyright: 2014-2015 ChangZhuo Chen (陳昌倬) 2013-2015 Alf Gaida @@ -73,56 +69,3 @@ License: LGPL-2.1-or-3-with-Digia-1.1-exception . Furthermore, you are not required to apply this additional permission to a modified version of the Library. - -License: LGPL-2.1-with-Digia-1.1-exception - This file may be used under the terms of the GNU Lesser General Public - License version 2.1 as published by the Free Software Foundation and - appearing in the file LICENSE.LGPL included in the packaging of this - file. Please review the following information to ensure the GNU Lesser - General Public License version 2.1 requirements will be met: - http://www.gnu.org/licenses/old-licenses/lgpl-2.1.html. - . - On Debian systems, the complete text of the GNU Lesser General Public - License version 2.1 can be found in "/usr/share/common-licenses/LGPL-2.1". - . - In addition, as a special exception, Nokia gives you certain additional - rights. These rights are described in the Nokia Qt LGPL Exception - version 1.1, included in the file LGPL_EXCEPTION.txt in this package. - . - In addition, as a special exception, Digia gives you certain additional - rights. - . - Digia Qt LGPL Exception version 1.1: - As an additional permission to the GNU Lesser General Public License version - 2.1, the object code form of a "work that uses the Library" may incorporate - material from a header file that is part of the Library. You may distribute - such object code under terms of your choice, provided that: - . - (i) the header files of the Library have not been modified; and - (ii) the incorporated material is limited to numerical parameters, data - structure layouts, accessors, macros, inline functions and - templates; and - (iii) you comply with the terms of Section 6 of the GNU Lesser General - Public License version 2.1. - . - Moreover, you may apply this exception to a modified version of the Library, - provided that such modification does not involve copying material from the - Library into the modified Library's header files unless such material is - limited to (i) numerical parameters; (ii) data structure layouts; - (iii) accessors; and (iv) small macros, templates and inline functions of - five lines or less in length. - . - Furthermore, you are not required to apply this additional permission to a - modified version of the Library. - -License: GPL-3 - Alternatively, this file may be used under the terms of the GNU General - Public License version 3.0 as published by the Free Software Foundation - and appearing in the file LICENSE.GPL included in the packaging of this - file. Please review the following information to ensure the GNU General - Public License version 3.0 requirements will be met: - . - http://www.gnu.org/copyleft/gpl.html. - . - On Debian systems, the complete text of the GNU General Public License - 3 can be found in `/usr/share/common-licenses/GPL-3`. diff --git a/debian/rules b/debian/rules index 2a673de..d2eb5ee 100755 --- a/debian/rules +++ b/debian/rules @@ -3,9 +3,6 @@ export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed -DPKG_EXPORT_BUILDFLAGS = 1 -include /usr/share/dpkg/default.mk - %: dh ${@} --buildsystem cmake --parallel \