diff -u libraw1394-2.0.2/debian/README.Debian libraw1394-2.0.2/debian/README.Debian
--- libraw1394-2.0.2/debian/README.Debian
+++ libraw1394-2.0.2/debian/README.Debian
@@ -21,13 +21,13 @@
 This restrictive setting was chosen since raw1394 allows almost full
 access to the FireWire bus and all connected devices are accessible, which
-may include hard disks.
-You can add your user in the "disk" group with this command (executed as the root user):
-        adduser <user> disk
+may include hard disks. You can add your user in the "disk" group with this 
+command:
+      sudo adduser <user> disk
 
 If you don't intend to connect sensitive devices and e.g. only want to get
 video streams out of a camera, you can relax the permissions.  If you
 don't have malicious users on your system, you can allow access for all
-users with this command (executed as the root user):
-     chmod 666 /dev/raw1394
+users with this command:
+      sudo chmod 666 /dev/raw1394
 
  -- Ludovic RESLINGER <lr@cuivres.net>, Sun, 10 Sep 2006 16:08:19 +0200
diff -u libraw1394-2.0.2/debian/changelog libraw1394-2.0.2/debian/changelog
--- libraw1394-2.0.2/debian/changelog
+++ libraw1394-2.0.2/debian/changelog
@@ -1,3 +1,12 @@
+libraw1394 (2.0.2-2ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable (LP: #311804), remaining changes:
+    - debian/README.Debian: Corrected file to use sudo instead of running
+      as root (LP: #183813)
+    - debian/control: Set Ubuntu maintainer address.
+
+ -- Артём Попов <artfwo@gmail.com>  Mon, 04 May 2009 10:12:18 +0700
+
 libraw1394 (2.0.2-2) unstable; urgency=low
 
   * Upload to unstable.
@@ -11,6 +20,13 @@
 
  -- Guus Sliepen <guus@debian.org>  Sun, 20 Jul 2008 19:52:07 +0200
 
+libraw1394 (1.3.0-4ubuntu1) jaunty; urgency=low
+
+  * debian/README.Debian: Corrected file to use sudo instead of running as 
+    root (LP: #183813)
+
+ -- Michael W. Koehler <irish2010@gmail.com>  Thu, 07 Feb 2008 16:22:50 -0500
+
 libraw1394 (1.3.0-4) unstable; urgency=low
 
   * Drop dependency on makedev and use /dev/MAKEDEV if available.
diff -u libraw1394-2.0.2/debian/control libraw1394-2.0.2/debian/control
--- libraw1394-2.0.2/debian/control
+++ libraw1394-2.0.2/debian/control
@@ -1,6 +1,7 @@
 Source: libraw1394
 Priority: optional
-Maintainer: Guus Sliepen <guus@debian.org>
+Maintainer: Ubuntu Core Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Guus Sliepen <guus@debian.org>
 Build-Depends: debhelper (>= 4), autotools-dev, docbook-utils
 Standards-Version: 3.8.0
 Section: libs