Merge lp:~nobuto/ubuntu/raring/ecryptfs-utils/fix-empty-window into lp:ubuntu/raring/ecryptfs-utils

[Nobuto Murata]

The hook in debian/rules was added at 101-0ubuntu2 as a part of making an update-notifier window translatable.
 http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/raring/ecryptfs-utils/raring/revision/88#debian/rules

But it was removed at 102-0ubuntu1 accidentally on merge, I think.
http://bazaar.launchpad.net/~ubuntu-branches/ubuntu/raring/ecryptfs-utils/raring/revision/90#debian/rules

This branch re-adds the part to fix an empty update-notifier window.

[Nobuto Murata (nobuto)]

Why we have to remove translations markers after pot created is explained here:
 https://wiki.ubuntu.com/InteractiveUpgradeHooks

[Marc Deslauriers (mdeslaur)]

Looks good. ACK. Uploaded, thanks.

Could you please propose this for merging upstream also, so it doesn't get lost?:

https://code.launchpad.net/~ecryptfs/ecryptfs/trunk

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2013-01-25 12:58:56 +0000
+++ debian/changelog	2013-02-20 05:25:22 +0000
@@ -1,3 +1,10 @@
+ecryptfs-utils (103-0ubuntu2) UNRELEASED; urgency=low
+
+  * fix an empty update-notifier window (LP: #1107650)
+    - needed part was dropped accidentally at 102-0ubuntu1
+
+ -- Nobuto MURATA <[e-mail]>  Wed, 20 Feb 2013 14:05:42 +0900
+
 ecryptfs-utils (103-0ubuntu1) raring; urgency=low
 
   [ Tyler Hicks ]

=== modified file 'debian/rules'
--- debian/rules	2013-01-25 12:58:56 +0000
+++ debian/rules	2013-02-20 05:25:22 +0000
@@ -39,6 +39,9 @@
 	chmod 4755 debian/ecryptfs-utils/sbin/mount.ecryptfs_private
 
 override_dh_install:
+	# Removing translation markers to work as an update-notifier hook
+	sed -i 's/^_//' debian/tmp/usr/share/ecryptfs-utils/ecryptfs-record-passphrase
+
 	dh_install --fail-missing --sourcedir=debian/tmp
 
 override_dh_python2: