[Lsb-messages] /var/www/bzr/lsb/devel/build_env r1957: restore broken sane return types (bug 2199)

[Mats Wichmann]

------------------------------------------------------------
revno: 1957
committer: Mats Wichmann <mats at linuxfoundation.org>
branch nick: build_env
timestamp: Wed 2012-05-16 05:28:48 -0600
message:
  restore broken sane return types (bug 2199)
modified:
  headers/All/5.0/sane/sane.h.defs
  headers/sane/sane.h
  package/Makefile
-------------- next part --------------
=== modified file 'headers/All/5.0/sane/sane.h.defs'
--- a/headers/All/5.0/sane/sane.h.defs	2012-05-15 18:05:44 +0000
+++ b/headers/All/5.0/sane/sane.h.defs	2012-05-16 11:28:48 +0000
@@ -120,21 +120,28 @@
 } SANE_Parameters;
 typedef void (*SANE_Auth_Callback) (SANE_String_Const, SANE_Char *,
 				    SANE_Char *);
-extern sane_cancel(SANE_Handle handle);
-extern sane_close(SANE_Handle handle);
-extern sane_control_option(SANE_Handle handle, SANE_Int option,
-			   SANE_Action action, void *value,
-			   SANE_Int * info);
-extern sane_exit(void);
-extern sane_get_devices(const SANE_Device * **device_list,
-			SANE_Bool local_only);
-extern sane_get_option_descriptor(SANE_Handle handle, SANE_Int option);
-extern sane_get_parameters(SANE_Handle handle, SANE_Parameters * params);
-extern sane_get_select_fd(SANE_Handle handle, SANE_Int * fd);
-extern sane_init(SANE_Int * version_code, SANE_Auth_Callback authorize);
-extern sane_open(SANE_String_Const devicename, SANE_Handle * handle);
-extern sane_read(SANE_Handle handle, SANE_Byte * data, SANE_Int max_length,
-		 SANE_Int * length);
-extern sane_set_io_mode(SANE_Handle handle, SANE_Bool non_blocking);
-extern sane_start(SANE_Handle handle);
-extern sane_strstatus(SANE_Status status);
+extern void sane_cancel(SANE_Handle handle);
+extern void sane_close(SANE_Handle handle);
+extern SANE_Status sane_control_option(SANE_Handle handle, SANE_Int option,
+				       SANE_Action action, void *value,
+				       SANE_Int * info);
+extern void sane_exit(void);
+extern SANE_Status sane_get_devices(const SANE_Device * **device_list,
+				    SANE_Bool local_only);
+extern const SANE_Option_Descriptor *sane_get_option_descriptor(SANE_Handle
+								handle,
+								SANE_Int
+								option);
+extern SANE_Status sane_get_parameters(SANE_Handle handle,
+				       SANE_Parameters * params);
+extern SANE_Status sane_get_select_fd(SANE_Handle handle, SANE_Int * fd);
+extern SANE_Status sane_init(SANE_Int * version_code,
+			     SANE_Auth_Callback authorize);
+extern SANE_Status sane_open(SANE_String_Const devicename,
+			     SANE_Handle * handle);
+extern SANE_Status sane_read(SANE_Handle handle, SANE_Byte * data,
+			     SANE_Int max_length, SANE_Int * length);
+extern SANE_Status sane_set_io_mode(SANE_Handle handle,
+				    SANE_Bool non_blocking);
+extern SANE_Status sane_start(SANE_Handle handle);
+extern SANE_String_Const sane_strstatus(SANE_Status status);

=== modified file 'headers/sane/sane.h'
--- a/headers/sane/sane.h	2012-05-15 18:05:44 +0000
+++ b/headers/sane/sane.h	2012-05-16 11:28:48 +0000
@@ -153,26 +153,31 @@
 
 /* Function prototypes */
 
-    extern sane_cancel(SANE_Handle handle);
-    extern sane_close(SANE_Handle handle);
-    extern sane_control_option(SANE_Handle handle, SANE_Int option,
-			       SANE_Action action, void *value,
-			       SANE_Int * info);
-    extern sane_exit(void);
-    extern sane_get_devices(const SANE_Device * **device_list,
-			    SANE_Bool local_only);
-    extern sane_get_option_descriptor(SANE_Handle handle, SANE_Int option);
-    extern sane_get_parameters(SANE_Handle handle,
-			       SANE_Parameters * params);
-    extern sane_get_select_fd(SANE_Handle handle, SANE_Int * fd);
-    extern sane_init(SANE_Int * version_code,
-		     SANE_Auth_Callback authorize);
-    extern sane_open(SANE_String_Const devicename, SANE_Handle * handle);
-    extern sane_read(SANE_Handle handle, SANE_Byte * data,
-		     SANE_Int max_length, SANE_Int * length);
-    extern sane_set_io_mode(SANE_Handle handle, SANE_Bool non_blocking);
-    extern sane_start(SANE_Handle handle);
-    extern sane_strstatus(SANE_Status status);
+    extern void sane_cancel(SANE_Handle handle);
+    extern void sane_close(SANE_Handle handle);
+    extern SANE_Status sane_control_option(SANE_Handle handle,
+					   SANE_Int option,
+					   SANE_Action action, void *value,
+					   SANE_Int * info);
+    extern void sane_exit(void);
+    extern SANE_Status sane_get_devices(const SANE_Device * **device_list,
+					SANE_Bool local_only);
+    extern const SANE_Option_Descriptor
+	*sane_get_option_descriptor(SANE_Handle handle, SANE_Int option);
+    extern SANE_Status sane_get_parameters(SANE_Handle handle,
+					   SANE_Parameters * params);
+    extern SANE_Status sane_get_select_fd(SANE_Handle handle,
+					  SANE_Int * fd);
+    extern SANE_Status sane_init(SANE_Int * version_code,
+				 SANE_Auth_Callback authorize);
+    extern SANE_Status sane_open(SANE_String_Const devicename,
+				 SANE_Handle * handle);
+    extern SANE_Status sane_read(SANE_Handle handle, SANE_Byte * data,
+				 SANE_Int max_length, SANE_Int * length);
+    extern SANE_Status sane_set_io_mode(SANE_Handle handle,
+					SANE_Bool non_blocking);
+    extern SANE_Status sane_start(SANE_Handle handle);
+    extern SANE_String_Const sane_strstatus(SANE_Status status);
 #ifdef __cplusplus
 }
 #endif

=== modified file 'package/Makefile'
--- a/package/Makefile	2012-05-15 18:05:44 +0000
+++ b/package/Makefile	2012-05-16 11:28:48 +0000
@@ -46,7 +46,7 @@
 
 # We define this here instead of directly in the spec file as
 # we need to be able to work out what the produced rpm files will be called
-RPM_PACKAGE_RELEASE=6
+RPM_PACKAGE_RELEASE=7
 
 # Initialize LIB64 to proper value for 64-bit architectures
 export LIB64:=$(shell case `uname -m` in (ppc64 | s390x | x86_64) echo 64 ;; esac)