[neon/neon-packaging/hotspot/Neon/unstable] debian: copy manually from git at salsa.debian.org:debian/hotspot.git
Jonathan Esk-Riddell
null at kde.org
Fri Oct 14 15:42:39 BST 2022
Git commit 64d6e17a7e378bfb814abcddaba5a482dd1fe3bb by Jonathan Esk-Riddell.
Committed on 14/10/2022 at 14:42.
Pushed by jriddell into branch 'Neon/unstable'.
copy manually from git at salsa.debian.org:debian/hotspot.git
M +26 -6 debian/changelog
M +1 -1 debian/compat
M +34 -26 debian/control
M +126 -28 debian/copyright
A +47 -0 debian/hotspot.1
A +1 -0 debian/install
A +1 -0 debian/manpages
A +- -- debian/patches/0001-disable-test-perfdata-temporarily.patch
A +23 -0 debian/patches/0002-fix-build-on-mips.patch
A +2 -0 debian/patches/series
M +5 -20 debian/rules
M +4 -2 debian/watch
https://invent.kde.org/neon/neon-packaging/hotspot/commit/64d6e17a7e378bfb814abcddaba5a482dd1fe3bb
diff --git a/debian/changelog b/debian/changelog
index 3287dc5..96cff9a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,31 @@
-hotspot (1.3.0-0neon) bionic; urgency=medium
+hotspot (1.3.0-2) unstable; urgency=medium
- * New release
+ * Patch to fix build on mips (Closes: #982870)
- -- Neon CI <neon at kde.org> Mon, 31 Aug 2020 17:27:04 +0000
+ -- Yanhao Mo <yanhaocs at gmail.com> Sun, 21 Feb 2021 11:26:09 +0800
-hotspot (1.2.0-1) unstable; urgency=medium
+hotspot (1.3.0-1) unstable; urgency=medium
- * Initial release
+ * New upstream version 1.3.0 (Closes: #962296)
- -- Scarlett Clark <sgclark at kde.org> Mon, 06 Nov 2017 21:19:38 +0100
+ -- Yanhao Mo <yanhaocs at gmail.com> Sat, 09 Jan 2021 17:15:50 +0800
+
+hotspot (1.1.0+git20190211-1) unstable; urgency=high
+
+ * New release for debian.
+ * Update perfparser. (Closes: #921431)
+
+ -- Yanhao Mo <yanhaocs at gmail.com> Wed, 13 Feb 2019 16:20:45 +0800
+
+hotspot (1.1.0+git20180816-2) unstable; urgency=medium
+
+ * d/patches: Add a patch to disable testProc temporarily
+ (Closes: #914357) .
+
+ -- Yanhao Mo <yanhaocs at gmail.com> Mon, 07 Jan 2019 16:06:12 +0800
+
+hotspot (1.1.0+git20180816-1) unstable; urgency=low
+
+ * Initial release. Closes: #907393
+
+ -- Yanhao Mo <yanhaocs at gmail.com> Mon, 27 Aug 2018 17:53:49 +0800
diff --git a/debian/compat b/debian/compat
index f599e28..b4de394 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-10
+11
diff --git a/debian/control b/debian/control
index 861e0b0..29f1b04 100644
--- a/debian/control
+++ b/debian/control
@@ -1,32 +1,40 @@
Source: hotspot
-Section: devel
+Section: utils
Priority: optional
-Maintainer: Scarlett Clark <sgclark at kde.org>
-Build-Depends: cmake,
- debhelper (>=9),
- extra-cmake-modules,
- gettext,
- libdw-dev,
- libelf-dev,
- libkf5configwidgets-dev,
- libkf5coreaddons-dev,
- libkf5i18n-dev,
- libkf5itemmodels-dev,
- libkf5itemviews-dev,
- libkf5kio-dev,
- libkf5solid-dev,
- libkf5threadweaver-dev,
- libqt5svg5-dev,
- perfparser
-Standards-Version: 3.9.6
+Maintainer: Yanhao Mo <yanhaocs at gmail.com>
+Build-Depends:
+ debhelper (>=11~),
+ cmake,
+ extra-cmake-modules,
+ libkf5threadweaver-dev,
+ libkf5i18n-dev,
+ libkf5coreaddons-dev,
+ libkf5itemviews-dev,
+ libkf5itemmodels-dev,
+ libkf5kio-dev,
+ libkf5configwidgets-dev,
+ libkf5solid-dev,
+ libkf5windowsystem-dev,
+ libqt5svg5-dev,
+ libelf-dev,
+ libdw-dev,
+ gettext,
+Standards-Version: 4.2.1
Homepage: https://github.com/KDAB/hotspot
-Vcs-Git: git://anonscm.debian.org/pkg-kde/kde-extras/hotspot.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-kde/kde-extras/hotspot.git
+Vcs-Git: https://salsa.debian.org/debian/hotspot.git
+Vcs-Browser: https://salsa.debian.org/debian/hotspot
Package: hotspot
Architecture: any
-Depends: ${misc:Depends}, ${shlibs:Depends}
-Description: Linux perf GUI for performance analysis
- This project is a KDAB R&D effort to create a standalone GUI for performance data.
- As the first goal, we want to provide a UI like KCachegrind around Linux perf.
- Looking ahead, we intend to support various other performance data formats under this umbrella.
+Multi-Arch: foreign
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends},
+ linux-perf,
+ policykit-1,
+Description: GUI tool for performance analysis
+ hotspot project is a KDAB R&D effort to create a
+ standalone GUI tool for performance data. This tool
+ now only support perf output data. But is intended to
+ support various other performance data formats in the
+ future.
diff --git a/debian/copyright b/debian/copyright
index 87112cd..01aa7c1 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,15 +3,67 @@ Upstream-Name: hotspot
Source: https://github.com/KDAB/hotspot
Files: *
-Copyright: 2013-2017, Klarälvdalens Datakonsult AB, a KDAB Group company, info at kdab.com
+Copyright: 2013-2018, Klarälvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>
+License: GPL-2+
+
+Files: hotspot-config.h.cmake
+ scripts/*
+ src/*
+ tests/*
+Copyright: 2013-2018, Klarälvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>
License: GPL-2+
Files: debian/*
-Copyright: 2017 Scarlett Clark <sgclark at kde.org>
+Copyright: 2018, Yanhao Mo <yanhaocs at gmail.com>
License: GPL-2+
- This package is free software; you can redistribute it and/or modify
+
+Files: 3rdparty/perfparser/app/*
+Copyright: 2015, The Qt Company
+License: GPL-3
+
+Files: 3rdparty/perfparser/tests/auto/addresscache/tst_addresscache.cpp
+ 3rdparty/perfparser/tests/auto/elfmap/tst_elfmap.cpp
+ 3rdparty/perfparser/tests/auto/kallsyms/tst_kallsyms.cpp
+ 3rdparty/perfparser/tests/auto/perfdata/tst_perfdata.cpp
+ 3rdparty/perfparser/app/perfkallsyms.cpp
+ 3rdparty/perfparser/app/perfkallsyms.h
+ 3rdparty/perfparser/app/perfaddresscache.h
+ 3rdparty/perfparser/app/perfaddresscache.cpp
+Copyright: 2017, Klarälvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>
+ 2017, Milian Wolff <milian.wolff at kdab.com>
+License: GPL-3
+
+Files: cmake/FindLibElf.cmake
+Copyright: 2008, Bernhard Walle <bernhard.walle at gmx.de>
+License: BSD-3-clause
+
+Files: tests/modeltests/modeltest.h
+Copyright: 2007, Trolltech ASA
+License: GPL-2.0
+
+Files: src/models/processlist_unix.cpp
+ src/models/processlist_unix.cpp
+ src/models/processlist.h
+Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies)
+License: LGPL-2.1
+
+Files: 3rdparty/perfparser/app/perfsymboltable.h
+Copyright: 2016, The Qt Company
+License: GPL-3
+
+Files: 3rdparty/perfparser/app/perfelfmap.cpp
+ 3rdparty/perfparser/app/perftracingdata.h
+ 3rdparty/perfparser/app/perfelfmap.h
+ 3rdparty/perfparser/app/perftracingdata.cpp
+ 3rdparty/perfparser/tests/auto/shared/perfparsertestclient.cpp
+ 3rdparty/perfparser/tests/auto/shared/perfparsertestclient.h
+Copyright: 2017, The Qt Company
+License: GPL-3
+
+License: GPL-2+
+ 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 2 of the License, or
+ 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,
@@ -20,38 +72,84 @@ License: GPL-2+
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 <https://www.gnu.org/licenses/>
+ along with this program. If not, see <https://www.gnu.org/licenses/>.
.
On Debian systems, the complete text of the GNU General
Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-Files: src/models/processlist.h
-Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies)
-License: LGPL-2.1
+License: GPL-3
+ 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, version 3.
+ .
+ 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 <https://www.gnu.org/licenses/>.
+ .
+ On Debian systems, the complete text of the GNU General
+ Public License version 3 can be found in "/usr/share/common-licenses/GPL-3".
-Files: src/processlist_unix.cpp
-Copyright: 2011, Nokia Corporation and/or its subsidiary(-ies)
License: LGPL-2.1
+ This library 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;
+ version 2.1 of the License.
+ .
+ This library 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.
+ .
+ You should have received a copy of the GNU Lesser General Public
+ License along with this library; if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA
+ .
+ On Debian systems the full text of the GNU Lesser General Public License can be
+ found in the `/usr/share/common-licenses/LGPL-2.1' file.
-Files: tests/modeltests/modeltest.cpp
- tests/modeltests/modeltest.h
-Copyright: 2007, Trolltech ASA.
License: GPL-2.0
- Please fill license GPL-2.0 from header of tests/modeltests/modeltest.cpp tests/modeltests/modeltest.h
-
-License: GPL-2+
- 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; version 2 dated June, 1991, or (at
- your option) any later version.
+ This package is free software; you can redistribute it and/or modify
+ it under the terms of version 2 of the GNU General Public License
+ as published by the Free Software Foundation.
.
- On Debian systems, the complete text of version 2 of the GNU General
- Public License can be found in '/usr/share/common-licenses/GPL-2'.
+ 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 <http://www.gnu.org/licenses/>
+ .
+ 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: LGPL-2.1
- This program 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; version 2.1 of the License.
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+ .
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ .
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer in the
+ documentation and/or other materials provided with the distribution.
+ .
+ 3. The name of the author may not be used to endorse or promote products
+ derived from this software without specific prior written permission.
.
- On Debian systems, the complete text of version 2.1 of the GNU Lesser
- General Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR "AS IS" AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT,
+ INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR
+ SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
+ IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
+ POSSIBILITY OF SUCH DAMAGE.
diff --git a/debian/hotspot.1 b/debian/hotspot.1
new file mode 100644
index 0000000..e9bd750
--- /dev/null
+++ b/debian/hotspot.1
@@ -0,0 +1,47 @@
+.TH hotspot 1 "August 28, 2018"
+
+.SH NAME
+hotspot \- Linux perf GUI for performance analysis.
+
+.SH SYNOPSIS
+.B hotspot
+.RI [ OPTION... ] [ FILE... ]
+
+.SH DESCRIPTION
+hotspot is a KDAB R&D effort to create a standalone GUI tool for performance data. This tool now only support perf output data. But is intended to support various other performance data formats in the future.
+
+.SH OPTIONS
+.TP
+.BR \-h ", " \-\-help
+Show help information.
+.TP
+.BR \-v ", " \-\-version
+Show version information.
+.TP
+.BR \-\-sysroot ", " \<path\>
+Specify path to sysroot which is used to find libraries.
+.TP
+.BR \-\-kallsyms ", " \<path\>
+Specify path to kallsyms file which is used to resolve kernel symbols
+.TP
+.BR \-\-debugPaths ", " \<paths\>
+Colon separated list of paths that contain debug information.
+.TP
+.BR \-\-extraLibPaths \<paths\>
+Colon separated list of extra paths to find libraries.
+.TP
+.BR \-\-appPath \<path\>
+Specify path to folder containing the application executable and libraries.
+.TP
+.BR \-\-arch \<path\>
+Architecture to use for unwinding.
+
+.SH AUTHOR
+.B hotspot
+is written by Klarälvdalens Datakonsult AB, a KDAB Group company <info at kdab.com>.
+
+This manual page was written by
+.MT yanhaocs at gmail.com
+Yanhao Mo
+.ME
+for the Debian project (but may be used by others).
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..da4329e
--- /dev/null
+++ b/debian/install
@@ -0,0 +1 @@
+hotspot.desktop usr/share/applications/
diff --git a/debian/manpages b/debian/manpages
new file mode 100644
index 0000000..fdb6499
--- /dev/null
+++ b/debian/manpages
@@ -0,0 +1 @@
+debian/hotspot.1
diff --git a/debian/patches/0001-disable-test-perfdata-temporarily.patch b/debian/patches/0001-disable-test-perfdata-temporarily.patch
new file mode 100644
index 0000000..c3800fc
Binary files /dev/null and b/debian/patches/0001-disable-test-perfdata-temporarily.patch differ
diff --git a/debian/patches/0002-fix-build-on-mips.patch b/debian/patches/0002-fix-build-on-mips.patch
new file mode 100644
index 0000000..b65bd88
--- /dev/null
+++ b/debian/patches/0002-fix-build-on-mips.patch
@@ -0,0 +1,23 @@
+From: Yanhao Mo <yanhaocs at gmail.com>
+Date: Sun, 21 Feb 2021 11:16:42 +0800
+Subject: fix build on mips
+
+---
+ 3rdparty/perfparser/app/perfregisterinfo.cpp | 4 ++++
+ 1 file changed, 4 insertions(+)
+
+diff --git a/3rdparty/perfparser/app/perfregisterinfo.cpp b/3rdparty/perfparser/app/perfregisterinfo.cpp
+index 2e69d5e..bc0831d 100644
+--- a/3rdparty/perfparser/app/perfregisterinfo.cpp
++++ b/3rdparty/perfparser/app/perfregisterinfo.cpp
+@@ -52,6 +52,10 @@ static int aarch64[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13,
+ static int x86[] = {0, 2, 3, 1, 7, 6, 4, 5, 8};
+ static int x86_64[] = {0, 3, 2, 1, 4, 5, 6, 7, 16, 17, 18, 19, 20, 21, 22, 23, 8};
+
++#ifdef mips
++// On MIPS systems, "mips" is a built-in compiler macro.
++#undef mips
++#endif
+ static int mips[] = { 32, 1, 2, 3, 4, 5, 6, 7, 8, 9, 10, 11, 12, 13, 14, 15, 16, 17,
+ 18, 19, 20, 21, 22, 23, 24, 25, 28, 29, 30, 31};
+
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..c33b270
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,2 @@
+0001-disable-test-perfdata-temporarily.patch
+0002-fix-build-on-mips.patch
diff --git a/debian/rules b/debian/rules
index d760a82..492ad61 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,9 @@
#!/usr/bin/make -f
-# See debhelper(7) (uncomment to enable)
-# output every command that modifies files on the build system.
-#export DH_VERBOSE = 1
-
-
-# see FEATURE AREAS in dpkg-buildflags(1)
-#export DEB_BUILD_MAINT_OPTIONS = hardening=+all
-
-# see ENVIRONMENT in dpkg-buildflags(1)
-# package maintainers to append CFLAGS
-#export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
-# package maintainers to append LDFLAGS
-#export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
-
+# You must remove unused comment lines for the released package.
+export DH_VERBOSE = 1
+export DEB_BUILD_MAINT_OPTIONS = hardening=+all
+export DEB_CFLAGS_MAINT_APPEND = -Wall -pedantic
+export DEB_LDFLAGS_MAINT_APPEND = -Wl,--as-needed
%:
dh $@
-
-
-# dh_make generated override targets
-# This is example for Cmake (See https://bugs.debian.org/641051 )
-#override_dh_auto_configure:
-# dh_auto_configure -- # -DCMAKE_LIBRARY_PATH=$(DEB_HOST_MULTIARCH)
diff --git a/debian/watch b/debian/watch
index 2bb1346..a30ffa3 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,4 @@
-version=3
-https://github.com/KDAB/hotspot/releases /KDAB/hotspot/releases/download/v?\d\S*/hotspot-v(\d\S*).tar.gz
+version=4
+opts="filenamemangle=s%(?:.*?)?v?(\d[\d.]*)\.tar\.gz%hotspot-$1.tar.gz%" \
+ https://github.com/KDAB/hotspot/tags \
+ (?:.*?/)?v?(\d[\d.]*)\.tar\.gz debian uupdate
More information about the Neon-commits
mailing list