diff -u brltty-3.7.2/debian/changelog brltty-3.7.2/debian/changelog
--- brltty-3.7.2/debian/changelog
+++ brltty-3.7.2/debian/changelog
@@ -1,3 +1,14 @@
+brltty (3.7.2-3.1ubuntu1) edgy; urgency=low
+
+  * Merge from debian unstable.
+  * Move /lib/libbrlapi.so symbolic link from libbrlapi1-dev to
+    libbrlapi1 to make sure that gnome-orca can work with braille
+    support.
+  * Commented out the include for linux/compiler.h in 
+    Programs/usb_linux.c.
+
+ -- Luke Yelavich <themuso@ubuntu.com>  Wed, 16 Aug 2006 22:57:14 +1000
+
 brltty (3.7.2-3.1) unstable; urgency=low
 
   * Non-maintainer upload.
@@ -8,6 +19,13 @@
 
  -- Alexander Schmehl <tolimar@debian.org>  Thu, 27 Jul 2006 13:54:51 +0200
 
+brltty (3.7.2-3ubuntu1) edgy; urgency=low
+
+  * Resynchronized with Debian, only Ubuntu changes are:
+    - debian/brltty.init: not enabled by default.
+
+ -- Daniel Holbach <daniel.holbach@ubuntu.com>  Fri,  7 Jul 2006 16:02:42 +0200
+
 brltty (3.7.2-3) unstable; urgency=low
 
   * Add libbluetooth1-dev to Build-Depends.
@@ -331,0 +350 @@
+
diff -u brltty-3.7.2/debian/brltty.init brltty-3.7.2/debian/brltty.init
--- brltty-3.7.2/debian/brltty.init
+++ brltty-3.7.2/debian/brltty.init
@@ -8,6 +8,9 @@
 
 test -f $DAEMON || exit 0
 
+# Comment the following line to enable brltty.
+exit 0
+
 set -e
 
 case "$1" in
diff -u brltty-3.7.2/debian/libbrlapi1-dev.install brltty-3.7.2/debian/libbrlapi1-dev.install
--- brltty-3.7.2/debian/libbrlapi1-dev.install
+++ brltty-3.7.2/debian/libbrlapi1-dev.install
@@ -1,3 +1,2 @@
 debian/brltty/lib/*.a lib
-debian/brltty/lib/*.so /lib
 debian/brltty/usr/include/brltty usr/include
diff -u brltty-3.7.2/debian/libbrlapi1.install brltty-3.7.2/debian/libbrlapi1.install
--- brltty-3.7.2/debian/libbrlapi1.install
+++ brltty-3.7.2/debian/libbrlapi1.install
@@ -1,2 +1,3 @@
 debian/brltty/lib/lib*.so.* lib
+debian/brltty/lib/*.so /lib
 debian/brltty/sbin/xbrlapi bin
diff -u brltty-3.7.2/debian/control brltty-3.7.2/debian/control
--- brltty-3.7.2/debian/control
+++ brltty-3.7.2/debian/control
@@ -40,6 +40,7 @@
 Architecture: any
 Section: libs
 Depends: ${shlibs:Depends}, ${misc:Depends}
+Conflicts: libbrlapi, libbrlapi1-dev (<< 3.7.2-3)
 Description: braille display access via BRLTTY - shared library
  This package contains the shared library necessary to run programs which
  need to communicate with a refreshable braille display.
@@ -48,6 +49,7 @@
 Architecture: any
 Section: libdevel
 Depends: libbrlapi1 (>= ${Source-Version}), libc6-dev
+Conflicts: libbrlapi-dev
 Description: Library for communication with BRLTTY - static libs and headers
  This package contains the static library libbrlapi.a and header files
  in /usr/include/brltty/ necessary to compile programs for BrlAPI, a
diff -u brltty-3.7.2/Programs/usb_linux.c brltty-3.7.2/Programs/usb_linux.c
--- brltty-3.7.2/Programs/usb_linux.c
+++ brltty-3.7.2/Programs/usb_linux.c
@@ -30,7 +30,7 @@
 #include <sys/stat.h>
 #include <sys/vfs.h>
 #include <sys/ioctl.h>
-#include <linux/compiler.h>
+/* #include <linux/compiler.h> */
 #include <linux/usbdevice_fs.h>
 
 #ifndef USBDEVFS_DISCONNECT