From 483bc0f67afa8744e86517116c84a41bfa1abbbd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?J=C3=B6rg=20Frings-F=C3=BCrst?= Date: Sat, 19 Mar 2022 18:33:30 +0100 Subject: Remove upstream applied patches --- .pc/.quilt_patches | 1 + .pc/.quilt_series | 1 + .pc/.version | 1 + debian/changelog | 9 +++++++ ...Remove_incorrect_i18n.merge_file_argument.patch | 30 ---------------------- debian/patches/0005-Build_error_with_vala.patch | 20 --------------- debian/patches/series | 2 -- 7 files changed, 12 insertions(+), 52 deletions(-) create mode 100644 .pc/.quilt_patches create mode 100644 .pc/.quilt_series create mode 100644 .pc/.version delete mode 100644 debian/patches/0001-Remove_incorrect_i18n.merge_file_argument.patch delete mode 100644 debian/patches/0005-Build_error_with_vala.patch delete mode 100644 debian/patches/series diff --git a/.pc/.quilt_patches b/.pc/.quilt_patches new file mode 100644 index 0000000..6857a8d --- /dev/null +++ b/.pc/.quilt_patches @@ -0,0 +1 @@ +debian/patches diff --git a/.pc/.quilt_series b/.pc/.quilt_series new file mode 100644 index 0000000..c206706 --- /dev/null +++ b/.pc/.quilt_series @@ -0,0 +1 @@ +series diff --git a/.pc/.version b/.pc/.version new file mode 100644 index 0000000..0cfbf08 --- /dev/null +++ b/.pc/.version @@ -0,0 +1 @@ +2 diff --git a/debian/changelog b/debian/changelog index 1f954af..e8de67e 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +simple-scan (42.0-1) UNRELEASED; 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 Sat, 19 Mar 2022 18:05:56 +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 -- cgit v1.2.3