Imported Debian patch 0.996-4debian/0.996-4

1 files changed, 0 insertions, 59 deletions

diff --git a/debian/patches/04_inhibit_clickthrough.dpatch b/debian/patches/04_inhibit_clickthrough.dpatch
deleted file mode 100644
index d38727b..0000000
--- a/debian/patches/04_inhibit_clickthrough.dpatch
+++ /dev/null
@@ -1,59 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 04_inhibit_clickthrough.dpatch by  <jblache@debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Finally give up and inhibit the license clickthrough.
-
-@DPATCH@
-diff -urNad xsane-0.995~/src/xsane.c xsane-0.995/src/xsane.c
---- xsane-0.995~/src/xsane.c	2007-09-28 17:24:56.000000000 +0200
-+++ xsane-0.995/src/xsane.c	2008-04-11 18:56:55.120439147 +0200
-@@ -1901,11 +1901,11 @@
- /* ---------------------------------------------------------------------------------------------------------------------- */
- 
- static int xsane_pref_restore(void)
--/* returns true if this is the first time this xsane version is called */
-+/* Originally: returns true if this is the first time this xsane version is called */
- {
-  char filename[PATH_MAX];
-  int fd;
-- int result = TRUE;
-+ int result = FALSE;
-  int i;
- 
-   DBG(DBG_proc, "xsane_pref_restore\n");
-@@ -1919,6 +1919,7 @@
-     preferences_restore(fd);
-     close(fd);
- 
-+#if 0
-     /* the version test only is done for the local xsane.rc file because each user */
-     /* shall accept (or not) the license for xsane */
-     if (preferences.xsane_version_str)
-@@ -1928,6 +1929,7 @@
-         result = FALSE; /* this version already has been started */
-       }
-     }
-+#endif /* 0 */
-   }
-   else /* no local sane file, look for system file */
-   {
-@@ -5795,7 +5797,10 @@
-     xsane.xsane_rc_set_filename = strdup("xsane"); /* ".rc" is appended later */
-   }
- 
-+  xsane_pref_restore();
-+  xsane_pref_save();
- 
-+#if 0 /* Original XSane code */
-   if (xsane_pref_restore()) /* restore preferences, returns TRUE if license is not accpted yet */
-   {
-     if (xsane_display_eula(1)) /* show license and ask for accept/not accept */
-@@ -5808,6 +5813,7 @@
-       xsane_pref_save();
-     }
-   }
-+#endif /* Original XSane code */
- 
-   xsane_pref_restore_media();
-