summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAlessio Treglia <quadrispro@ubuntu.com>2010-04-14 12:30:19 +0200
committerAlessio Treglia <quadrispro@ubuntu.com>2010-04-14 12:30:19 +0200
commit0e565dfdb838b917dbf9de1f1ce2e4607565a361 (patch)
treeb884c9ccc07313f2c7508de2321ea16ac1eaa98e
parente8874f5586b69eafabb6b0163f5299322c0f7bc9 (diff)
Drop debian/patches/11_thunderbird_workaround.patch patch, applied upstream.
-rw-r--r--debian/patches/11_thunderbird_workaround.patch34
-rw-r--r--debian/patches/series2
2 files changed, 1 insertions, 35 deletions
diff --git a/debian/patches/11_thunderbird_workaround.patch b/debian/patches/11_thunderbird_workaround.patch
deleted file mode 100644
index 2d5a938..0000000
--- a/debian/patches/11_thunderbird_workaround.patch
+++ /dev/null
@@ -1,34 +0,0 @@
-## Description: add some description
-## Origin/Author: add some origin or author
-## Bug: bug URL
-Index: simple-scan-0.9.10/src/simple-scan.c
-===================================================================
---- simple-scan-0.9.10.orig/src/simple-scan.c 2010-03-26 12:53:11.355296101 +1100
-+++ simple-scan-0.9.10/src/simple-scan.c 2010-03-26 12:53:08.325311353 +1100
-@@ -343,7 +343,7 @@
- /* NOTE: I'm not sure if this is a 100% safe strategy to use g_file_open_tmp(), close and
- * use the filename but it appears to work in practise */
-
-- filename = g_strdup_printf ("%s-XXXXXX.%s", prefix, extension);
-+ filename = g_strdup_printf ("%sXXXXXX.%s", prefix, extension);
- fd = g_file_open_tmp (filename, &path, &error);
- g_free (filename);
- if (fd < 0) {
-@@ -371,7 +371,7 @@
- gchar *path;
-
- /* Open a temporary file */
-- path = get_temporary_filename ("scanned-document", "pdf");
-+ path = get_temporary_filename ("scan", "pdf");
- if (path) {
- GFile *file;
-
-@@ -389,7 +389,7 @@
- gchar *path;
- GFile *file;
-
-- path = get_temporary_filename ("scanned-document", "jpg");
-+ path = get_temporary_filename ("scan", "jpg");
- if (!path) {
- saved = FALSE;
- break;
diff --git a/debian/patches/series b/debian/patches/series
index 2d543b4..b7db254 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1 +1 @@
-11_thunderbird_workaround.patch
+# Empty