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/changelog brltty-3.7.2/debian/changelog
--- brltty-3.7.2/debian/changelog
+++ brltty-3.7.2/debian/changelog
@@ -1,3 +1,10 @@
+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.
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