Bug#766844: libbrlapi-dev: arch-dependent header files in "Multi-Arch: same" package
There's even more variation between kfreebsd and non-kfreebsd packages.
An example diff between i386 and kfreebsd-i386 is attached.
--
Jakub Wilk
diff -ur libbrlapi-dev_5.2~20141018-1_i386/usr/include/brltty/config.h libbrlapi-dev_5.2~20141018-1_kfreebsd-i386/usr/include/brltty/config.h
--- libbrlapi-dev_5.2~20141018-1_i386/usr/include/brltty/config.h 2014-10-26 00:40:58.000000000 +0200
+++ libbrlapi-dev_5.2~20141018-1_kfreebsd-i386/usr/include/brltty/config.h 2014-10-26 04:22:15.000000000 +0100
@@ -142,19 +142,19 @@
/* #undef HAVE_SYS_MODEM_H */
/* Define this if the header file machine/speaker.h exists. */
-/* #undef HAVE_MACHINE_SPEAKER_H */
+#define HAVE_MACHINE_SPEAKER_H 1
/* Define this if the header file dev/speaker/speaker.h exists. */
-/* #undef HAVE_DEV_SPEAKER_SPEAKER_H */
+#define HAVE_DEV_SPEAKER_SPEAKER_H 1
/* Define this if the header file linux/vt.h exists. */
-#define HAVE_LINUX_VT_H 1
+/* #undef HAVE_LINUX_VT_H */
/* Define this if the header file linux/input.h exists. */
-#define HAVE_LINUX_INPUT_H 1
+/* #undef HAVE_LINUX_INPUT_H */
/* Define this if the header file linux/uinput.h exists. */
-#define HAVE_LINUX_UINPUT_H 1
+/* #undef HAVE_LINUX_UINPUT_H */
/* Define this if the function mempcpy exists. */
#define HAVE_MEMPCPY 1
@@ -286,17 +286,17 @@
#define DEVICE_DIRECTORY "/dev"
/* Define this to be a string containing the path to the default braille device. */
-#define BRAILLE_DEVICE "usb:"
+#define BRAILLE_DEVICE "serial:cuaa0"
/* Define this if the function tcdrain exists. */
#define HAVE_TCDRAIN 1
/* Define this to be a string containing the path to the first serial device. */
-#define SERIAL_FIRST_DEVICE "ttyS0"
+#define SERIAL_FIRST_DEVICE "cuaa0"
/* Define only one of the following program path packages. */
-/* #undef USE_PKG_PGMPATH_NONE */
-#define USE_PKG_PGMPATH_LINUX 1
+#define USE_PKG_PGMPATH_NONE 1
+/* #undef USE_PKG_PGMPATH_LINUX */
/* #undef USE_PKG_PGMPATH_SOLARIS */
/* #undef USE_PKG_PGMPATH_WINDOWS */
@@ -305,8 +305,8 @@
/* #undef USE_PKG_SERVICE_WINDOWS */
/* Define only one of the following boot parameters packages. */
-/* #undef USE_PKG_PARAMS_NONE */
-#define USE_PKG_PARAMS_LINUX 1
+#define USE_PKG_PARAMS_NONE 1
+/* #undef USE_PKG_PARAMS_LINUX */
/* Define only one of the following dynamic loading packages. */
/* #undef USE_PKG_DYNLD_NONE */
@@ -334,26 +334,26 @@
/* #undef USE_PKG_MNTPT_MNTTAB */
/* Define only one of the following mount file system packages. */
-/* #undef USE_PKG_MNTFS_NONE */
-#define USE_PKG_MNTFS_LINUX 1
+#define USE_PKG_MNTFS_NONE 1
+/* #undef USE_PKG_MNTFS_LINUX */
/* Define only one of the following keyboard packages. */
-/* #undef USE_PKG_KBD_NONE */
+#define USE_PKG_KBD_NONE 1
/* #undef USE_PKG_KBD_ANDROID */
-#define USE_PKG_KBD_LINUX 1
+/* #undef USE_PKG_KBD_LINUX */
/* Define only one of the following beeper packages. */
/* #undef USE_PKG_BEEP_NONE */
-#define USE_PKG_BEEP_LINUX 1
+/* #undef USE_PKG_BEEP_LINUX */
/* #undef USE_PKG_BEEP_MSDOS */
/* #undef USE_PKG_BEEP_SOLARIS */
-/* #undef USE_PKG_BEEP_SPKR */
+#define USE_PKG_BEEP_SPKR 1
/* #undef USE_PKG_BEEP_WINDOWS */
/* #undef USE_PKG_BEEP_WSKBD */
/* Define only one of the following PCM packages. */
-/* #undef USE_PKG_PCM_NONE */
-#define USE_PKG_PCM_ALSA 1
+#define USE_PKG_PCM_NONE 1
+/* #undef USE_PKG_PCM_ALSA */
/* #undef USE_PKG_PCM_ANDROID */
/* #undef USE_PKG_PCM_AUDIO */
/* #undef USE_PKG_PCM_HPUX */
@@ -362,8 +362,8 @@
/* #undef USE_PKG_PCM_WINDOWS */
/* Define only one of the following MIDI packages. */
-/* #undef USE_PKG_MIDI_NONE */
-#define USE_PKG_MIDI_ALSA 1
+#define USE_PKG_MIDI_NONE 1
+/* #undef USE_PKG_MIDI_ALSA */
/* #undef USE_PKG_MIDI_DARWIN */
/* #undef USE_PKG_MIDI_OSS */
/* #undef USE_PKG_MIDI_WINDOWS */
@@ -380,7 +380,7 @@
/* #undef USE_PKG_SERIAL_WINDOWS */
/* Define only one of the following USB I/O packages. */
-/* #undef USE_PKG_USB_NONE */
+#define USE_PKG_USB_NONE 1
/* #undef USE_PKG_USB_ANDROID */
/* #undef USE_PKG_USB_DARWIN */
/* #undef USE_PKG_USB_FREEBSD */
@@ -388,23 +388,23 @@
/* #undef USE_PKG_USB_KFREEBSD */
/* #undef USE_PKG_USB_LIBUSB */
/* #undef USE_PKG_USB_LIBUSB_1_0 */
-#define USE_PKG_USB_LINUX 1
+/* #undef USE_PKG_USB_LINUX */
/* #undef USE_PKG_USB_NETBSD */
/* #undef USE_PKG_USB_OPENBSD */
/* #undef USE_PKG_USB_SOLARIS */
/* Define only one of the following Bluetooth I/O packages. */
-/* #undef USE_PKG_BLUETOOTH_NONE */
+#define USE_PKG_BLUETOOTH_NONE 1
/* #undef USE_PKG_BLUETOOTH_ANDROID */
/* #undef USE_PKG_BLUETOOTH_DARWIN */
-#define USE_PKG_BLUETOOTH_LINUX 1
+/* #undef USE_PKG_BLUETOOTH_LINUX */
/* #undef USE_PKG_BLUETOOTH_WINDOWS */
/* Define only one of the following I/O ports packages. */
/* #undef USE_PKG_PORTS_NONE */
-#define USE_PKG_PORTS_GLIBC 1
+/* #undef USE_PKG_PORTS_GLIBC */
/* #undef USE_PKG_PORTS_GRUB */
-/* #undef USE_PKG_PORTS_KFREEBSD */
+#define USE_PKG_PORTS_KFREEBSD 1
/* #undef USE_PKG_PORTS_MSDOS */
/* #undef USE_PKG_PORTS_WINDOWS */
@@ -439,10 +439,10 @@
#define SPEECH_PARAMETERS ""
/* Define this to be a string containing the default screen driver code. */
-#define DEFAULT_SCREEN_DRIVER "lx"
+#define DEFAULT_SCREEN_DRIVER "sc"
/* Define this to be a string containing a list of the screen driver codes. */
-#define SCREEN_DRIVER_CODES "lx sc a2"
+#define SCREEN_DRIVER_CODES "sc a2"
/* Define this to be a string containing the default screen driver parameters. */
#define SCREEN_PARAMETERS ""
@@ -487,13 +487,13 @@
/* #undef HAVE_LEGACY_DEV_USB_USB_H */
/* Define this if the bluetooth library is available. */
-#define HAVE_LIBBLUETOOTH 1
+/* #undef HAVE_LIBBLUETOOTH */
/* Define this if HP-UX audio support is available. */
/* #undef HAVE_HPUX_AUDIO */
/* Define this if GPM is to be used. */
-#define HAVE_LIBGPM 1
+/* #undef HAVE_LIBGPM */
/* Define this if X is not available. */
/* #undef X_DISPLAY_MISSING */
diff -ur libbrlapi-dev_5.2~20141018-1_i386/usr/include/brltty/forbuild.h libbrlapi-dev_5.2~20141018-1_kfreebsd-i386/usr/include/brltty/forbuild.h
--- libbrlapi-dev_5.2~20141018-1_i386/usr/include/brltty/forbuild.h 2014-10-26 00:40:58.000000000 +0200
+++ libbrlapi-dev_5.2~20141018-1_kfreebsd-i386/usr/include/brltty/forbuild.h 2014-10-26 04:22:15.000000000 +0100
@@ -142,19 +142,19 @@
/* #undef HAVE_SYS_MODEM_H */
/* Define this if the header file machine/speaker.h exists. */
-/* #undef HAVE_MACHINE_SPEAKER_H */
+#define HAVE_MACHINE_SPEAKER_H 1
/* Define this if the header file dev/speaker/speaker.h exists. */
-/* #undef HAVE_DEV_SPEAKER_SPEAKER_H */
+#define HAVE_DEV_SPEAKER_SPEAKER_H 1
/* Define this if the header file linux/vt.h exists. */
-#define HAVE_LINUX_VT_H 1
+/* #undef HAVE_LINUX_VT_H */
/* Define this if the header file linux/input.h exists. */
-#define HAVE_LINUX_INPUT_H 1
+/* #undef HAVE_LINUX_INPUT_H */
/* Define this if the header file linux/uinput.h exists. */
-#define HAVE_LINUX_UINPUT_H 1
+/* #undef HAVE_LINUX_UINPUT_H */
/* Define this if the function mempcpy exists. */
#define HAVE_MEMPCPY 1
@@ -286,17 +286,17 @@
#define DEVICE_DIRECTORY "/dev"
/* Define this to be a string containing the path to the default braille device. */
-#define BRAILLE_DEVICE "usb:"
+#define BRAILLE_DEVICE "serial:cuaa0"
/* Define this if the function tcdrain exists. */
#define HAVE_TCDRAIN 1
/* Define this to be a string containing the path to the first serial device. */
-#define SERIAL_FIRST_DEVICE "ttyS0"
+#define SERIAL_FIRST_DEVICE "cuaa0"
/* Define only one of the following program path packages. */
-/* #undef USE_PKG_PGMPATH_NONE */
-#define USE_PKG_PGMPATH_LINUX 1
+#define USE_PKG_PGMPATH_NONE 1
+/* #undef USE_PKG_PGMPATH_LINUX */
/* #undef USE_PKG_PGMPATH_SOLARIS */
/* #undef USE_PKG_PGMPATH_WINDOWS */
@@ -305,8 +305,8 @@
/* #undef USE_PKG_SERVICE_WINDOWS */
/* Define only one of the following boot parameters packages. */
-/* #undef USE_PKG_PARAMS_NONE */
-#define USE_PKG_PARAMS_LINUX 1
+#define USE_PKG_PARAMS_NONE 1
+/* #undef USE_PKG_PARAMS_LINUX */
/* Define only one of the following dynamic loading packages. */
/* #undef USE_PKG_DYNLD_NONE */
@@ -334,26 +334,26 @@
/* #undef USE_PKG_MNTPT_MNTTAB */
/* Define only one of the following mount file system packages. */
-/* #undef USE_PKG_MNTFS_NONE */
-#define USE_PKG_MNTFS_LINUX 1
+#define USE_PKG_MNTFS_NONE 1
+/* #undef USE_PKG_MNTFS_LINUX */
/* Define only one of the following keyboard packages. */
-/* #undef USE_PKG_KBD_NONE */
+#define USE_PKG_KBD_NONE 1
/* #undef USE_PKG_KBD_ANDROID */
-#define USE_PKG_KBD_LINUX 1
+/* #undef USE_PKG_KBD_LINUX */
/* Define only one of the following beeper packages. */
/* #undef USE_PKG_BEEP_NONE */
-#define USE_PKG_BEEP_LINUX 1
+/* #undef USE_PKG_BEEP_LINUX */
/* #undef USE_PKG_BEEP_MSDOS */
/* #undef USE_PKG_BEEP_SOLARIS */
-/* #undef USE_PKG_BEEP_SPKR */
+#define USE_PKG_BEEP_SPKR 1
/* #undef USE_PKG_BEEP_WINDOWS */
/* #undef USE_PKG_BEEP_WSKBD */
/* Define only one of the following PCM packages. */
-/* #undef USE_PKG_PCM_NONE */
-#define USE_PKG_PCM_ALSA 1
+#define USE_PKG_PCM_NONE 1
+/* #undef USE_PKG_PCM_ALSA */
/* #undef USE_PKG_PCM_ANDROID */
/* #undef USE_PKG_PCM_AUDIO */
/* #undef USE_PKG_PCM_HPUX */
@@ -362,8 +362,8 @@
/* #undef USE_PKG_PCM_WINDOWS */
/* Define only one of the following MIDI packages. */
-/* #undef USE_PKG_MIDI_NONE */
-#define USE_PKG_MIDI_ALSA 1
+#define USE_PKG_MIDI_NONE 1
+/* #undef USE_PKG_MIDI_ALSA */
/* #undef USE_PKG_MIDI_DARWIN */
/* #undef USE_PKG_MIDI_OSS */
/* #undef USE_PKG_MIDI_WINDOWS */
@@ -380,7 +380,7 @@
/* #undef USE_PKG_SERIAL_WINDOWS */
/* Define only one of the following USB I/O packages. */
-/* #undef USE_PKG_USB_NONE */
+#define USE_PKG_USB_NONE 1
/* #undef USE_PKG_USB_ANDROID */
/* #undef USE_PKG_USB_DARWIN */
/* #undef USE_PKG_USB_FREEBSD */
@@ -388,23 +388,23 @@
/* #undef USE_PKG_USB_KFREEBSD */
/* #undef USE_PKG_USB_LIBUSB */
/* #undef USE_PKG_USB_LIBUSB_1_0 */
-#define USE_PKG_USB_LINUX 1
+/* #undef USE_PKG_USB_LINUX */
/* #undef USE_PKG_USB_NETBSD */
/* #undef USE_PKG_USB_OPENBSD */
/* #undef USE_PKG_USB_SOLARIS */
/* Define only one of the following Bluetooth I/O packages. */
-/* #undef USE_PKG_BLUETOOTH_NONE */
+#define USE_PKG_BLUETOOTH_NONE 1
/* #undef USE_PKG_BLUETOOTH_ANDROID */
/* #undef USE_PKG_BLUETOOTH_DARWIN */
-#define USE_PKG_BLUETOOTH_LINUX 1
+/* #undef USE_PKG_BLUETOOTH_LINUX */
/* #undef USE_PKG_BLUETOOTH_WINDOWS */
/* Define only one of the following I/O ports packages. */
/* #undef USE_PKG_PORTS_NONE */
-#define USE_PKG_PORTS_GLIBC 1
+/* #undef USE_PKG_PORTS_GLIBC */
/* #undef USE_PKG_PORTS_GRUB */
-/* #undef USE_PKG_PORTS_KFREEBSD */
+#define USE_PKG_PORTS_KFREEBSD 1
/* #undef USE_PKG_PORTS_MSDOS */
/* #undef USE_PKG_PORTS_WINDOWS */
@@ -439,10 +439,10 @@
#define SPEECH_PARAMETERS ""
/* Define this to be a string containing the default screen driver code. */
-#define DEFAULT_SCREEN_DRIVER "lx"
+#define DEFAULT_SCREEN_DRIVER "sc"
/* Define this to be a string containing a list of the screen driver codes. */
-#define SCREEN_DRIVER_CODES "lx sc a2"
+#define SCREEN_DRIVER_CODES "sc a2"
/* Define this to be a string containing the default screen driver parameters. */
#define SCREEN_PARAMETERS ""
@@ -487,13 +487,13 @@
/* #undef HAVE_LEGACY_DEV_USB_USB_H */
/* Define this if the bluetooth library is available. */
-#define HAVE_LIBBLUETOOTH 1
+/* #undef HAVE_LIBBLUETOOTH */
/* Define this if HP-UX audio support is available. */
/* #undef HAVE_HPUX_AUDIO */
/* Define this if GPM is to be used. */
-#define HAVE_LIBGPM 1
+/* #undef HAVE_LIBGPM */
/* Define this if X is not available. */
/* #undef X_DISPLAY_MISSING */
Reply to: