[pulseview] 02/06: Import Debian changes 0.2.0-1.2
Zoltan Gyarmati
zgyarmati-guest at moszumanska.debian.org
Wed Mar 29 21:43:19 UTC 2017
This is an automated email from the git hooks/post-receive script.
zgyarmati-guest pushed a commit to branch master
in repository pulseview.
commit 1176f80c06a6bf2e10c2ceb88f0314b1691ee3ab
Author: Mattia Rizzolo <mattia at debian.org>
Date: Thu Jan 26 14:19:00 2017 +0100
Import Debian changes 0.2.0-1.2
pulseview (0.2.0-1.2) unstable; urgency=medium
* Non-maintainer upload.
* Bump debhelper compat level to 10.
* Add patch from upstream to fix build with GCC 6. Closes: #811960
* Drop menu file; the T-CTTE decided to deprecate the menu system, see #741573
* Install a .desktop file and the icon.
Thanks to Jérôme <buggerone at gmail.com> for the patch. Closes: #781944
* d/copyright fix DEP-5 syntax.
pulseview (0.2.0-1.1) unstable; urgency=medium
* Non-maintainer upload.
* Switch to non-versioned boost Build-Depends to support Boost 1.58
transition (Closes: #798823)
pulseview (0.2.0-1) unstable; urgency=medium
* New upstream release.
+ Now requires cmake (>= 2.8.6), libsigrok (>= 0.3.0),
libsigrokdecode (>= 0.3.0), libboost-filesystem (>= 1.42).
* debian/copyright: Updates and license clarifications.
pulseview (0.1.0-1) unstable; urgency=low
* Initial release (Closes: #697072).
---
debian/changelog | 34 +++++++++++++
debian/compat | 1 +
debian/control | 19 ++++++++
debian/copyright | 119 ++++++++++++++++++++++++++++++++++++++++++++++
debian/docs | 2 +
debian/install | 2 +
debian/patches/gcc6.patch | 53 +++++++++++++++++++++
debian/patches/series | 1 +
debian/pulseview.desktop | 15 ++++++
debian/rules | 7 +++
debian/source/format | 1 +
debian/watch | 2 +
12 files changed, 256 insertions(+)
diff --git a/debian/changelog b/debian/changelog
new file mode 100644
index 0000000..7af14e4
--- /dev/null
+++ b/debian/changelog
@@ -0,0 +1,34 @@
+pulseview (0.2.0-1.2) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Bump debhelper compat level to 10.
+ * Add patch from upstream to fix build with GCC 6. Closes: #811960
+ * Drop menu file; the T-CTTE decided to deprecate the menu system, see #741573
+ * Install a .desktop file and the icon.
+ Thanks to Jérôme <buggerone at gmail.com> for the patch. Closes: #781944
+ * d/copyright fix DEP-5 syntax.
+
+ -- Mattia Rizzolo <mattia at debian.org> Thu, 26 Jan 2017 14:19:00 +0100
+
+pulseview (0.2.0-1.1) unstable; urgency=medium
+
+ * Non-maintainer upload.
+ * Switch to non-versioned boost Build-Depends to support Boost 1.58
+ transition (Closes: #798823)
+
+ -- Scott Kitterman <scott at kitterman.com> Fri, 25 Sep 2015 01:27:18 -0400
+
+pulseview (0.2.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ + Now requires cmake (>= 2.8.6), libsigrok (>= 0.3.0),
+ libsigrokdecode (>= 0.3.0), libboost-filesystem (>= 1.42).
+ * debian/copyright: Updates and license clarifications.
+
+ -- Uwe Hermann <uwe at debian.org> Sun, 08 Jun 2014 19:41:04 +0200
+
+pulseview (0.1.0-1) unstable; urgency=low
+
+ * Initial release (Closes: #697072).
+
+ -- Uwe Hermann <uwe at debian.org> Sun, 11 May 2014 17:03:23 +0200
diff --git a/debian/compat b/debian/compat
new file mode 100644
index 0000000..f599e28
--- /dev/null
+++ b/debian/compat
@@ -0,0 +1 @@
+10
diff --git a/debian/control b/debian/control
new file mode 100644
index 0000000..06ed3d9
--- /dev/null
+++ b/debian/control
@@ -0,0 +1,19 @@
+Source: pulseview
+Section: electronics
+Priority: extra
+Maintainer: Uwe Hermann <uwe at debian.org>
+Build-Depends: debhelper (>= 10), cmake (>= 2.8.6), pkg-config (>= 0.22), libglib2.0-dev (>= 2.28.0), libboost-system-dev, libboost-thread-dev, libboost-filesystem-dev, libqt4-dev (>= 4.5), libsigrok-dev (>= 0.3.0), libsigrokdecode-dev (>= 0.3.0)
+Standards-Version: 3.9.5
+Homepage: http://sigrok.org/wiki/PulseView
+
+Package: pulseview
+Architecture: any
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: sigrok logic analyzer, oscilloscope, and MSO GUI
+ PulseView is a GUI for sigrok that supports logic analyzers, oscilloscopes,
+ and MSOs.
+ .
+ It can acquire samples from a supported device and display them,
+ load and display captures from existing sigrok *.sr files, as well
+ as run protocol decoders and display their annotations.
+
diff --git a/debian/copyright b/debian/copyright
new file mode 100644
index 0000000..57621c1
--- /dev/null
+++ b/debian/copyright
@@ -0,0 +1,119 @@
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: pulseview
+Upstream-Contact: <sigrok-devel at lists.sourceforge.net>
+Source: http://sigrok.org/wiki/PulseView
+Comment:
+ While most of the PulseView source files are GPLv2+ licensed, it has to be
+ linked against at least libsigrok (which is GPLv3+) & usually also against
+ libsigrokdecode (also GPLv3+), thus making PulseView as a whole GPLv3+.
+
+Files: *
+Copyright: 2012-2014 Joel Holdsworth <joel at airwebreathe.org.uk>
+License: GPL-2.0+
+
+Files: CMakeLists.txt
+Copyright: 2012 Joel Holdsworth <joel at airwebreathe.org.uk>
+ 2012-2013 Alexandru Gagniuc <mr.nuke.me at gmail.com>
+License: GPL-2.0+
+
+Files: config.h.in
+Copyright: 2012 Alexandru Gagniuc <mr.nuke.me at gmail.com>
+License: GPL-2.0+
+
+Files: signalhandler.cpp signalhandler.h
+Copyright: 2013 Adam Reichold
+License: GPL-2.0+
+
+Files: contrib/pulseview_cross.nsi
+Copyright: 2013-2014 Uwe Hermann <uwe at hermann-uwe.de>
+License: GPL-2.0+
+
+Files: doc/pulseview.1
+Copyright: 2012-2013 Uwe Hermann <uwe at hermann-uwe.de>
+License: GPL-2.0+
+
+Files: test/CMakeLists.txt
+Copyright: 2012 Joel Holdsworth <joel at airwebreathe.org.uk>
+ 2012 Alexandru Gagniuc <mr.nuke.me at gmail.com>
+License: GPL-2.0+
+
+Files: pv/widgets/wellarray.cpp pv/widgets/wellarray.h
+Copyright: 2013 Digia Plc and/or its subsidiary(-ies)
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+
+Files: debian/*
+Copyright: 2014 Uwe Hermann <uwe at debian.org>
+License: GPL-2.0+
+
+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 <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: 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 <http://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".
+
+License: LGPL-2.1 with Digia Qt LGPL Exception 1.1 or GPL-3
+ This file is part of the QtGui module of the Qt Toolkit.
+ .
+ $QT_BEGIN_LICENSE:LGPL$
+ Commercial License Usage
+ Licensees holding valid commercial Qt licenses may use this file in
+ accordance with the commercial license agreement provided with the
+ Software or, alternatively, in accordance with the terms contained in
+ a written agreement between you and Digia. For licensing terms and
+ conditions see http://qt.digia.com/licensing. For further information
+ use the contact form at http://qt.digia.com/contact-us.
+ .
+ GNU Lesser General Public License Usage
+ Alternatively, 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.
+ .
+ In addition, as a special exception, Digia gives you certain additional
+ rights. These rights are described in the Digia Qt LGPL Exception
+ version 1.1, included in the file LGPL_EXCEPTION.txt in this package.
+ .
+ GNU General Public License Usage
+ 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 Lesser General Public License
+ can be found in `/usr/share/common-licenses/LGPL-2.1`.
+ .
+ On Debian systems, the complete text of the GNU Public Licenses can be found
+ in `/usr/share/common-licenses/GPL-3`.
+
diff --git a/debian/docs b/debian/docs
new file mode 100644
index 0000000..50bd824
--- /dev/null
+++ b/debian/docs
@@ -0,0 +1,2 @@
+NEWS
+README
diff --git a/debian/install b/debian/install
new file mode 100644
index 0000000..8478451
--- /dev/null
+++ b/debian/install
@@ -0,0 +1,2 @@
+debian/pulseview.desktop usr/share/applications/
+icons/sigrok-logo-notext.png usr/share/pixmaps/
diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch
new file mode 100644
index 0000000..f6e5d4a
--- /dev/null
+++ b/debian/patches/gcc6.patch
@@ -0,0 +1,53 @@
+Description: Fix FTBFS with GCC 6
+Origin: upstream, http://sigrok.org/gitweb/?p=pulseview.git;a=commit;h=db8a1b5c7e7cc3663fa8582749db289383c68313
+Origin: upstream, http://sigrok.org/gitweb/?p=pulseview.git;a=commit;h=c28fa62bc89656ba3b1b01011a45e941d6c7d42a
+Author: Aurelien Jacobs <aurel at gnuage.org>
+Author: Soeren Apel <soeren at apelpie.net>
+Bug-Debian: https://bugs.debian.org/811960
+Last-Update: 2016-08-25
+
+--- a/pv/dialogs/about.cpp
++++ b/pv/dialogs/about.cpp
+@@ -107,9 +107,9 @@
+
+ s.append("</table>");
+
+- supportedDoc.reset(new QTextDocument(this));
++ supportedDoc = new QTextDocument(this);
+ supportedDoc->setHtml(s);
+- ui->supportList->setDocument(supportedDoc.get());
++ ui->supportList->setDocument(supportedDoc);
+ }
+
+ About::~About()
+--- a/pv/dialogs/about.h
++++ b/pv/dialogs/about.h
+@@ -44,7 +44,7 @@
+
+ private:
+ Ui::About *ui;
+- std::auto_ptr<QTextDocument> supportedDoc;
++ QTextDocument *supportedDoc;
+ };
+
+ } // namespace dialogs
+--- a/pv/data/logicsnapshot.cpp
++++ b/pv/data/logicsnapshot.cpp
+@@ -315,7 +315,7 @@
+ pow2_ceil(index, MipMapScalePower));
+
+ for (; index < final_index &&
+- (index & ~(~0 << MipMapScalePower)) != 0;
++ (index & ~((uint64_t)(~0) << MipMapScalePower)) != 0;
+ index++)
+ {
+ const bool sample =
+@@ -368,7 +368,7 @@
+ sig_mask))
+ break;
+
+- if ((offset & ~(~0 << MipMapScalePower)) == 0) {
++ if ((offset & ~((uint64_t)(~0) << MipMapScalePower)) == 0) {
+ // If we are now at the beginning of a
+ // higher level mip-map block ascend one
+ // level
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..834fbe0
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+gcc6.patch
diff --git a/debian/pulseview.desktop b/debian/pulseview.desktop
new file mode 100644
index 0000000..26c8583
--- /dev/null
+++ b/debian/pulseview.desktop
@@ -0,0 +1,15 @@
+[Desktop Entry]
+Comment=GUI for sigrok
+Comment[fr]=Interface graphique pour sigrok
+Exec=pulseview
+GenericName=Logic analyzer oscilloscope and MSO
+GenericName[fr]=Analyseur logique, oscilloscope et MSO
+Icon=sigrok-logo-notext.png
+Name=PulseView
+NoDisplay=false
+Path[$e]=
+StartupNotify=true
+Terminal=0
+Type=Application
+X-KDE-SubstituteUID=false
+X-KDE-Username=
diff --git a/debian/rules b/debian/rules
new file mode 100755
index 0000000..7aece46
--- /dev/null
+++ b/debian/rules
@@ -0,0 +1,7 @@
+#!/usr/bin/make -f
+
+# export DH_VERBOSE=1
+
+%:
+ dh $@
+
diff --git a/debian/source/format b/debian/source/format
new file mode 100644
index 0000000..163aaf8
--- /dev/null
+++ b/debian/source/format
@@ -0,0 +1 @@
+3.0 (quilt)
diff --git a/debian/watch b/debian/watch
new file mode 100644
index 0000000..5cd7590
--- /dev/null
+++ b/debian/watch
@@ -0,0 +1,2 @@
+version=3
+http://sigrok.org/download/source/pulseview pulseview-(.*)\.tar\.gz
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/pulseview.git
More information about the debian-science-commits
mailing list