Imported Debian patch 0.998-1debian/0.998-1

1 files changed, 18 insertions, 18 deletions

diff --git a/debian/patches/fix_options_handling_fix.patch b/debian/patches/fix_options_handling_fix.patch
index 4b6565c..49084fe 100644
--- a/debian/patches/fix_options_handling_fix.patch
+++ b/debian/patches/fix_options_handling_fix.patch
@@ -4,11 +4,11 @@ Description: Fixup options handling
  be stable, and actually isn't stable when the net backend is used.
 Author: Julien BLACHE <jblache@debian.org>
 
-Index: xsane-0.997/src/xsane-back-gtk.c
+Index: xsane-0.998/src/xsane-back-gtk.c
 ===================================================================
---- xsane-0.997.orig/src/xsane-back-gtk.c	2002-10-02 13:05:52.000000000 +0200
-+++ xsane-0.997/src/xsane-back-gtk.c	2010-05-29 12:30:37.652409969 +0200
-@@ -2229,11 +2229,13 @@
+--- xsane-0.998.orig/src/xsane-back-gtk.c	2010-11-16 21:24:59.000000000 +0100
++++ xsane-0.998/src/xsane-back-gtk.c	2011-02-04 19:50:46.389016001 +0100
+@@ -2225,11 +2225,13 @@
  /* ----------------------------------------------------------------------------------------------------------------- */
  
  void xsane_back_gtk_option_menu_new(GtkWidget *parent, const char *name, char *str_list[],
@@ -23,7 +23,7 @@ Index: xsane-0.997/src/xsane-back-gtk.c
   int i, num_items;
  
    DBG(DBG_proc, "xsane_back_gtk_option_menu_new(%s)\n", name);
-@@ -2251,16 +2253,23 @@
+@@ -2247,16 +2249,23 @@
  
    menu_items = malloc((num_items + 1) * sizeof(menu_items[0]));
  
@@ -49,7 +49,7 @@ Index: xsane-0.997/src/xsane-back-gtk.c
      menu_items[i].elem = elem;
      menu_items[i].index = i;
    }
-@@ -2406,14 +2415,15 @@
+@@ -2402,14 +2411,15 @@
    xsane.standard_hbox = NULL;
    xsane.advanced_hbox = NULL;
  
@@ -67,10 +67,10 @@ Index: xsane-0.997/src/xsane-back-gtk.c
        {
          for (j = 0; j < elem->menu_size; ++j)
          {
-Index: xsane-0.997/src/xsane-back-gtk.h
+Index: xsane-0.998/src/xsane-back-gtk.h
 ===================================================================
---- xsane-0.997.orig/src/xsane-back-gtk.h	2007-02-24 01:56:54.000000000 +0100
-+++ xsane-0.997/src/xsane-back-gtk.h	2010-05-29 12:30:37.652409969 +0200
+--- xsane-0.998.orig/src/xsane-back-gtk.h	2007-02-24 01:56:54.000000000 +0100
++++ xsane-0.998/src/xsane-back-gtk.h	2011-02-04 19:50:46.389016001 +0100
 @@ -117,7 +117,7 @@
  	   gfloat quant, int automatic,
  	   DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
@@ -80,10 +80,10 @@ Index: xsane-0.997/src/xsane-back-gtk.h
  extern void xsane_back_gtk_text_entry_new(GtkWidget *parent, const char *name, const char *val,
                  DialogElement *elem, GtkTooltips *tooltips, const char *desc, SANE_Int settable);
  extern void xsane_back_gtk_push_button_callback(GtkWidget *widget, gpointer data);
-Index: xsane-0.997/src/xsane-front-gtk.c
+Index: xsane-0.998/src/xsane-front-gtk.c
 ===================================================================
---- xsane-0.997.orig/src/xsane-front-gtk.c	2002-10-02 13:04:33.000000000 +0200
-+++ xsane-0.997/src/xsane-front-gtk.c	2010-05-29 12:30:37.681408559 +0200
+--- xsane-0.998.orig/src/xsane-front-gtk.c	2010-11-16 21:25:33.000000000 +0100
++++ xsane-0.998/src/xsane-front-gtk.c	2011-02-04 19:50:46.393016001 +0100
 @@ -64,10 +64,10 @@
                                           int *state, void *xsane_toggle_button_callback);
  GtkWidget *xsane_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc,
@@ -158,10 +158,10 @@ Index: xsane-0.997/src/xsane-front-gtk.c
    gtk_widget_show(hbox);
  }
  
-Index: xsane-0.997/src/xsane-front-gtk.h
+Index: xsane-0.998/src/xsane-front-gtk.h
 ===================================================================
---- xsane-0.997.orig/src/xsane-front-gtk.h	2007-05-17 14:45:19.000000000 +0200
-+++ xsane-0.997/src/xsane-front-gtk.h	2010-05-29 12:30:37.705467626 +0200
+--- xsane-0.998.orig/src/xsane-front-gtk.h	2007-05-17 14:45:19.000000000 +0200
++++ xsane-0.998/src/xsane-front-gtk.h	2011-02-04 19:50:46.453016001 +0100
 @@ -54,10 +54,10 @@
  extern GtkWidget *xsane_button_new_with_pixmap(GdkWindow *window, GtkWidget *parent, const char *xpm_d[], const char *desc, 
                                                 void *xsane_button_callback, gpointer data);
@@ -175,10 +175,10 @@ Index: xsane-0.997/src/xsane-front-gtk.h
                                                GtkWidget **data, int option,
                                                void *option_menu_callback, SANE_Int settable, const gchar *widget_name);
  extern void xsane_range_new(GtkBox *parent, char *labeltext, const char *desc,
-Index: xsane-0.997/src/xsane.c
+Index: xsane-0.998/src/xsane.c
 ===================================================================
---- xsane-0.997.orig/src/xsane.c	2010-05-29 12:30:32.277409114 +0200
-+++ xsane-0.997/src/xsane.c	2010-05-29 12:30:37.711409616 +0200
+--- xsane-0.998.orig/src/xsane.c	2011-02-04 19:50:40.957016002 +0100
++++ xsane-0.998/src/xsane.c	2011-02-04 19:50:46.457016001 +0100
 @@ -876,7 +876,7 @@
              str_list[j] = 0;
              sprintf(str, "%d", (int) val);