diff options
author | Julien BLACHE <jblache@debian.org> | 2010-05-29 12:49:57 +0200 |
---|---|---|
committer | Mattia Rizzolo <mattia@mapreri.org> | 2014-10-03 14:05:54 +0000 |
commit | 98aa79889a1cc8be7284b431372dc11b26c65e4e (patch) | |
tree | 00326799a359e1d3504df8b07f4b020255c607c9 /debian/patches/deb_inhibit_clickthrough.patch | |
parent | 05f0966f64f56ad3348ce8569324ee6c3e692aa8 (diff) | |
parent | ed1d7afab34d41b155ac701ee9db87c3f057b99b (diff) |
Imported Debian patch 0.997-1debian/0.997-1
Diffstat (limited to 'debian/patches/deb_inhibit_clickthrough.patch')
-rw-r--r-- | debian/patches/deb_inhibit_clickthrough.patch | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/debian/patches/deb_inhibit_clickthrough.patch b/debian/patches/deb_inhibit_clickthrough.patch index daf82ec..6c6a98a 100644 --- a/debian/patches/deb_inhibit_clickthrough.patch +++ b/debian/patches/deb_inhibit_clickthrough.patch @@ -3,11 +3,11 @@ Description: Inhibit XSane's click-through license Author: Julien BLACHE <jblache@debian.org> Forwarded: not-needed -Index: xsane-0.996/src/xsane.c +Index: xsane-0.997/src/xsane.c =================================================================== ---- xsane-0.996.orig/src/xsane.c 2010-03-13 20:42:29.786742130 +0100 -+++ xsane-0.996/src/xsane.c 2010-03-13 20:42:59.978765829 +0100 -@@ -1901,11 +1901,11 @@ +--- xsane-0.997.orig/src/xsane.c 2002-10-02 13:02:50.000000000 +0200 ++++ xsane-0.997/src/xsane.c 2010-05-29 12:30:32.277409114 +0200 +@@ -1909,11 +1909,11 @@ /* ---------------------------------------------------------------------------------------------------------------------- */ static int xsane_pref_restore(void) @@ -21,7 +21,7 @@ Index: xsane-0.996/src/xsane.c int i; DBG(DBG_proc, "xsane_pref_restore\n"); -@@ -1919,6 +1919,7 @@ +@@ -1927,6 +1927,7 @@ preferences_restore(fd); close(fd); @@ -29,7 +29,7 @@ Index: xsane-0.996/src/xsane.c /* 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 @@ +@@ -1936,6 +1937,7 @@ result = FALSE; /* this version already has been started */ } } @@ -37,7 +37,7 @@ Index: xsane-0.996/src/xsane.c } else /* no local sane file, look for system file */ { -@@ -5796,7 +5798,10 @@ +@@ -5815,7 +5817,10 @@ xsane.xsane_rc_set_filename = strdup("xsane"); /* ".rc" is appended later */ } @@ -48,7 +48,7 @@ Index: xsane-0.996/src/xsane.c 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 */ -@@ -5809,6 +5814,7 @@ +@@ -5828,6 +5833,7 @@ xsane_pref_save(); } } |