Script 'mail_helper' called by obssrc
Hello community,
here is the log from the commit of package simple-scan for openSUSE:Factory
checked in at 2021-12-24 20:23:00
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Comparing /work/SRC/openSUSE:Factory/simple-scan (Old)
and /work/SRC/openSUSE:Factory/.simple-scan.new.2520 (New)
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Package is "simple-scan"
Fri Dec 24 20:23:00 2021 rev:80 rq:942254 version:40.7
Changes:
--------
--- /work/SRC/openSUSE:Factory/simple-scan/simple-scan.changes 2021-11-08
17:24:20.656699608 +0100
+++ /work/SRC/openSUSE:Factory/.simple-scan.new.2520/simple-scan.changes
2021-12-24 20:23:19.506023977 +0100
@@ -1,0 +2,10 @@
+Thu Dec 23 12:04:51 UTC 2021 - Bj??rn Lie <bjorn....@gmail.com>
+
+- Update to version 40.7:
+ + Fix replacing underscore with space in scanner names.
+ + Delete autosave records after creating new document.
+ + Add the device name to the label if there are several identical
+ models.
+ + Fix autosave of Page Side property.
+
+-------------------------------------------------------------------
Old:
----
simple-scan-40.6.tar.xz
New:
----
simple-scan-40.7.tar.xz
++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
Other differences:
------------------
++++++ simple-scan.spec ++++++
--- /var/tmp/diff_new_pack.CvvLmV/_old 2021-12-24 20:23:20.058024266 +0100
+++ /var/tmp/diff_new_pack.CvvLmV/_new 2021-12-24 20:23:20.058024266 +0100
@@ -17,7 +17,7 @@
Name: simple-scan
-Version: 40.6
+Version: 40.7
Release: 0
Summary: Simple Scanning Utility
License: GPL-3.0-or-later
++++++ simple-scan-40.6.tar.xz -> simple-scan-40.7.tar.xz ++++++
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simple-scan-40.6/NEWS new/simple-scan-40.7/NEWS
--- old/simple-scan-40.6/NEWS 2021-10-31 16:22:30.182518500 +0100
+++ new/simple-scan-40.7/NEWS 2021-12-23 12:10:56.577474600 +0100
@@ -1,3 +1,12 @@
+Overview of changes in simple-scan 40.7
+~~~~~~~~~~~~~~
+Released: 2021-12-23
+
+ * Fix replacing underscore with space in scanner names.
+ * Delete autosave records after creating new document.
+ * Add the device name to the label if there are several identical models.
+ * Fix autosave of Page Side property.
+
Overview of changes in simple-scan 40.6
~~~~~~~~~~~~~~
Released: 2021-10-27
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simple-scan-40.6/README.md
new/simple-scan-40.7/README.md
--- old/simple-scan-40.6/README.md 2021-10-31 16:22:30.182518500 +0100
+++ new/simple-scan-40.7/README.md 2021-12-23 12:10:56.577474600 +0100
@@ -26,7 +26,7 @@
For Ubuntu/Debian:
```
-$ sudo apt install -y meson valac gcc gettext itstool gobject-introspection
libfribidi-dev libgirepository1.0-dev libgtk-3-dev libgusb-dev libcolord-dev
libpackagekit-glib2-dev libwebp-dev libsane-dev git ca-certificates
+$ sudo apt install -y meson valac gcc gettext itstool libfribidi-dev
libgirepository1.0-dev libgtk-3-dev libgusb-dev libcolord-dev
libpackagekit-glib2-dev libwebp-dev libsane-dev git ca-certificates
```
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simple-scan-40.6/build-aux/snap/snapcraft.yaml
new/simple-scan-40.7/build-aux/snap/snapcraft.yaml
--- old/simple-scan-40.6/build-aux/snap/snapcraft.yaml 2021-10-31
16:22:30.182518500 +0100
+++ new/simple-scan-40.7/build-aux/snap/snapcraft.yaml 2021-12-23
12:10:56.577474600 +0100
@@ -6,7 +6,7 @@
grade: stable # must be 'stable' to release into candidate/stable channels
confinement: strict
-base: core18
+base: core20
slots:
# for GtkApplication registration
@@ -28,18 +28,20 @@
- io-ports-control
- raw-usb
command: usr/bin/simple-scan
- extensions: [gnome-3-28]
+ extensions: [ gnome-3-38 ]
desktop: usr/share/applications/simple-scan.desktop
environment:
GSETTINGS_SCHEMA_DIR: $SNAP/share/glib-2.0/schemas
parts:
libsane:
- source: https://salsa.debian.org/debian/sane-backends.git
+ source: https://gitlab.com/sane-project/backends.git
source-type: git
- source-tag: upstream/1.0.27
+ source-tag: release-1.0.33
plugin: autotools
- configflags: [--prefix=/snap/simple-scan/current/usr, --with-api-spec=no]
+ autotools-configure-parameters:
+ - --prefix=/snap/simple-scan/current/usr
+ - --with-api-spec=no
organize:
snap/simple-scan/current/usr: usr
build-packages:
@@ -82,9 +84,10 @@
- libgtk-3-dev
- libgdk-pixbuf2.0-dev
- libgusb-dev
+ - libgirepository1.0-dev
- libpackagekit-glib2-dev
- libsane-dev
- - python-scour
+ - libwebp-dev
- valac
- zlib1g-dev
libs:
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore'
old/simple-scan-40.6/data/org.gnome.SimpleScan.gschema.xml
new/simple-scan-40.7/data/org.gnome.SimpleScan.gschema.xml
--- old/simple-scan-40.6/data/org.gnome.SimpleScan.gschema.xml 2021-10-31
16:22:30.194518300 +0100
+++ new/simple-scan-40.7/data/org.gnome.SimpleScan.gschema.xml 2021-12-23
12:10:56.609474700 +0100
@@ -1,8 +1,8 @@
<schemalist>
<enum id="org.gnome.SimpleScan.PageSide">
- <value value="1" nick="front"/>
- <value value="2" nick="back"/>
- <value value="3" nick="both"/>
+ <value value="0" nick="front"/>
+ <value value="1" nick="back"/>
+ <value value="2" nick="both"/>
</enum>
<schema id="org.gnome.SimpleScan" path="/org/gnome/simple-scan/"
gettext-domain="simple-scan">
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simple-scan-40.6/data/simple-scan.appdata.xml.in
new/simple-scan-40.7/data/simple-scan.appdata.xml.in
--- old/simple-scan-40.6/data/simple-scan.appdata.xml.in 2021-10-31
16:22:30.198518500 +0100
+++ new/simple-scan-40.7/data/simple-scan.appdata.xml.in 2021-12-23
12:10:56.617474600 +0100
@@ -25,6 +25,16 @@
<url type="donation">https://www.gnome.org/friends/</url>
<developer_name>The GNOME Project</developer_name>
<releases>
+ <release date="2021-12-27" version="40.7">
+ <description>
+ <ul>
+ <li>Fix replacing underscore with space in scanner names.</li>
+ <li>Delete autosave records after creating new document.</li>
+ <li>Add the device name to the label if there are several identical
models.</li>
+ <li>Fix autosave of Page Side property.</li>
+ </ul>
+ </description>
+ </release>
<release date="2021-10-27" version="40.6">
<description>
<ul>
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simple-scan-40.6/meson.build
new/simple-scan-40.7/meson.build
--- old/simple-scan-40.6/meson.build 2021-10-31 16:22:30.218518500 +0100
+++ new/simple-scan-40.7/meson.build 2021-12-23 12:10:56.709474800 +0100
@@ -1,5 +1,5 @@
project ('simple-scan', ['vala', 'c'],
- version: '40.6',
+ version: '40.7',
license: 'GPLv3+',
default_options: [
'warning_level=1',
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simple-scan-40.6/src/app-window.vala
new/simple-scan-40.7/src/app-window.vala
--- old/simple-scan-40.6/src/app-window.vala 2021-10-31 16:22:30.250518600
+0100
+++ new/simple-scan-40.7/src/app-window.vala 2021-12-23 12:10:56.793475000
+0100
@@ -802,6 +802,7 @@
stop_scan ();
clear_document ();
+ autosave_manager.cleanup ();
});
}
diff -urN '--exclude=CVS' '--exclude=.cvsignore' '--exclude=.svn'
'--exclude=.svnignore' old/simple-scan-40.6/src/scanner.vala
new/simple-scan-40.7/src/scanner.vala
--- old/simple-scan-40.6/src/scanner.vala 2021-10-31 16:22:30.254518500
+0100
+++ new/simple-scan-40.7/src/scanner.vala 2021-12-23 12:10:56.805475000
+0100
@@ -354,6 +354,16 @@
return;
}
+ /* Determine the number of each model to additionally display the name
if the model names are the same. */
+ var seen = new HashTable<string, int> (str_hash, str_equal);
+ for (var i = 0; device_list[i] != null; i++)
+ {
+ if (seen.contains(device_list[i].model))
+ seen.set(device_list[i].model, seen.get(device_list[i].model)
+ 1);
+ else
+ seen.set(device_list[i].model, 1);
+ }
+
var devices = new List<ScanDevice> ();
for (var i = 0; device_list[i] != null; i++)
{
@@ -373,9 +383,14 @@
scan_device.label = device_list[i].model;
else
scan_device.label = "%s %s".printf (vendor,
device_list[i].model);
-
+
/* Replace underscores in name */
- scan_device.label.replace ("_", " ");
+ scan_device.label = scan_device.label.replace ("_", " ");
+
+ /* Additionally add the device name to the label if there are
several identical models. */
+ if (seen.get(device_list[i].model) > 1)
+ scan_device.label = "%s on %s".printf (scan_device.label,
device_list[i].name);
+
devices.append (scan_device);
}
