Bug#811960: pulseview: diff for NMU version 0.2.0-1.2

[Mattia Rizzolo]

Control: tags 781944 + patch
Control: tags 781944 + pending
Control: tags 811960 + pending

Dear maintainer,

I've prepared an NMU for pulseview (versioned as 0.2.0-1.2) and
uploaded it to DELAYED/1. Please feel free to tell me if I
should delay it longer.

Regards.

-- 
regards,
                        Mattia Rizzolo

GPG Key: 66AE 2B4A FCCF 3F52 DA18  4D18 4B04 3FCD B944 4540      .''`.
more about me:  https://mapreri.org                             : :'  :
Launchpad user: https://launchpad.net/~mapreri                  `. `'`
Debian QA page: https://qa.debian.org/developer.php?login=mattia  `-

diffstat for pulseview-0.2.0 pulseview-0.2.0

 changelog          |   12 ++++++++++++
 compat             |    2 +-
 control            |    2 +-
 copyright          |    6 +++---
 install            |    2 ++
 menu               |    3 ---
 patches/gcc6.patch |   53 +++++++++++++++++++++++++++++++++++++++++++++++++++++
 patches/series     |    1 +
 pulseview.desktop  |   15 +++++++++++++++
 9 files changed, 88 insertions(+), 8 deletions(-)

diff -Nru pulseview-0.2.0/debian/changelog pulseview-0.2.0/debian/changelog
--- pulseview-0.2.0/debian/changelog	2015-09-25 07:28:14.000000000 +0200
+++ pulseview-0.2.0/debian/changelog	2017-01-26 14:19:00.000000000 +0100
@@ -1,3 +1,15 @@
+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 <bugger...@gmail.com> for the patch.  Closes: #781944
+  * d/copyright fix DEP-5 syntax.
+
+ -- Mattia Rizzolo <mat...@debian.org>  Thu, 26 Jan 2017 14:19:00 +0100
+
 pulseview (0.2.0-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff -Nru pulseview-0.2.0/debian/compat pulseview-0.2.0/debian/compat
--- pulseview-0.2.0/debian/compat	2014-06-08 19:40:52.000000000 +0200
+++ pulseview-0.2.0/debian/compat	2017-01-26 14:19:00.000000000 +0100
@@ -1 +1 @@
-9
+10
diff -Nru pulseview-0.2.0/debian/control pulseview-0.2.0/debian/control
--- pulseview-0.2.0/debian/control	2015-09-25 07:28:48.000000000 +0200
+++ pulseview-0.2.0/debian/control	2017-01-26 14:19:00.000000000 +0100
@@ -2,7 +2,7 @@
 Section: electronics
 Priority: extra
 Maintainer: Uwe Hermann <u...@debian.org>
-Build-Depends: debhelper (>= 9), 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)
+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
 
diff -Nru pulseview-0.2.0/debian/copyright pulseview-0.2.0/debian/copyright
--- pulseview-0.2.0/debian/copyright	2014-06-08 21:49:01.000000000 +0200
+++ pulseview-0.2.0/debian/copyright	2017-01-26 14:19:00.000000000 +0100
@@ -2,9 +2,9 @@
 Upstream-Name: pulseview
 Upstream-Contact: <sigrok-de...@lists.sourceforge.net>
 Source: http://sigrok.org/wiki/PulseView
-License: GPL-3.0+
- Note: 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
+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: *
diff -Nru pulseview-0.2.0/debian/install pulseview-0.2.0/debian/install
--- pulseview-0.2.0/debian/install	1970-01-01 01:00:00.000000000 +0100
+++ pulseview-0.2.0/debian/install	2017-01-26 14:19:00.000000000 +0100
@@ -0,0 +1,2 @@
+debian/pulseview.desktop usr/share/applications/
+icons/sigrok-logo-notext.png usr/share/pixmaps/
diff -Nru pulseview-0.2.0/debian/menu pulseview-0.2.0/debian/menu
--- pulseview-0.2.0/debian/menu	2014-06-08 19:40:52.000000000 +0200
+++ pulseview-0.2.0/debian/menu	1970-01-01 01:00:00.000000000 +0100
@@ -1,3 +0,0 @@
-?package(pulseview):needs="X11" section="Applications/Science/Electronics" \
-  title="pulseview" command="/usr/bin/pulseview" \
-  icon="/usr/share/pixmaps/sigrok-logo-notext.png"
diff -Nru pulseview-0.2.0/debian/patches/gcc6.patch pulseview-0.2.0/debian/patches/gcc6.patch
--- pulseview-0.2.0/debian/patches/gcc6.patch	1970-01-01 01:00:00.000000000 +0100
+++ pulseview-0.2.0/debian/patches/gcc6.patch	2017-01-26 14:19:00.000000000 +0100
@@ -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 <au...@gnuage.org>
+Author: Soeren Apel <soe...@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 -Nru pulseview-0.2.0/debian/patches/series pulseview-0.2.0/debian/patches/series
--- pulseview-0.2.0/debian/patches/series	1970-01-01 01:00:00.000000000 +0100
+++ pulseview-0.2.0/debian/patches/series	2017-01-26 14:19:00.000000000 +0100
@@ -0,0 +1 @@
+gcc6.patch
diff -Nru pulseview-0.2.0/debian/pulseview.desktop pulseview-0.2.0/debian/pulseview.desktop
--- pulseview-0.2.0/debian/pulseview.desktop	1970-01-01 01:00:00.000000000 +0100
+++ pulseview-0.2.0/debian/pulseview.desktop	2017-01-26 14:19:00.000000000 +0100
@@ -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=

signature.asc
Description: PGP signature