Run of fresh-snapshots for lxi-tools

Try this locally (using silver-platter):

debian-svp new-upstream --snapshot lxi-tools 

Merge these changes:

git pull https://janitor.debian.net/git/lxi-tools fresh-snapshots/main

Summary

Merged new upstream version: 1.21+git20190512.b1f257a (was: 1.21).

Diff

diff --git a/AUTHORS b/AUTHORS
index 16a609f..5cb6105 100644
--- a/AUTHORS
+++ b/AUTHORS
@@ -15,6 +15,6 @@ Hydron from EEVBlog forum
 gsocker from EEVBlog forum
 N0NB from EEVBlog forum
 Timur Aydin <ta@taydin.org>
-
+timber23 from EEVBlog forum
 
 Thanks to everyone who has contributed to this project.
diff --git a/README b/README
index efb28ab..ba62777 100644
--- a/README
+++ b/README
@@ -150,7 +150,17 @@
 
     The latest release version can be downloaded from https://lxi-tools.github.io
 
-3.1 Installation from release tarball
+3.1 Installation using source
+
+    To compile and install successfully from source you need to install the
+    following dependencies:
+
+     * liblxi
+     * lua
+     * Qt5Core     (optional)
+     * Qt5Gui      (optional)
+     * Qt5Widgets  (optional)
+     * Qt5Charts   (optional)
 
     Install steps:
 
@@ -158,7 +168,11 @@
      $ make
      $ make install
 
-    Note: lxi-tools depends on liblxi so you need to go install liblxi first.
+    Note: Please do no try to install from source if you are not familiar with
+          using autotools.
+
+    Note: If you are installing from git source remember to run the autogen.sh
+          script to generate the configure script.
 
 
 3.2 Installation using package
@@ -177,6 +191,7 @@
      Keysight Technologies AWG 33612A     (discover+scpi+screenshot)
      Keysight Technologies DMM 34461A     (discover+scpi+screenshot)
      Keysight Technologies MSO-X 3024T    (discover+scpi+screenshot)
+     Kikusui Electronics PMX35-3A         (discover+scpi)
      Rigol Technologies DG4062            (discover+scpi+screenshot)
      Rigol Technologies DG4102            (discover+scpi+screenshot)
      Rigol Technologies DG4162            (discover+scpi+screenshot)
@@ -188,6 +203,7 @@
      Rigol Technologies DSA815            (discover+scpi+screenshot)
      Rigol Technologies MSO1104Z          (discover+scpi+screenshot)
      Rigol Technologies MSO2302A          (discover+scpi+screenshot)
+     Rigol Technologies MSO5074           (discover+scpi+screenshot)
      Rohde & Schwarz HMC 8012             (discover+scpi+screenshot)
      Rohde & Schwarz HMC 8043             (discover+scpi+screenshot)
      Rohde & Schwarz HMO 1202             (discover+scpi+screenshot)
@@ -246,5 +262,6 @@
     A thank you to the following sponsors that have donated test equipment to
     support the lxi-tools open source effort:
 
+     * Siglent Technologies
      * KIKUSUI Electronics Corp.
 
diff --git a/README.md b/README.md
index 25dd257..77361a8 100644
--- a/README.md
+++ b/README.md
@@ -160,7 +160,17 @@ image to JPG:
 
 The latest release version can be downloaded from https://lxi-tools.github.io
 
-### 3.1 Installation using release tarball
+### 3.1 Installation using source
+
+To compile and install successfully from source you need to install the
+following dependencies:
+
+ * liblxi
+ * lua
+ * Qt5Core     (optional)
+ * Qt5Gui      (optional)
+ * Qt5Widgets  (optional)
+ * Qt5Charts   (optional)
 
 Install steps:
 ```
@@ -169,7 +179,11 @@ Install steps:
     $ make install
 ```
 
-Note: lxi-tools depends on liblxi so you need to go install liblxi first.
+Note: Please do no try to install from source if you are not familiar with
+using autotools.
+
+Note: If you are installing from git source remember to run the autogen.sh
+script to generate the configure script.
 
 ### 3.2 Installation using package
 
@@ -186,6 +200,7 @@ compatible instruments:
 | Keysight Technologies AWG 33612A  | (discover+scpi+screenshot) |
 | Keysight Technologies DMM 34461A  | (discover+scpi+screenshot) |
 | Keysight Technologies MSO-X 3024T | (discover+scpi+screenshot) |
