summaryrefslogtreecommitdiff
path: root/debian
diff options
context:
space:
mode:
authorJörg Frings-Fürst <debian@jff.email>2022-03-20 09:13:50 +0100
committerJörg Frings-Fürst <debian@jff.email>2022-03-20 09:13:50 +0100
commitaafaa7c3ff1f88dadbad34559adab7b35be8542b (patch)
tree11f3ff35af220dd659d42e5f87d29b5d5ca073cb /debian
parent055f6f3e01bb718bfdd61331e1b13b0cdba6d718 (diff)
parente01ac9786891513c1cb628ca0a0374436057cc3b (diff)
Merge branch 'release/debian/42.0-1'debian/42.0-1
Diffstat (limited to 'debian')
-rw-r--r--debian/changelog9
-rw-r--r--debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch30
-rw-r--r--debian/patches/0005-Build_error_with_vala.patch20
-rw-r--r--debian/patches/series2
4 files changed, 9 insertions, 52 deletions
diff --git a/debian/changelog b/debian/changelog
index 1f954af..4cf1e14 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+simple-scan (42.0-1) unstable; urgency=medium
+
+ * New upstream release.
+ - Remove upstream applied patches:
+ + debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch
+ + debian/patches/0005-Build_error_with_vala.patch
+
+ -- Jörg Frings-Fürst <debian@jff.email> Sat, 19 Mar 2022 18:36:01 +0100
+
simple-scan (40.7-1) unstable; urgency=medium
* New upstream release.
diff --git a/debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch b/debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch
deleted file mode 100644
index 0fb73d0..0000000
--- a/debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-Fix accessibility conflict of constant and its value
-Origin: upstream, https://gitlab.gnome.org/GNOME/simple-scan/-/commit/c50802b213c325cfa957d66955f6de96908710d9
-Forwarded: not-needed
-Applied-Upstream: commit: /c50802b213c325cfa957d66955f6de96908710d9
-Last-Update: 2022-02-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/data/meson.build
-===================================================================
---- trunk.orig/data/meson.build
-+++ trunk/data/meson.build
-@@ -8,16 +8,14 @@ install_data ('org.gnome.SimpleScan.gsch
- install_dir: join_paths (datadir, 'glib-2.0', 'schemas'))
- meson.add_install_script ('meson_compile_gschema.py')
-
--i18n.merge_file ('desktop-file',
-- input: 'simple-scan.desktop.in',
-+i18n.merge_file (input: 'simple-scan.desktop.in',
- output: 'simple-scan.desktop',
- install: true,
- install_dir: join_paths (datadir, 'applications'),
- po_dir: '../po',
- type: 'desktop')
-
--i18n.merge_file ('appdata-file',
-- input: 'simple-scan.appdata.xml.in',
-+i18n.merge_file (input: 'simple-scan.appdata.xml.in',
- output: 'simple-scan.appdata.xml',
- install: true,
- install_dir: join_paths (datadir, 'metainfo'),
diff --git a/debian/patches/0005-Build_error_with_vala.patch b/debian/patches/0005-Build_error_with_vala.patch
deleted file mode 100644
index 76387f0..0000000
--- a/debian/patches/0005-Build_error_with_vala.patch
+++ /dev/null
@@ -1,20 +0,0 @@
-Remove incorrect i18n.merge_file argument
-Origin: upstream, https://gitlab.gnome.org/GNOME/simple-scan/-/commit/da6626debe00be1a0660f30cf2bf7629186c01d5
-Bug: https://gitlab.gnome.org/GNOME/simple-scan/-/issues/284
-Forwarded: not-needed
-Last-Update: 2022-02-06
----
-This patch header follows DEP-3: http://dep.debian.net/deps/dep3/
-Index: trunk/src/simple-scan.vala
-===================================================================
---- trunk.orig/src/simple-scan.vala
-+++ trunk/src/simple-scan.vala
-@@ -14,7 +14,7 @@ public class SimpleScan : Gtk.Applicatio
- static bool show_version;
- static bool debug_enabled;
- static string? fix_pdf_filename = null;
-- public const OptionEntry[] options =
-+ const OptionEntry[] options =
- {
- { "version", 'v', 0, OptionArg.NONE, ref show_version,
- /* Help string for command line --version flag */
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index e4ed019..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-0001-Remove_incorrect_i18n.merge_file_argument.patch
-0005-Build_error_with_vala.patch