[pulseview] 05/06: remove old, add new patches, update dch and d/control
Zoltan Gyarmati
zgyarmati-guest at moszumanska.debian.org
Wed Mar 29 21:43:20 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 bc850dd80c333dc27df23a634eefcecd8cf7b6a0
Author: Zoltan Gyarmati <mr.zoltan.gyarmati at gmail.com>
Date: Tue Mar 7 01:00:30 2017 +0100
remove old,add new patches, update dch and d/control
---
debian/changelog | 11 ++++
debian/control | 8 ++-
...ix_shifting_a_negative_signed_valueis_undefined | 47 ++++++++++++++
debian/patches/add--fext-numeric-literals | 37 +++++++++++
.../backport_upstream_fix_for_unittest_build_error | 75 ++++++++++++++++++++++
debian/patches/gcc6.patch | 53 ---------------
debian/patches/series | 4 +-
7 files changed, 178 insertions(+), 57 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 7af14e4..782e3e9 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+pulseview (0.3.0-1) unstable; urgency=medium
+
+ * New upstream release
+ * New maintainer (Closes: #852833)
+ * Standards-Version: 3.9.8 (no changes required)
+ * Update sigrok dependencies' version
+ * Remove obsolete patches
+ * Add patches to fix build errors
+
+ -- Zoltan Gyarmati <mr.zoltan.gyarmati at gmail.com> Mon, 06 Mar 2017 23:58:32 +0100
+
pulseview (0.2.0-1.2) unstable; urgency=medium
* Non-maintainer upload.
diff --git a/debian/control b/debian/control
index 06ed3d9..3d770e9 100644
--- a/debian/control
+++ b/debian/control
@@ -1,10 +1,12 @@
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
+Maintainer: Zoltan Gyarmati <mr.zoltan.gyarmati at gmail.com>
+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.4.0), libsigrokdecode-dev (>= 0.4.1)
+Standards-Version: 3.9.8
Homepage: http://sigrok.org/wiki/PulseView
+Vcs-Browser: https://git.zgyarmati.de/debian-packaging/pulseview-debian
+Vcs-Git: https://git.zgyarmati.de/git/debian-packaging/pulseview-debian.git
Package: pulseview
Architecture: any
diff --git a/debian/patches/Fix_shifting_a_negative_signed_valueis_undefined b/debian/patches/Fix_shifting_a_negative_signed_valueis_undefined
new file mode 100644
index 0000000..9eccdc2
--- /dev/null
+++ b/debian/patches/Fix_shifting_a_negative_signed_valueis_undefined
@@ -0,0 +1,47 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ pulseview (0.3.0-1) UNRELEASED; urgency=medium
+ .
+ * New upstream release
+ * New maintainer (Closes: #852833)
+Author: Zoltan Gyarmati <mr.zoltan.gyarmati at gmail.com>
+Bug-Debian: https://bugs.debian.org/852833
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2017-03-01
+
+--- pulseview-0.3.0.orig/pv/data/logicsegment.cpp
++++ pulseview-0.3.0/pv/data/logicsegment.cpp
+@@ -308,7 +308,7 @@ void LogicSegment::get_subsampled_edges(
+ pow2_ceil(index, MipMapScalePower));
+
+ for (; index < final_index &&
+- (index & ~(~0 << MipMapScalePower)) != 0;
++ (index & ~((uint64_t)(~0) << MipMapScalePower)) != 0;
+ index++) {
+ const bool sample =
+ (get_sample(index) & sig_mask) != 0;
+@@ -358,7 +358,7 @@ void LogicSegment::get_subsampled_edges(
+ 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/add--fext-numeric-literals b/debian/patches/add--fext-numeric-literals
new file mode 100644
index 0000000..9a9dad1
--- /dev/null
+++ b/debian/patches/add--fext-numeric-literals
@@ -0,0 +1,37 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ pulseview (0.3.0-1) UNRELEASED; urgency=medium
+ .
+ * New upstream release
+ * New maintainer (Closes: #852833)
+Author: Zoltan Gyarmati <mr.zoltan.gyarmati at gmail.com>
+Bug-Debian: https://bugs.debian.org/852833
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2017-03-01
+
+--- pulseview-0.3.0.orig/CMakeLists.txt
++++ pulseview-0.3.0/CMakeLists.txt
+@@ -346,6 +346,7 @@ add_definitions(${QT_DEFINITIONS} -DQT_N
+ add_definitions(-D__STDC_LIMIT_MACROS)
+ add_definitions(-Wall -Wextra)
+ add_definitions(-std=c++11)
++add_definitions(-fext-numeric-literals)
+
+ if(ENABLE_DECODE)
+ add_definitions(-DENABLE_DECODE)
diff --git a/debian/patches/backport_upstream_fix_for_unittest_build_error b/debian/patches/backport_upstream_fix_for_unittest_build_error
new file mode 100644
index 0000000..42e9316
--- /dev/null
+++ b/debian/patches/backport_upstream_fix_for_unittest_build_error
@@ -0,0 +1,75 @@
+Description: <short summary of the patch>
+ TODO: Put a short summary on the line above and replace this paragraph
+ with a longer explanation of this change. Complete the meta-information
+ with other relevant fields (see below for details). To make it easier, the
+ information below has been extracted from the changelog. Adjust it or drop
+ it.
+ .
+ pulseview (0.3.0-1) unstable; urgency=medium
+ .
+ * New upstream release
+ * New maintainer (Closes: #852833)
+ * Standards-Version: 3.9.8 (no changes required)
+ * Update sigrok dependencies' version
+Author: Zoltan Gyarmati <mr.zoltan.gyarmati at gmail.com>
+Bug-Debian: https://bugs.debian.org/852833
+
+---
+The information above should follow the Patch Tagging Guidelines, please
+checkout http://dep.debian.net/deps/dep3/ to learn about the format. Here
+are templates for supplementary fields that you might want to add:
+
+Origin: <vendor|upstream|other>, <url of original patch>
+Bug: <url in upstream bugtracker>
+Bug-Debian: https://bugs.debian.org/<bugnumber>
+Bug-Ubuntu: https://launchpad.net/bugs/<bugnumber>
+Forwarded: <no|not-needed|url proving that it has been forwarded>
+Reviewed-By: <name and email of someone who approved the patch>
+Last-Update: 2017-03-06
+
+--- pulseview-0.3.0.orig/pv/view/ruler.hpp
++++ pulseview-0.3.0/pv/view/ruler.hpp
+@@ -30,9 +30,9 @@
+ #include <pv/util.hpp>
+
+ namespace RulerTest {
+-class tick_position_test_0;
+-class tick_position_test_1;
+-class tick_position_test_2;
++struct tick_position_test_0;
++struct tick_position_test_1;
++struct tick_position_test_2;
+ }
+
+ namespace pv {
+@@ -45,9 +45,9 @@ class Ruler : public MarginWidget
+ {
+ Q_OBJECT
+
+- friend class RulerTest::tick_position_test_0;
+- friend class RulerTest::tick_position_test_1;
+- friend class RulerTest::tick_position_test_2;
++ friend struct RulerTest::tick_position_test_0;
++ friend struct RulerTest::tick_position_test_1;
++ friend struct RulerTest::tick_position_test_2;
+
+ private:
+
+--- pulseview-0.3.0.orig/test/util.cpp
++++ pulseview-0.3.0/test/util.cpp
+@@ -32,13 +32,13 @@ namespace {
+ pv::util::SIPrefix unspecified = pv::util::SIPrefix::unspecified;
+ pv::util::SIPrefix yocto = pv::util::SIPrefix::yocto;
+ pv::util::SIPrefix nano = pv::util::SIPrefix::nano;
+- pv::util::SIPrefix micro = pv::util::SIPrefix::micro;
++/* pv::util::SIPrefix micro = pv::util::SIPrefix::micro; // Not currently used */
+ pv::util::SIPrefix milli = pv::util::SIPrefix::milli;
+ pv::util::SIPrefix none = pv::util::SIPrefix::none;
+ pv::util::SIPrefix kilo = pv::util::SIPrefix::kilo;
+ pv::util::SIPrefix yotta = pv::util::SIPrefix::yotta;
+
+- pv::util::TimeUnit Time = pv::util::TimeUnit::Time;
++/* pv::util::TimeUnit Time = pv::util::TimeUnit::Time; // Not currently used */
+ }
+
+ BOOST_AUTO_TEST_SUITE(UtilTest)
diff --git a/debian/patches/gcc6.patch b/debian/patches/gcc6.patch
deleted file mode 100644
index f6e5d4a..0000000
--- a/debian/patches/gcc6.patch
+++ /dev/null
@@ -1,53 +0,0 @@
-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
index 834fbe0..c7fb486 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1,3 @@
-gcc6.patch
+add--fext-numeric-literals
+Fix_shifting_a_negative_signed_valueis_undefined
+backport_upstream_fix_for_unittest_build_error
--
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