+| Kikusui Electronics PMX35-3A      | (discover+scpi)            |
 | Rigol Technologies DG4062         | (discover+scpi+screenshot) |
 | Rigol Technologies DG4102         | (discover+scpi+screenshot) |
 | Rigol Technologies DG4162         | (discover+scpi+screenshot) |
@@ -197,6 +212,7 @@ compatible instruments:
 | Rigol Technologies DSA815         | (discover+scpi+screenshot) |
 | Rigol Technologies MSO1104Z       | (discover+scpi+screenshot) |
 | Rigol Technologies MSO2302A       | (discover+scpi+screenshot) |
+| Rigol Technologies MSO5074        | (discover+scpi+screenshot) |
 | Rohde & Schwarz HMC 8012          | (discover+scpi+screenshot) |
 | Rohde & Schwarz HMC 8043          | (discover+scpi+screenshot) |
 | Rohde & Schwarz HMO 1202          | (discover+scpi+screenshot) |
@@ -252,5 +268,6 @@ See the AUTHORS file for full list of authors.
 A thank you to the following sponsors that have donated test equipment to
 support the lxi-tools open source effort:
 
+ * Siglent Technologies
  * KIKUSUI Electronics Corp.
 
diff --git a/debian/changelog b/debian/changelog
index a216a59..dfad6ea 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+lxi-tools (1.21+git20190512.b1f257a-1) UNRELEASED; urgency=medium
+
+  * New upstream snapshot.
+
+ -- Debian Janitor <janitor@jelmer.uk>  Sat, 07 Sep 2019 19:52:49 +0000
+
 lxi-tools (1.21-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/src/gui/lxi-gui/mainwindow.cpp b/src/gui/lxi-gui/mainwindow.cpp
index 255b042..680d9c5 100644
--- a/src/gui/lxi-gui/mainwindow.cpp
+++ b/src/gui/lxi-gui/mainwindow.cpp
@@ -451,6 +451,8 @@ void MainWindow::on_pushButton_Screenshot_LiveView_clicked()
 // Take screenshot
 void MainWindow::on_pushButton_Screenshot_TakeScreenshot_clicked()
 {
+    char *plugin_name = (char *) "";
+    char *filename = (char *) "";
     char image_buffer[0x200000];
     int image_size = 0;
     char image_format[10];
@@ -466,7 +468,7 @@ void MainWindow::on_pushButton_Screenshot_TakeScreenshot_clicked()
     }
 
     // Capture screenshot
-    screenshot(IP.toUtf8().data(), "", "", timeout, false, image_buffer, &image_size, image_format, image_filename);
+    screenshot(IP.toUtf8().data(), plugin_name, filename, timeout, false, image_buffer, &image_size, image_format, image_filename);
 
     screenshotImageFormat.clear();
     screenshotImageFormat.append(image_format);
diff --git a/src/gui/lxi-gui/workerthread.cpp b/src/gui/lxi-gui/workerthread.cpp
index 733bd92..2c642b1 100644
--- a/src/gui/lxi-gui/workerthread.cpp
+++ b/src/gui/lxi-gui/workerthread.cpp
@@ -7,6 +7,8 @@
 
 void WorkerThread::run()
 {
+    char *plugin_name = (char *) "";
+    char *filename = (char *) "";
     char image_buffer[0x200000];
     int image_size = 0;
     char image_format[10];
@@ -17,7 +19,7 @@ void WorkerThread::run()
     {
         // Capture screenshot
         // TODO: Optmize so we avoid plugin autodetect overhead at every capture
-        screenshot(IP.toUtf8().data(), "", "", timeout, false, image_buffer, &image_size, image_format, image_filename);
+        screenshot(IP.toUtf8().data(), plugin_name, filename, timeout, false, image_buffer, &image_size, image_format, image_filename);
 
         pixmap.loadFromData((const uchar*) image_buffer, image_size, "", Qt::AutoColor);
 

Debdiff

[The following lists of changes regard files as different if they have different names, permissions or owners.]

Files in second set of .debs but not in first

-rw-r--r--  root/root   /usr/lib/debug/.build-id/d4/72985cce29f6eb0d5c67dfe938c81fa77152fe.debug

Files in first set of .debs but not in second

-rw-r--r--  root/root   /usr/lib/debug/.build-id/e6/027baf07692001462d416c5992f25d6a67771e.debug

No differences were encountered between the control files of package lxi-tools

Control files of package lxi-tools-dbgsym: lines which differ (wdiff format)

  • Build-Ids: e6027baf07692001462d416c5992f25d6a67771e d472985cce29f6eb0d5c67dfe938c81fa77152fe

Full worker log Full build log