diff -u aide-0.15.1/debian/control aide-0.15.1/debian/control
--- aide-0.15.1/debian/control
+++ aide-0.15.1/debian/control
@@ -1,7 +1,8 @@
 Source: aide
 Section: admin
 Priority: optional
-Maintainer: Aide Maintainers <pkg-aide-maintainers@lists.alioth.debian.org>
+Maintainer: Ubuntu Developers <ubuntu-devel-discuss@lists.ubuntu.com>
+XSBC-Original-Maintainer: Aide Maintainers <pkg-aide-maintainers@lists.alioth.debian.org>
 Uploaders: Marc Haber <mh+debian-packages@zugschlus.de>, Mike Markley <mike@markley.org>, Hannes von Haugwitz <hannes@vonhaugwitz.com>
 DM-Upload-Allowed: yes
 Build-Depends: debhelper (>= 5), dpatch, debconf-utils, zlib1g-dev, libmhash-dev (>= 0.9.7), flex (>= 2.5.32) | flex-old, bison, libgcrypt-dev, po-debconf (>= 0.5.0), libselinux1-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], libattr1-dev, libacl1-dev, e2fslibs-dev
diff -u aide-0.15.1/debian/changelog aide-0.15.1/debian/changelog
--- aide-0.15.1/debian/changelog
+++ aide-0.15.1/debian/changelog
@@ -1,3 +1,11 @@
+aide (0.15.1-2ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: (LP: #694146)
+    - debian/aide.conf.d/70_aide_dev: escape another special character in
+      filenames. (Closes: #599930)
+
+ -- Artur Rona <ari-tczew@ubuntu.com>  Fri, 24 Dec 2010 18:11:25 +0100
+
 aide (0.15.1-2) unstable; urgency=low
 
   * debian/po/da.po:
@@ -6,6 +14,14 @@
 
  -- Hannes von Haugwitz <hannes@vonhaugwitz.com>  Mon, 18 Oct 2010 09:24:53 +0200
 
+aide (0.15.1-1ubuntu1) natty; urgency=low
+
+  * Merge with Debian unstable; remaining Ubuntu changes:
+    - debian/aide.conf.d/70_aide_dev: escape another special character in
+      filenames. (LP #456710)
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Tue, 12 Oct 2010 16:10:31 +0200
+
 aide (0.15.1-1) unstable; urgency=low
 
   * new upstream version, changes include:
@@ -82,6 +98,22 @@
 
  -- Hannes von Haugwitz <hannes@vonhaugwitz.com>  Thu, 29 Jul 2010 08:38:20 +0200
 
+aide (0.14.2-1ubuntu2) maverick; urgency=low
+
+  * No-change upload to get an armel build record.
+
+ -- Martin Pitt <martin.pitt@ubuntu.com>  Wed, 04 Aug 2010 17:14:25 +0200
+
+aide (0.14.2-1ubuntu1) maverick; urgency=low
+
+  * Merge from debian unstable, remaining changes:
+    - Fix 31_aide_apt to remove comments from source.list (LP: #112242)
+    - debian/control: change maintainer field.
+    - debian/aide.conf.d/70_aide_dev: escape another special character in
+      filenames. (LP: #456710)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Mon, 14 Jun 2010 15:44:03 -0400
+
 aide (0.14.2-1) unstable; urgency=low
 
   * new upstream version
@@ -305,6 +337,25 @@
 
  -- Marc Haber <mh+debian-packages@zugschlus.de>  Sun, 28 Feb 2010 17:20:43 +0100
 
+aide (0.13.1-11ubuntu2) lucid; urgency=low
+
+  * debian/aide.conf.d/70_aide_dev: escape another special character in
+    filenames. (LP: #456710)
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Mon, 14 Dec 2009 00:25:56 -0500
+
+aide (0.13.1-11ubuntu1) lucid; urgency=low
+
+  * Merge from debian testing, remaining changes:
+    - Create TMPBASE directory if it doesn't exist. (LP: #144730)
+    - Fix 31_aide_apt to remove comments from source.list (LP: #112242)
+    - debian/control: change maintainer field.
+    - debian/{cron.daily,default}/aide: add new FILTERUPDATES option that
+      removes files changed by system updates from the daily e-mail report.
+    - debian/cron.daily/aide: sort and remove duplicate package names
+
+ -- Chuck Short <zulcss@ubuntu.com>  Fri, 06 Nov 2009 00:28:10 +0000
+
 aide (0.13.1-11) unstable; urgency=low
 
   * Fix ] typo in 31_aide_amanda-server. Closes: #476502
@@ -365,6 +416,33 @@
 
  -- Marc Haber <mh+debian-packages@zugschlus.de>  Tue, 08 Sep 2009 14:45:51 +0200
 
+aide (0.13.1-10ubuntu5) karmic; urgency=low
+
+  * debian/cron.daily/aide: sort and remove duplicate package names
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Tue, 25 Aug 2009 08:21:19 -0400
+
+aide (0.13.1-10ubuntu4) karmic; urgency=low
+
+  * debian/{cron.daily,default}/aide: add new FILTERUPDATES option that
+    removes files changed by system updates from the daily e-mail report.
+
+ -- Marc Deslauriers <marc.deslauriers@ubuntu.com>  Thu, 18 Jun 2009 15:41:59 -0400
+
+aide (0.13.1-10ubuntu2) jaunty; urgency=low
+
+  [ Jean-Baptiste Lallement ]
+  *  Fix 31_aide_apt to remove comments from source.list (LP: #112242)
+  *  debian/control: change Maintainer field
+
+ -- Jean-Baptiste Lallement <jeanbaptiste.lallement@gmail.com>  Wed, 26 Nov 2008 19:52:15 +0000
+
+aide (0.13.1-10ubuntu1) intrepid; urgency=low
+
+  * Create TMPBASE directory if it doesn't exists (LP: #144730)
+
+ -- Jean-Baptiste Lallement <jeanbaptiste.lallement@gmail.com>  Sat, 19 Jul 2008 23:00:57 +0200
+
 aide (0.13.1-10) unstable; urgency=low
 
   * debian/control: fix deprecated "<" in Conflicts
diff -u aide-0.15.1/debian/aide.conf.d/70_aide_dev aide-0.15.1/debian/aide.conf.d/70_aide_dev
--- aide-0.15.1/debian/aide.conf.d/70_aide_dev
+++ aide-0.15.1/debian/aide.conf.d/70_aide_dev
@@ -18,7 +18,7 @@
   find /dev -path /dev/.static -prune -o -print | \
      sed -e 's/^\(.*\)/\1$ RamdiskData/'   \
          -e 's,\\,\\\\,g' -e 's,\.,\\\.,g' \
-         -e 's,#,\\#,g'
+         -e 's,#,\\#,g' -e 's,®,\.,g'
   echo "/dev/\.static$ RamdiskData"
 else
   # we have static /dev