Merge lp:~l3on/ubuntu/natty/ntfs-config/fix-629246 into lp:ubuntu/natty/ntfs-config

[Leo Iannacone]

Imported some changes from version 1.0.1-10.

These changes fix the bug linked.

[Colin Watson (cjwatson)]

Looks good to me, thanks.

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2010-07-30 23:24:29 +0000
+++ debian/changelog	2012-01-26 20:39:25 +0000
@@ -1,3 +1,13 @@
+ntfs-config (1.0.1-9ubuntu0.11.04.1) natty-proposed; urgency=low
+
+  * Drop build-depends on libhal-dev and libhal-storage-dev, as they are
+    not needed
+  * Ship emtpy directory /etc/hal/fdi/policy; ntfs-config tries to add
+    config files there, if available (but also works, if hal is not used)
+    (LP: #629246)
+
+ -- Leo Iannacone <[e-mail]>  Thu, 26 Jan 2012 21:04:39 +0100
+
 ntfs-config (1.0.1-9) unstable; urgency=low
 
   * fix license in copyright

=== modified file 'debian/control'
--- debian/control	2010-07-30 23:24:29 +0000
+++ debian/control	2012-01-26 20:39:25 +0000
@@ -1,10 +1,10 @@
 Source: ntfs-config
 Section: admin
 Priority: optional
-Maintainer: Ivan Borzenkov <[e-mail]>
+Maintainer: Ubuntu Developers <[e-mail]>
+XSBC-Original-Maintainer: Ivan Borzenkov <[e-mail]>
 Build-Depends: debhelper (>= 7.0.50), autotools-dev, cdbs, python-gtk2-dev,
                libgtk2.0-dev (>= 2.6), libglade2-dev, python-support,
-               libhal-dev (>= 0.5.2), libhal-storage-dev (>= 0.5.2),
                libxml-parser-perl, autoconf, python-dev
 Standards-Version: 3.9.1
 XB-Python-Version: ${python:Versions}

=== modified file 'debian/dirs'
--- debian/dirs	2007-02-19 19:52:43 +0000
+++ debian/dirs	2012-01-26 20:39:25 +0000
@@ -1,1 +1,2 @@
 usr/bin
+etc/hal/fdi/policy