licenses hopefully fixed

breaks and replaces removed rules improved, link --as-needed not used symbols removed
9 years ago · 17d699449d
parent a89e2b7e3f
commit 17d699449d
5 changed files with 153 additions and 27 deletions
--- a/debian/changelog
+++ b/debian/changelog
@ -1,3 +1,12 @@
+lxqt-config (0.9.0+20150806-2) UNRELEASED; urgency=medium
+
+  * removed breaks and replaces
+  * fixes in copyright
+  * removed debian/symbols
+  * add link --as-needed to rules to avoid warnings at build time
+
+ -- Alf Gaida <agaida@siduction.org>  Mon, 17 Aug 2015 21:32:53 +0200
+
 lxqt-config (0.9.0+20150806-1) unstable; urgency=medium

  [ Alf Gaida ]
--- a/debian/control
+++ b/debian/control
@ -29,8 +29,6 @@ Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/lxqt-config.git

 Package: lxqt-config
 Architecture: any
-Breaks: lxqt-config-qt5 (<< 0.9.0)
-Replaces: lxqt-config-qt5 (<< 0.9.0)
 Depends:
 ${misc:Depends},
 ${shlibs:Depends},
@ -41,8 +39,6 @@ Description: LXQt system settings center

 Package: lxqt-config-dbg
 Architecture: any
-Breaks: lxqt-config-qt5-dbg (<< 0.9.0)
-Replaces: lxqt-config-qt5-dbg (<< 0.9.0)
 Section: debug
 Priority: extra
 Depends:
--- a/debian/copyright
+++ b/debian/copyright
@ -5,13 +5,79 @@ Source: https://github.com/lxde/lxqt-config
 Files: *
 Copyright: 2012-2015 LXQt team
           2010-2012 Razor team
