I have followed the next step [1] in the Package Salvaging process. I
have now uploaded simple-scan 50.0-1 to the DELAYED-7 queue.

My packaging is at
https://salsa.debian.org/gnome-team/simple-scan

For convenience, I am also attaching patches for my commits (except
for the gbp import-orig --uscan step).

[1] 
https://www.debian.org/doc/manuals/developers-reference/pkgs.html#package-salvaging

Thank you,
Jeremy Bícha
From 3b646005a9e8e976e92873c62f20075f20f58ae4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]>
Date: Fri, 14 Aug 2026 12:03:20 +0200
Subject: [PATCH 2/8] Update debian/changelog

---
 debian/changelog | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/debian/changelog b/debian/changelog
index 1be7137..7d8b79e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+simple-scan (46.0-3) UNRELEASED; urgency=medium
+
+  * Salvage for the Debian GNOME team (Closes: #1142574)
+
+ -- Jeremy Bícha <[email protected]>  Fri, 14 Aug 2026 12:02:43 +0200
+
 simple-scan (46.0-2) unstable; urgency=medium
 
   * debian/control:
-- 
2.53.0

From 73842acd990badd49c13206830c7bb7c26d6c03d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]>
Date: Fri, 14 Aug 2026 12:06:15 +0200
Subject: [PATCH 5/8] Remove unnecessary Build-Depends: libgirepository1.0-dev

Closes: #1118920
---
 debian/control | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 3f7be05..d55a989 100644
--- a/debian/control
+++ b/debian/control
@@ -15,13 +15,12 @@ Build-Depends:
  gettext,
  gir1.2-rsvg-2.0,
  itstool,
- libadwaita-1-dev,
+ libadwaita-1-dev (>= 1.8.0),
  libcairo2-dev,
  libcolord-dev,
  libfribidi-dev,
  libglib2.0-dev,
- libgirepository1.0-dev,
- libgtk-4-dev,
+ libgtk-4-dev (>= 4.15.2),
  libgdk-pixbuf-2.0-dev,
  libgusb-dev,
  libhandy-1-dev (>= 1.6.0),
-- 
2.53.0

From 89349595d52d988c69a51b4833f615e98a126f23 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]>
Date: Fri, 14 Aug 2026 12:03:37 +0200
Subject: [PATCH 4/8] New upstream release

Closes: #1117051
---
 debian/changelog | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 7d8b79e..72532bd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
-simple-scan (46.0-3) UNRELEASED; urgency=medium
+simple-scan (50.0-1) UNRELEASED; urgency=medium
 
   * Salvage for the Debian GNOME team (Closes: #1142574)
+  * New upstream release (Closes: #1117051)
 
- -- Jeremy Bícha <[email protected]>  Fri, 14 Aug 2026 12:02:43 +0200
+ -- Jeremy Bícha <[email protected]>  Fri, 14 Aug 2026 12:03:37 +0200
 
 simple-scan (46.0-2) unstable; urgency=medium
 
-- 
2.53.0

From 0ac953f1eca8c0dad53889695614a44ad8e36cd7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]>
Date: Fri, 14 Aug 2026 12:07:39 +0200
Subject: [PATCH 6/8] Simplify dh_gnome override

removes a build warning
---
 debian/rules | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/rules b/debian/rules
index 1c5e95b..fee625e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -37,7 +37,8 @@
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 
 %:
-	dh $@  --with gnome,scour
+	dh $@
+
+# We only use dh_gnome to automatically run dh_translations in Ubuntu
+override_dh_gnome:
 
-override_dh_gnome_clean:
-	dh_gnome_clean --no-control
-- 
2.53.0

From 477bcddf6fa8fd3e1394dff37278783864768256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]>
Date: Fri, 14 Aug 2026 12:02:19 +0200
Subject: [PATCH 1/8] Salvage for the Debian GNOME team

Closes: #1142574
---
 debian/control  |  9 ++++++---
 debian/gbp.conf | 14 ++++++++++++++
 2 files changed, 20 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index a48a67d..3f7be05 100644
--- a/debian/control
+++ b/debian/control
@@ -1,7 +1,10 @@
 Source: simple-scan
 Section: gnome
 Priority: optional
-Maintainer: Jörg Frings-Fürst <[email protected]>
+Maintainer: Debian GNOME Maintainers <[email protected]>
+Uploaders:
+ Jeremy Bícha <[email protected]>,
+ Jörg Frings-Fürst <[email protected]>,
 Standards-Version: 4.7.2
 Rules-Requires-Root: no
 Build-Depends:
@@ -35,9 +38,9 @@ Build-Depends:
  scour,
  valac,
  zlib1g-dev
+Vcs-Browser: https://salsa.debian.org/gnome-team/simple-scan
+Vcs-Git: https://salsa.debian.org/gnome-team/simple-scan.git
 Homepage: https://apps.gnome.org/SimpleScan/
-Vcs-Git: https://git.jff.email/cgit/simple-scan.git
-Vcs-Browser: https://git.jff.email/cgit/simple-scan.git
 
 Package: simple-scan
 Architecture: linux-any
diff --git a/debian/gbp.conf b/debian/gbp.conf
index cec628c..a765da7 100644
--- a/debian/gbp.conf
+++ b/debian/gbp.conf
@@ -1,2 +1,16 @@
 [DEFAULT]
 pristine-tar = True
+debian-branch = debian/latest
+upstream-branch = upstream/latest
+
+[buildpackage]
+sign-tags = True
+
+[dch]
+multimaint-merge = True
+
+[import-orig]
+postimport = dch -v%(version)s New upstream release; git add debian/changelog; debcommit
+
+[pq]
+patch-numbers = False
-- 
2.53.0

From b5485889b1a1380e0b12a7d38415a263625a4360 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jeremy=20B=C3=ADcha?= <[email protected]>
Date: Fri, 14 Aug 2026 12:08:23 +0200
Subject: [PATCH 7/8] Update Standards Version to 4.7.4

---
 debian/control | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index d55a989..9c2b557 100644
--- a/debian/control
+++ b/debian/control
@@ -1,12 +1,10 @@
 Source: simple-scan
 Section: gnome
-Priority: optional
 Maintainer: Debian GNOME Maintainers <[email protected]>
 Uploaders:
  Jeremy Bícha <[email protected]>,
  Jörg Frings-Fürst <[email protected]>,
-Standards-Version: 4.7.2
-Rules-Requires-Root: no
+Standards-Version: 4.7.4
 Build-Depends:
  appstream <!nocheck>,
  debhelper-compat (= 13),
-- 
2.53.0

Reply via email to