Imported Debian patch 0.995-3debian/0.995-3

4 files changed, 71 insertions, 1 deletions

diff --git a/debian/changelog b/debian/changelog
index 008c86b..e327510 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+xsane (0.995-3) unstable; urgency=low
+
+  * debian/patches/04_inhibit_clickthrough.dpatch:
+    + Added; finally give up and inhibit the license clickthrough. They
+      largely made me do it (closes: #132679).
+  * debian/xsane-common.doc-base:
+    + Fix doc-base section.
+
+ -- Julien BLACHE <jblache@debian.org>  Fri, 11 Apr 2008 19:03:59 +0200
+
 xsane (0.995-2) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/patches/00list b/debian/patches/00list
index 1c43793..4219900 100644
--- a/debian/patches/00list
+++ b/debian/patches/00list
@@ -1,4 +1,5 @@
 02_docviewer
 03_gimp_acquire_menu
+04_inhibit_clickthrough
 10_broken_links
 
diff --git a/debian/patches/04_inhibit_clickthrough.dpatch b/debian/patches/04_inhibit_clickthrough.dpatch
new file mode 100644
index 0000000..d38727b
--- /dev/null
+++ b/debian/patches/04_inhibit_clickthrough.dpatch
@@ -0,0 +1,59 @@
+#! /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();
+ 
diff --git a/debian/xsane-common.doc-base b/debian/xsane-common.doc-base
index d804d5a..4df3e91 100644
--- a/debian/xsane-common.doc-base
+++ b/debian/xsane-common.doc-base
@@ -8,7 +8,7 @@ Abstract: This manual describes how to use xsane as a frontend to
  standardized access to any raster image scanner hardware (flatbed
  scanner, hand-held scanner, video- and still-cameras, frame-grabbers,
  etc.).
-Section: Apps/Graphics
+Section: Graphics
 
 Format: html
 Index: /usr/share/doc/xsane-common/html/sane-xsane-doc.html