diff -Nru libraw1394-2.0.5/debian/changelog libraw1394-2.0.5/debian/changelog
--- libraw1394-2.0.5/debian/changelog	2010-06-23 17:11:46.000000000 +0530
+++ libraw1394-2.0.5/debian/changelog	2010-06-26 10:00:00.000000000 +0530
@@ -1,3 +1,11 @@
+libraw1394 (2.0.5-2ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: LP: #599089
+    - debian/README.Debian: Corrected file to use sudo instead of running
+      as root
+
+ -- Bhavani Shankar <bhavi@ubuntu.com>  Sat, 26 Jun 2010 09:58:51 +0530
+
 libraw1394 (2.0.5-2) unstable; urgency=low
 
   * Build-depend on docbook-xml. Closes: #569448
@@ -5,6 +13,20 @@
 
  -- Guus Sliepen <guus@debian.org>  Wed, 23 Jun 2010 13:41:36 +0200
 
+libraw1394 (2.0.5-1ubuntu2) maverick; urgency=low
+
+  * Add explicit docbook-xml build dependency to fix FTBFS (LP: #591528).
+
+ -- Артём Попов <artfwo@gmail.com>  Wed, 09 Jun 2010 08:35:48 +0700
+
+libraw1394 (2.0.5-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian testing (LP: #586918), remaining changes:
+    - debian/README.Debian: Corrected file to use sudo instead of running
+      as root
+
+ -- Артём Попов <artfwo@gmail.com>  Sat, 29 May 2010 00:36:42 +0700
+
 libraw1394 (2.0.5-1) unstable; urgency=low
 
   * New upstream release. Closes: #564416
@@ -16,6 +38,21 @@
 
  -- Guus Sliepen <guus@debian.org>  Sat, 09 Jan 2010 22:42:18 +0100
 
+libraw1394 (2.0.4-1ubuntu2) lucid; urgency=low
+
+  * rebuild rest of main for armel armv7/thumb2 optimization;
+    UbuntuSpec:mobile-lucid-arm-gcc-v7-thumb2
+
+ -- Alexander Sack <asac@ubuntu.com>  Sat, 06 Mar 2010 13:36:42 +0100
+
+libraw1394 (2.0.4-1ubuntu1) karmic; urgency=low
+
+  * Merge from debian unstable, remaining changes: LP: #404802
+    - debian/README.Debian: Corrected file to use sudo instead of running
+      as root
+
+ -- Bhavani Shankar <right2bhavi@gmail.com>  Sun, 26 Jul 2009 13:37:53 +0530
+
 libraw1394 (2.0.4-1) unstable; urgency=low
 
   * New upstream release. Closes: #535826
@@ -24,6 +61,14 @@
 
  -- Guus Sliepen <guus@debian.org>  Sat, 25 Jul 2009 17:16:11 +0200
 
+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
+
+ -- Артём Попов <artfwo@gmail.com>  Mon, 04 May 2009 10:12:18 +0700
+
 libraw1394 (2.0.2-2) unstable; urgency=low
 
   * Upload to unstable.
@@ -37,6 +82,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 -Nru libraw1394-2.0.5/debian/control libraw1394-2.0.5/debian/control
--- libraw1394-2.0.5/debian/control	2010-06-23 17:11:34.000000000 +0530
+++ libraw1394-2.0.5/debian/control	2010-06-26 09:58:46.000000000 +0530
@@ -1,6 +1,7 @@
 Source: libraw1394
 Priority: optional
-Maintainer: Guus Sliepen <guus@debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Guus Sliepen <guus@debian.org>
 Build-Depends: debhelper (>= 7), autotools-dev, docbook-utils, docbook-xml
 Standards-Version: 3.8.4
 Section: libs
diff -Nru libraw1394-2.0.5/debian/README.Debian libraw1394-2.0.5/debian/README.Debian
--- libraw1394-2.0.5/debian/README.Debian	2009-07-25 20:09:58.000000000 +0530
+++ libraw1394-2.0.5/debian/README.Debian	2010-06-25 06:04:51.000000000 +0530
@@ -20,14 +20,14 @@
 The default access permissions allows only users in the "disk" group.
 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