diff options
author | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-12-02 20:19:01 +0100 |
---|---|---|
committer | Jörg Frings-Fürst <debian@jff-webhosting.net> | 2014-12-02 20:19:01 +0100 |
commit | b542c2254f2533b0838c36ae5da7679d0bd5fb7b (patch) | |
tree | 74b25b2f470ea025591197168ebbb6ed7b6a32d8 /debian/patches/01_xcam.c_dead_code.dpatch | |
parent | 7d8191b83e163d76bb05e13b373638e4eeb7da95 (diff) | |
parent | 4bc4b41457cf5caca82a936deffeb7874dddd446 (diff) |
Merge tag 'upstream/1.0.14'
Upstream version 1.0.14
Diffstat (limited to 'debian/patches/01_xcam.c_dead_code.dpatch')
-rw-r--r-- | debian/patches/01_xcam.c_dead_code.dpatch | 29 |
1 files changed, 0 insertions, 29 deletions
diff --git a/debian/patches/01_xcam.c_dead_code.dpatch b/debian/patches/01_xcam.c_dead_code.dpatch deleted file mode 100644 index 41a33e0..0000000 --- a/debian/patches/01_xcam.c_dead_code.dpatch +++ /dev/null @@ -1,29 +0,0 @@ -#! /bin/sh /usr/share/dpatch/dpatch-run -## 01_xcam.c_dead_code.dpatch by <jblache@debian.org> -## -## All lines beginning with `## DP:' are a description of the patch. -## DP: Remove dead code in src/xcam.c::load_defaults() - -@DPATCH@ -diff -urNad sane-frontends-1.0.14~/src/xcam.c sane-frontends-1.0.14/src/xcam.c ---- sane-frontends-1.0.14~/src/xcam.c 2005-09-20 19:30:01.000000000 +0200 -+++ sane-frontends-1.0.14/src/xcam.c 2005-09-20 19:30:59.289245755 +0200 -@@ -536,16 +536,14 @@ - load_defaults (int silent) - { - char filename[PATH_MAX]; -- int fd; - - DBG (DBG_debug, "xcam, load_defaults: enter\n"); - if (make_default_filename (sizeof (filename), filename, dialog->dev_name) - < 0) - return; -- if (fd < 0) -- return; -+ - load_settings (filename, silent); -- sanei_load_values (fd, dialog->dev); -+ - DBG (DBG_debug, "xcam, load_defaults: exit\n"); - } - |