Merge branch 'master' of ssh://git.debian.org/git/sane/sane-backends

Conflicts:
	ChangeLog

ChangeLog

@@ -2,6 +2,24 @@
 	* backend/canon_dr.[ch]: backend v39
 	- DR-2580C pads the backside of duplex scans
 
+2011-11-01 Stéphane Voltz <stef.dev@free.fr>
+	* backend/genesys_gl124.c backend/genesys_gl646.c
+	backend/genesys_gl841.c backend/genesys_gl843.c backend/genesys_gl847.c
+	backend/genesys_low.c backend/genesys_low.h: do <sys/types.h> include
+	in a clean way
+
+2011-10-30 Mattias Ellert <mattias.ellert@fysast.uu.se>
+	* backend/kvs40xx.h: Use portable endian macro from config.h
+	* backend/kodak.c: Use more precise path to internal headers
+	* backend/canon630u.c, backend/genesys_gl124.c,
+	  backend/genesys_gl646.c, backend/genesys_gl841.c,
+	  backend/genesys_gl843.c, backend/genesys_gl847.c,
+	  backend/genesys_low.c, backend/hp3900_rts8822.c,
+	  backend/rts88xx_lib.c, backend/xerox_mfp.c, sanei/sanei_pio.c:
+	  Include <sys/types.h> for definition of u_long on MacOS X
+	* po/sv.po: Update Swedish translation
+>>>>>>> f0e42223a7ef1c4c10aa256b3f42f65bdebf4998
+
 2011-10-21 Stéphane Voltz <stef.dev@free.fr>
 	* backend/genesys.c backend/genesys.h backend/genesys_devices.c
 	backend/genesys_gl*.c backend/genesys_gl843.h

backend/canon630u.c

@@ -54,6 +54,7 @@
 #include <unistd.h>
 #include <fcntl.h>
 #include <sys/ioctl.h>
+#include <sys/types.h>
 
 #include "../include/sane/sane.h"
 #include "../include/sane/sanei.h"

backend/canon_dr.c

@@ -272,6 +272,8 @@
 	 - invert logic of read_panel tracking
 	 - add ability to disable read_panel()
 	 - automatically disable read/send_panel if unsupported
+      v39 2011-11-01, MAN
+         - DR-2580C pads the backside of duplex scans
 
    SANE FLOW DIAGRAM
 
@@ -320,7 +322,7 @@
 #include "canon_dr.h"
 
 #define DEBUG 1
-#define BUILD 38
+#define BUILD 39
 
 /* values for SANE_DEBUG_CANON_DR env var:
  - errors           5

backend/genesys_devices.c

@@ -687,7 +687,7 @@ static Genesys_Gpo Gpo[] = {
   }
   ,
   /* CANONLIDE210 */
-  {GPO_CANONLIDE110,
+  {GPO_CANONLIDE210,
    {0xfb, 0x20},
    {0xff, 0x00},
   }

backend/genesys_low.h

@@ -55,6 +55,9 @@
 #ifdef HAVE_SYS_TIME_H
 #include <sys/time.h>
 #endif
+#ifdef HAVE_SYS_TYPES_H
+#include <sys/types.h>
+#endif
 #include "../include/sane/sane.h"
 
 #define DBG_error0      0	/* errors/warnings printed even with devuglevel 0 */

backend/hp3900_rts8822.c

@@ -68,6 +68,7 @@
 #include <math.h>		/* truncf()  */
 #include <ctype.h>		/* tolower() */
 #include <unistd.h>		/* usleep()  */
+#include <sys/types.h>
 
 #include "hp3900_types.c"
 #include "hp3900_debug.c"

backend/kodak.c

@@ -110,10 +110,10 @@
 # include <libc.h>              /* NeXTStep/OpenStep */
 #endif
 
-#include "sane/sanei_backend.h"
-#include "sane/sanei_scsi.h"
-#include "sane/saneopts.h"
-#include "sane/sanei_config.h"
+#include "../include/sane/sanei_backend.h"
+#include "../include/sane/sanei_scsi.h"
+#include "../include/sane/saneopts.h"
+#include "../include/sane/sanei_config.h"
 
 #include "kodak-cmd.h"
 #include "kodak.h"

backend/kvs40xx.h

@@ -8,7 +8,7 @@
    Panasonic KV-S40xx USB-SCSI scanner driver.
 */
 
-#include <endian.h>
+#include "../include/sane/config.h"
 #include <semaphore.h>
 
 #undef  BACKEND_NAME
@@ -226,7 +226,7 @@ swap_bytes32 (u32 x)
     (x & (u32) 0x0000ff00UL) << 8 | (x & (u32) 0x00ff0000UL) >> 8;
 }
 
-#if __BYTE_ORDER == __BIG_ENDIAN
+#if WORDS_BIGENDIAN
 static inline void
 set24 (u8 * p, u32 x)
 {

backend/rts88xx_lib.c

@@ -54,6 +54,7 @@
 
 #include <stdio.h>
 #include <sys/time.h>
+#include <sys/types.h>
 
 #include "../include/_stdint.h"
 

backend/xerox_mfp.c

@@ -22,6 +22,7 @@
 #include <math.h>
 #include <unistd.h>
 #include <sys/time.h>
+#include <sys/types.h>
 #include "../include/sane/sane.h"
 #include "../include/sane/sanei.h"
 #include "../include/sane/saneopts.h"

sanei/sanei_pio.c

@@ -57,6 +57,7 @@
 #ifdef HAVE_UNISTD_H
 # include <unistd.h>
 #endif
+#include <sys/types.h>
 
 #ifdef HAVE_SYS_IO_H
 # include <sys/io.h>	/* use where available (glibc 2.x, for example) */