From 3ecd036d3094b6edc6008c4e246a371dad97fa4c Mon Sep 17 00:00:00 2001 From: Alf Gaida Date: Mon, 31 Aug 2015 19:09:25 +0200 Subject: [PATCH] close itp bug sorted control with cme fixed copyright to LGPL2.1+ only fixed *.install removed patches added linker flags to rules added upstream signing key fixed watch file to use signing key --- debian/changelog | 6 +-- debian/control | 42 +++++++++---------- debian/copyright | 22 ++-------- debian/libsysstat-qt5-0-dev.install | 4 +- debian/libsysstat-qt5-0.install | 2 - debian/patches/fix-multiarch.patch | 22 ---------- debian/patches/series | 1 - debian/rules | 7 +--- debian/source/options | 1 - debian/upstream/signing-key.asc | 63 +++++++++++++++++++++++++++++ debian/watch | 3 +- 11 files changed, 93 insertions(+), 80 deletions(-) delete mode 100644 debian/patches/fix-multiarch.patch delete mode 100644 debian/patches/series create mode 100644 debian/upstream/signing-key.asc diff --git a/debian/changelog b/debian/changelog index 88bbde4..a42b110 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,5 +1,5 @@ -libsysstat (0.3.0-1) experimental; urgency=low +libsysstat (0.3.0+20150806-1) unstable; urgency=low - * Initial release (Closes: ) + * Initial release (Closes: #761270) - -- Alf Gaida Sat, 14 Feb 2015 17:58:32 +0100 + -- Alf Gaida Mon, 31 Aug 2015 18:42:31 +0200 diff --git a/debian/control b/debian/control index de4c919..5750409 100644 --- a/debian/control +++ b/debian/control @@ -1,27 +1,24 @@ Source: libsysstat +Maintainer: LXQt Packaging Team +Uploaders: Alf Gaida , + ChangZhuo Chen (陳昌倬) Section: libs Priority: optional -Maintainer: LXQt Packaging Team -Uploaders: - Alf Gaida , - ChangZhuo Chen (陳昌倬) , -Build-Depends: - cmake (>= 3.0.2), - debhelper (>= 9), - pkg-config, - qttools5-dev (>= 5.3), - qttools5-dev-tools (>= 5.3), +Build-Depends: debhelper (>= 9), + cmake (>= 3.0.2), + pkg-config, + qttools5-dev, + qttools5-dev-tools Standards-Version: 3.9.6 -Homepage: https://github.com/lxde/libsysstat -Vcs-Git: git://anonscm.debian.org/pkg-lxqt/libsysstat.git Vcs-Browser: http://anonscm.debian.org/cgit/pkg-lxqt/libsysstat.git +Vcs-Git: git://anonscm.debian.org/pkg-lxqt/libsysstat.git +Homepage: https://github.com/lxde/libsysstat Package: libsysstat-qt5-0 Architecture: any Multi-Arch: same -Depends: - ${shlibs:Depends}, - ${misc:Depends}, +Depends: ${shlibs:Depends}, + ${misc:Depends} Description: Qt-based interface to system statistics SysStat is a Qt-based interface to system statistics. . @@ -30,24 +27,21 @@ Description: Qt-based interface to system statistics Package: libsysstat-qt5-0-dev Architecture: any Section: libdevel -Depends: - ${misc:Depends}, - libsysstat-qt5-0 (= ${binary:Version}), +Depends: ${misc:Depends}, + libsysstat-qt5-0 (= ${binary:Version}) Description: Qt-based interface to system statistics (dev) SysStat is a Qt-based interface to system statistics. . This package contain the development files. Package: libsysstat-qt5-0-dbg -Architecture: any -Multi-arch: same +Architecture: any +Multi-Arch: same Section: debug Priority: extra -Depends: - ${misc:Depends}, - libsysstat-qt5-0 (= ${binary:Version}), +Depends: ${misc:Depends}, + libsysstat-qt5-0 (= ${binary:Version}) Description: Qt-based interface to system statistics (debug) SysStat is a Qt-based interface to system statistics. . This package contain the debugging symbols. - diff --git a/debian/copyright b/debian/copyright index 2a47bdd..141322c 100644 --- a/debian/copyright +++ b/debian/copyright @@ -5,7 +5,7 @@ Source: https://github.com/lxde/libsysstat Files: * Copyright: 2012-2015 LXQt team 2012 Razor team -License: GPL-2.0+ and LGPL-2.1+ +License: LGPL-2.1+ Files: debian/* Copyright: 2014-2015 Alf Gaida @@ -23,21 +23,5 @@ License: LGPL-2.1+ 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". - -License: GPL-2.0+ - This package 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 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 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 2 can be found in "/usr/share/common-licenses/GPL-2". + Public License version 2.1 can be found in + "/usr/share/common-licenses/LGPL-2.1". diff --git a/debian/libsysstat-qt5-0-dev.install b/debian/libsysstat-qt5-0-dev.install index 8af9f8c..ceb6c56 100644 --- a/debian/libsysstat-qt5-0-dev.install +++ b/debian/libsysstat-qt5-0-dev.install @@ -4,4 +4,6 @@ usr/lib/*/libsysstat-qt5.so usr/lib/*/pkgconfig/sysstat-qt5.pc usr/share/cmake/sysstat-qt5/sysstat-qt5-config.cmake -usr/share/cmake/sysstat-qt5/sysstat_use.cmake +usr/share/cmake/sysstat-qt5/sysstat-qt5-config-version.cmake +usr/share/cmake/sysstat-qt5/sysstat-qt5-targets.cmake +usr/share/cmake/sysstat-qt5/sysstat-qt5-targets-none.cmake diff --git a/debian/libsysstat-qt5-0.install b/debian/libsysstat-qt5-0.install index 89e2add..fb382d0 100644 --- a/debian/libsysstat-qt5-0.install +++ b/debian/libsysstat-qt5-0.install @@ -1,3 +1 @@ usr/lib/*/libsysstat-qt5.so.* -#usr/share/lxqt/translations/*.qm - diff --git a/debian/patches/fix-multiarch.patch b/debian/patches/fix-multiarch.patch deleted file mode 100644 index 76dab46..0000000 --- a/debian/patches/fix-multiarch.patch +++ /dev/null @@ -1,22 +0,0 @@ ---- a/CMakeLists.txt -+++ b/CMakeLists.txt -@@ -3,7 +3,7 @@ - project(libsysstat) - - # Set default installation paths --set(LIB_INSTALL_DIR "lib${LIB_SUFFIX}" CACHE PATH "Installation path for libraries") -+set(LIB_INSTALL_DIR "${CMAKE_INSTALL_LIBDIR}" CACHE PATH "Installation path for libraries") - set(INCLUDE_INSTALL_DIR include CACHE PATH "Installation path for includes") - - set(MAJOR_VERSION 0) ---- a/cmake/create_pkgconfig_file.cmake -+++ b/cmake/create_pkgconfig_file.cmake -@@ -28,7 +28,7 @@ - if(${CMAKE_SYSTEM_NAME} STREQUAL "FreeBSD") - install(FILES ${_pkgfname} DESTINATION libdata/pkgconfig) - else() -- install(FILES ${_pkgfname} DESTINATION lib${LIB_SUFFIX}/pkgconfig) -+ install(FILES ${_pkgfname} DESTINATION ${LIB_INSTALL_DIR}/pkgconfig) - endif() - - endmacro() diff --git a/debian/patches/series b/debian/patches/series deleted file mode 100644 index 665487f..0000000 --- a/debian/patches/series +++ /dev/null @@ -1 +0,0 @@ -fix-multiarch.patch diff --git a/debian/rules b/debian/rules index fe7b432..c704aef 100755 --- a/debian/rules +++ b/debian/rules @@ -1,22 +1,17 @@ #!/usr/bin/make -f #export DH_VERBOSE=1 - +export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed %: dh ${@} --buildsystem cmake --parallel - override_dh_auto_configure: dh_auto_configure -- \ -DCMAKE_INSTALL_LIBDIR=/usr/lib/$(DEB_HOST_MULTIARCH) - override_dh_install: dh_install --list-missing --fail-missing - override_dh_strip: dh_strip --dbg-package=libsysstat-qt5-0-dbg - - diff --git a/debian/source/options b/debian/source/options index be5dabe..112dfc8 100644 --- a/debian/source/options +++ b/debian/source/options @@ -1,2 +1 @@ tar-ignore=.gitignore - diff --git a/debian/upstream/signing-key.asc b/debian/upstream/signing-key.asc new file mode 100644 index 0000000..05cd1df --- /dev/null +++ b/debian/upstream/signing-key.asc @@ -0,0 +1,63 @@ +-----BEGIN PGP PUBLIC KEY BLOCK----- +Version: GnuPG v2.0.22 (GNU/Linux) + +mQINBFJevCYBEACx+Hvy+Vsuf+V5jeLUnzjAmHoy8DfTeGWr3ts30IapLHrfi0+U +WpzNnISO77yTr4VNboVZH+GHM/rnPfieODfB4ZW6CZLlInMSKUXcgQsEqXpyBZhA +Ib/SPy2bOfHly1uRJes0uRDsH5+v/hD74sByfnjQlrvI68O6wvGZmDFMNNPVO8+/ +OWBSBNkBuVrrZOMSPsLwQGJ4UtUQ4whburaPJG4VZJc5DLbzJGbEuACc0IAEYJS3 +7AfXVXn4j4Gc9F3o1xTUnbOBnwGPquWwUIm3FM7Ec2OdkvMt3EwvnkMAfeVrq3iE +FDD/KZTxdL0BZH3QD8gB7Jm4v4f3Nkobg6JCvCbcH3wBdZW4mASbwWzfRaDC2zHb +ErTglD7PpShLKZZ0pr9okWZEGw4Ku3q8ALi1JXK/ePTmsBlvkVskOJ3Nnd0avgH4 ++Q/vZoKfH8EhNY745rI+8CE9iv6V9XiSUt4CKEWAENt4A8hq6U2vV+jZv3B6AgD7 +ZjiI59yD4YuYubu8rCnNizTgh1voVw3ietknn/x2H5yH8fByWZ5uL87C0ky/uma6 +ZGbiiAtM4kdkyDMrfRV5nlEG9EKAGPVu5mjeSCrfkETwZ9OFPz1AuDye4ZEXrrcC +iRQ7RX6/GtW18aHER0kzGnfwx5KJzkDrRBY8A2PdXLBcrsN4WpK9EX01PQARAQAB +tCNKZXJvbWUgTGVjbGFuY2hlIDxqZXJvbWVAbGVjbGFuLmNoPokCPwQTAQIAKQUC +Ul68JgIbAwUJAeEzgAcLCQgHAwIBBhUIAgkKCwQWAgMBAh4BAheAAAoJEDfgrx/a +SPNzSHIP/1ewXcC0TFBcvDD7MrIP7anyNfiWfW7cxkR8GSamkg6HTa6Ndyr1FFjJ +OoDFUP37jWhu59CsHxs2D0zRWJktezfvElscRgqbHcdpIznqsGdI8hXCZafhBGVb +sdAB2LRawcXGxnXt7XajPcSVwLWRE62caBqohznU2iWvI780WNjEbZoA0LhZwaFF +UUPJm8ea9v0IkZVKUyg9WONZ1U7FEG9SaEiSpI8kJdx1fvCwZVDV/NRO5GqnJaho +P1LCne4YdwS6pt1/fRgk32IHxxZfHlLzLHxb6v1JmIg72x28qCmGyK9oFBDbbnYu +6Aq8XbHogOrD5vJM2Pfm2IhV0+JHOjfQbddv8tsAH1M+LI+tToXmg5st1AU3wnTn +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 +=fF8P +-----END PGP PUBLIC KEY BLOCK----- diff --git a/debian/watch b/debian/watch index a8db8aa..db32cc4 100644 --- a/debian/watch +++ b/debian/watch @@ -1,2 +1,3 @@ version=3 -https://github.com/lxde/libsysstat/releases .*/([\d\.]+).tar.gz +opts="pgpsigurlmangle=s/$/.asc/" \ + https://github.com/lxde/libsysstat/releases .*/([\d\.]+).tar.gz