-License: GPL-2.0+ and LGPL-2.1+
+           2013 Christian Surlykke
+           2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+License: LGPL-2.1+
+
+Files: lxqt-config-appearance/iconthemeinfo.cpp
+Copyright: 2014 Digia Plc and/or its subsidiary(-ies)
+           2010-2011 Razor team
+License: LGPL-2.1-or-3-with-Digia-1.1-exception
+
+Files: src/qcategorizedview/*
+Copyright: 2007, 2009 Rafael Fernández López <ereslibre@kde.org>
+           2007 John Tapsell <tapsell@kde.org>
+License: LGPL-2.0+
+
+Files: liblxqt-config-cursor/cfgfile.h liblxqt-config-cursor/main.cpp
+ liblxqt-config-cursor/selectwnd.h liblxqt-config-cursor/main.h
+ liblxqt-config-cursor/selectwnd.cpp liblxqt-config-cursor/xcr/xcrtheme.h
+ liblxqt-config-cursor/xcr/xcrxcur.cpp liblxqt-config-cursor/xcr/xcrxcur.h
+ liblxqt-config-cursor/xcr/xcrthemefx.cpp liblxqt-config-cursor/xcr/xcrthemefx.h
+ liblxqt-config-cursor/xcr/xcrimg.h liblxqt-config-cursor/xcr/xcrthemexp.cpp
+ liblxqt-config-cursor/xcr/xcrtheme.cpp liblxqt-config-cursor/xcr/xcrthemexp.h
+ liblxqt-config-cursor/xcr/xcrimg.cpp
+Copyright: Ketmar <psyc://ketmar.no-ip.org/~Ketmar>
+License: WTFPL-2
+
+Files: liblxqt-config-cursor/thememodel.h liblxqt-config-cursor/itemdelegate.cpp
+ liblxqt-config-cursor/crtheme.h liblxqt-config-cursor/thememodel.cpp
+ liblxqt-config-cursor/crtheme.cpp liblxqt-config-cursor/itemdelegate.h
+Copyright: 2006-2007 Fredrik Höglund <fredrik@kde.org>
+License: GPL-3.0+
+
+Files: liblxqt-config-cursor/previewwidget.cpp
+ liblxqt-config-cursor/previewwidget.h
+Copyright: 2003-2007 Fredrik Höglund <fredrik@kde.org>
+License: GPL-2.0+
+
+Files: lxqt-config-input/lxqt-config-input.cpp lxqt-config-input/mouseconfig.cpp
+ lxqt-config-input/mouseconfig.h lxqt-config-input/keyboardconfig.h
+ lxqt-config-input/keyboardconfig.cpp
+Copyright: 2013-2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+License: GPL-2.0+
+
+Files: lxqt-config-monitor/monitor.h lxqt-config-monitor/main.cpp
+ lxqt-config-monitor/monitorwidget.cpp lxqt-config-monitor/monitorwidget.h
+ lxqt-config-monitor/main.h lxqt-config-monitor/xrandr.cpp
+ lxqt-config-monitor/monitor.cpp lxqt-config-monitor/monitorsettingsdialog.cpp
+ lxqt-config-monitor/quickoptions.cpp
+ lxqt-config-monitor/monitorsettingsdialog.h lxqt-config-monitor/quickoptions.h
+ lxqt-config-monitor/savesettings.h lxqt-config-monitor/monitorpicture.h
+ lxqt-config-monitor/xrandr.h lxqt-config-monitor/savesettings.cpp
+Copyright: 2014 P.L. Lucas <selairi@gmail.com>
+           2014 Hong Jen Yee (PCMan) <pcman.tw@gmail.com>
+License: GPL-2.0+

 Files: debian/*
 Copyright: 2014-2015 Alf Gaida <agaida@siduction.org>
           2015      Andrew Lee (李健秋) <ajqlee@debian.org>
 License: LGPL-2.1+

+License: LGPL-2.0+
+ This package is free software; you can redistribute it and/or
+ modify it under the terms of the GNU Lesser General Public
+ License as published by the Free Software Foundation; either
+ version 2 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
+ Lesser General Public License for more details.
+ .
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in "/usr/share/common-licenses/LGPL-2".
+
 License: LGPL-2.1+
 This program or library is free software; you can redistribute it
 and/or modify it under the terms of the GNU Lesser General Public
@ -23,8 +89,48 @@ License: LGPL-2.1+
 MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the GNU
 Lesser General Public License for more details.
 .
- 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".
+ 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".
+
+License: LGPL-2.1-or-3-with-Digia-1.1-exception
+ GNU Lesser General Public License:
+ This file may be used under the terms of the GNU Lesser General Public
+ License version 2.1 or version 3 as published by the Free Software
+ Foundation and appearing in the file LICENSE.LGPLv21 and LICENSE.LGPLv3
+ included in the packaging of this file. Please review the following
+ information to ensure the GNU Lesser General Public License requirements
+ will be met: https://www.gnu.org/licenses/lgpl.html.
+ .
+ On Debian systems, the complete text of the GNU Lesser General Public
+ License 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ The complete text of the GNU Lesser General Public License version 3 can be
+ found in `/usr/share/common-licenses/LGPL-3`.
+ .
+ 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-2.0+
 This package is free software; you can redistribute it and/or modify
@ -39,3 +145,36 @@ License: GPL-2.0+
 .
 On Debian systems, the complete text of the GNU General
 Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+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.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
+
+License: WTFPL-2
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ Version 2, December 2004
+ .
+ Copyright (C) 2004 Sam Hocevar <sam@hocevar.net>
+ .
+ Everyone is permitted to copy and distribute verbatim or modified
+ copies of this license document, and changing it is allowed as long
+ as the name is changed.
+ .
+ DO WHAT THE FUCK YOU WANT TO PUBLIC LICENSE
+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
+ .
+ 0. You just DO WHAT THE FUCK YOU WANT TO.
+
+
+
+
--- a/debian/rules
+++ b/debian/rules
@ -1,6 +1,8 @@
 #!/usr/bin/make -f
 #export DH_VERBOSE=1

+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
+
 %:
 	dh ${@} --buildsystem cmake --parallel

--- a/debian/symbols
+++ b/debian/symbols
@ -1,20 +0,0 @@
-liblxqt-config-cursor.so lxqt-config #MINVER#
- (c++)"SelectWnd::setCurrent()@Base" 0.8.0
- (c++)"SelectWnd::qt_metacall(QMetaObject::Call, int, void**)@Base" 0.8.0
- (c++)"SelectWnd::qt_metacast(char const*)@Base" 0.8.0
- (c++)"SelectWnd::showDirInfo()@Base" 0.8.0
- (c++)"SelectWnd::applyCurrent()@Base" 0.8.0
- (c++)"SelectWnd::handleWarning()@Base" 0.8.0
- (c++)"SelectWnd::currentChanged(QModelIndex const&, QModelIndex const&)@Base" 0.8.0
- (c++)"SelectWnd::staticMetaObject@Base" 0.8.0
- (c++)"SelectWnd::on_btRemove_clicked()@Base" 0.8.0
- (c++)"SelectWnd::on_btInstall_clicked()@Base" 0.8.0
- (c++)"SelectWnd::SelectWnd(LxQt::Settings*, QWidget*)@Base" 0.8.0
- (c++)"SelectWnd::~SelectWnd()@Base" 0.8.0
- (c++)"SelectWnd::metaObject() const@Base" 0.8.0
- (c++)"SelectWnd::iconsIsWritable() const@Base" 0.8.0
- (c++)"SelectWnd::selectRow(int) const@Base" 0.8.0
- (c++)"typeinfo for SelectWnd@Base" 0.8.0
- (c++)"typeinfo name for SelectWnd@Base" 0.8.0
- (c++)"vtable for SelectWnd@Base" 0.8.0
- (c++)"non-virtual thunk to SelectWnd::~SelectWnd()@Base" 0.8.0