summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--debian/changelog1
-rw-r--r--debian/patches/0100-xcam.c_dead_code.patch (renamed from debian/patches/01_xcam.c_dead_code.patch)0
-rw-r--r--debian/patches/0105-scanadf_options_fix.patch (renamed from debian/patches/03_scanadf_options_fix.patch)0
-rw-r--r--debian/patches/0110-cap_always_settable.patch (renamed from debian/patches/04_cap_always_settable.patch)0
-rw-r--r--debian/patches/0115-xcam_off_by_one.patch (renamed from debian/patches/05_xcam_off_by_one.patch)0
-rw-r--r--debian/patches/0120-word_list_fix.patch (renamed from debian/patches/06_word_list_fix.patch)0
-rw-r--r--debian/patches/0125-scanadf-SIGCHLD.patch (renamed from debian/patches/20_scanadf-SIGCHLD.patch)0
-rw-r--r--debian/patches/0130-gimp_init.patch (renamed from debian/patches/30_gimp_init.patch)0
-rw-r--r--debian/patches/0135-xscanimage_c-out-of-bounds.patch (renamed from debian/patches/100_xscanimage_c-out-of-bounds.patch)0
-rw-r--r--debian/patches/0600-xcam_man_typo.patch (renamed from debian/patches/02_xcam_man_typo.patch)0
-rw-r--r--debian/patches/0605-manpages-typo.patch (renamed from debian/patches/25_manpages-typo.patch)0
-rw-r--r--debian/patches/scanadf-sigchld.diff11
-rw-r--r--debian/patches/series20
13 files changed, 11 insertions, 21 deletions
diff --git a/debian/changelog b/debian/changelog
index f4cecea..fa9827c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,7 @@ sane-frontends (1.0.14-13) UNRELEASED; urgency=medium
- Remove usr/share/sane.
* debian/sane.install:
- Remove usr/share/sane/* and usr/bin/*.
+ * Rename patches and remove not used debian/patches/scanadf-sigchld.diff.
* Change to my new email address.
* Migrate to debhelper 11:
- Change debian/compat to 11.
diff --git a/debian/patches/01_xcam.c_dead_code.patch b/debian/patches/0100-xcam.c_dead_code.patch
index f90bc6b..f90bc6b 100644
--- a/debian/patches/01_xcam.c_dead_code.patch
+++ b/debian/patches/0100-xcam.c_dead_code.patch
diff --git a/debian/patches/03_scanadf_options_fix.patch b/debian/patches/0105-scanadf_options_fix.patch
index 8c1b0c7..8c1b0c7 100644
--- a/debian/patches/03_scanadf_options_fix.patch
+++ b/debian/patches/0105-scanadf_options_fix.patch
diff --git a/debian/patches/04_cap_always_settable.patch b/debian/patches/0110-cap_always_settable.patch
index aef60f1..aef60f1 100644
--- a/debian/patches/04_cap_always_settable.patch
+++ b/debian/patches/0110-cap_always_settable.patch
diff --git a/debian/patches/05_xcam_off_by_one.patch b/debian/patches/0115-xcam_off_by_one.patch
index 0b91cc4..0b91cc4 100644
--- a/debian/patches/05_xcam_off_by_one.patch
+++ b/debian/patches/0115-xcam_off_by_one.patch
diff --git a/debian/patches/06_word_list_fix.patch b/debian/patches/0120-word_list_fix.patch
index 683e745..683e745 100644
--- a/debian/patches/06_word_list_fix.patch
+++ b/debian/patches/0120-word_list_fix.patch
diff --git a/debian/patches/20_scanadf-SIGCHLD.patch b/debian/patches/0125-scanadf-SIGCHLD.patch
index ab91534..ab91534 100644
--- a/debian/patches/20_scanadf-SIGCHLD.patch
+++ b/debian/patches/0125-scanadf-SIGCHLD.patch
diff --git a/debian/patches/30_gimp_init.patch b/debian/patches/0130-gimp_init.patch
index 08c81f1..08c81f1 100644
--- a/debian/patches/30_gimp_init.patch
+++ b/debian/patches/0130-gimp_init.patch
diff --git a/debian/patches/100_xscanimage_c-out-of-bounds.patch b/debian/patches/0135-xscanimage_c-out-of-bounds.patch
index 2249f5a..2249f5a 100644
--- a/debian/patches/100_xscanimage_c-out-of-bounds.patch
+++ b/debian/patches/0135-xscanimage_c-out-of-bounds.patch
diff --git a/debian/patches/02_xcam_man_typo.patch b/debian/patches/0600-xcam_man_typo.patch
index 2421dc8..2421dc8 100644
--- a/debian/patches/02_xcam_man_typo.patch
+++ b/debian/patches/0600-xcam_man_typo.patch
diff --git a/debian/patches/25_manpages-typo.patch b/debian/patches/0605-manpages-typo.patch
index 2bc246b..2bc246b 100644
--- a/debian/patches/25_manpages-typo.patch
+++ b/debian/patches/0605-manpages-typo.patch
diff --git a/debian/patches/scanadf-sigchld.diff b/debian/patches/scanadf-sigchld.diff
deleted file mode 100644
index fe84f08..0000000
--- a/debian/patches/scanadf-sigchld.diff
+++ /dev/null
@@ -1,11 +0,0 @@
-diff --git a/src/scanadf.c b/src/scanadf.c
---- a/src/scanadf.c
-+++ b/src/scanadf.c
-@@ -1195,6 +1195,7 @@
-
- case 0:
- /* in child process */
-+ signal(SIGCHLD, SIG_DFL);
- sprintf(cmd, "%s '%s'", script, fname);
- /* system(cmd); */
- execle(script, script, fname, NULL, environ);
diff --git a/debian/patches/series b/debian/patches/series
index bb24e0e..64afa25 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,11 +1,11 @@
0001-fix_missing_sane-config.patch
-30_gimp_init.patch
-25_manpages-typo.patch
-01_xcam.c_dead_code.patch
-02_xcam_man_typo.patch
-03_scanadf_options_fix.patch
-04_cap_always_settable.patch
-05_xcam_off_by_one.patch
-06_word_list_fix.patch
-20_scanadf-SIGCHLD.patch
-100_xscanimage_c-out-of-bounds.patch
+0100-xcam.c_dead_code.patch
+0105-scanadf_options_fix.patch
+0110-cap_always_settable.patch
+0115-xcam_off_by_one.patch
+0120-word_list_fix.patch
+0125-scanadf-SIGCHLD.patch
+0130-gimp_init.patch
+0135-xscanimage_c-out-of-bounds.patch
+0600-xcam_man_typo.patch
+0605-manpages-typo.patch