diff -Nru tomoyo-tools-2.5.0-20140105/debian/changelog tomoyo-tools-2.5.0-20140105/debian/changelog
--- tomoyo-tools-2.5.0-20140105/debian/changelog	2014-01-12 06:31:53.000000000 +0000
+++ tomoyo-tools-2.5.0-20140105/debian/changelog	2014-03-18 12:31:02.000000000 +0000
@@ -1,3 +1,14 @@
+tomoyo-tools (2.5.0-20140105-2) unstable; urgency=medium
+
+  * move upstream pgp key to debian/upstream/signing-key.pgp 
+  * debian/tomoyo-post{inst,rm}
+    - fix "double entry of tomoyo for grub menu" (Closes: #717326)
+      Thanks to Osamu Aoki <osamu@debian.org> for the patch
+  * debian/source/lintian-overrides
+    - add it to avoid lintian false-positive error
+
+ -- Hideki Yamane <henrich@debian.org>  Sat, 15 Mar 2014 06:38:32 +0900
+
 tomoyo-tools (2.5.0-20140105-1) unstable; urgency=medium
 
   * Imported Upstream version 2.5.0-20140105
diff -Nru tomoyo-tools-2.5.0-20140105/debian/source/include-binaries tomoyo-tools-2.5.0-20140105/debian/source/include-binaries
--- tomoyo-tools-2.5.0-20140105/debian/source/include-binaries	2014-01-12 06:31:53.000000000 +0000
+++ tomoyo-tools-2.5.0-20140105/debian/source/include-binaries	2014-03-18 12:31:02.000000000 +0000
@@ -1 +1 @@
-debian/upstream-signing-key.pgp
+debian/upstream/signing-key.pgp
diff -Nru tomoyo-tools-2.5.0-20140105/debian/source/lintian-overrides tomoyo-tools-2.5.0-20140105/debian/source/lintian-overrides
--- tomoyo-tools-2.5.0-20140105/debian/source/lintian-overrides	1970-01-01 00:00:00.000000000 +0000
+++ tomoyo-tools-2.5.0-20140105/debian/source/lintian-overrides	2014-03-18 12:31:02.000000000 +0000
@@ -0,0 +1 @@
+tomoyo-tools source: debian-watch-file-pubkey-file-is-missing
diff -Nru tomoyo-tools-2.5.0-20140105/debian/tomoyo-tools.postinst tomoyo-tools-2.5.0-20140105/debian/tomoyo-tools.postinst
--- tomoyo-tools-2.5.0-20140105/debian/tomoyo-tools.postinst	2014-01-12 06:31:53.000000000 +0000
+++ tomoyo-tools-2.5.0-20140105/debian/tomoyo-tools.postinst	2014-03-18 12:31:02.000000000 +0000
@@ -30,14 +30,14 @@
 
         if [ -f $GRUBCONF ] && [ -x /usr/sbin/update-grub ]; then
             if [ $RET = true ]; then
-		if [ `grep "^GRUB_CMDLINE_LINUX=" $GRUBCONF` -a ! `grep "^GRUB_CMDLINE_LINUX=\"*security*\"" $GRUBCONF` ]; then
+		if [ `grep "^GRUB_CMDLINE_LINUX=" $GRUBCONF` -a ! `grep "^GRUB_CMDLINE_LINUX=\".*$FLAG.*\"" $GRUBCONF` ]; then
                     sed -e /^GRUB_CMDLINE_LINUX=\"/s/\"$/\ $FLAG\"/ -i $GRUBCONF && update-grub
 		fi
             elif [ $RET = false ]; then
-                sed -e /^GRUB_CMDLINE_LINUX/s/$FLAG// -i $GRUBCONF && update-grub
+                sed -e /^GRUB_CMDLINE_LINUX/s/$FLAG//g -i $GRUBCONF && update-grub
             fi
 	 else
-		 echo "no grub settings (it may have other bootloader, quit...)"
+		echo "no grub settings (it may have other bootloader, quit...)"
          fi
     ;;
 
diff -Nru tomoyo-tools-2.5.0-20140105/debian/tomoyo-tools.postrm tomoyo-tools-2.5.0-20140105/debian/tomoyo-tools.postrm
--- tomoyo-tools-2.5.0-20140105/debian/tomoyo-tools.postrm	2014-01-12 06:31:53.000000000 +0000
+++ tomoyo-tools-2.5.0-20140105/debian/tomoyo-tools.postrm	2014-03-18 12:31:02.000000000 +0000
@@ -4,6 +4,8 @@
 
 CONFDIR="/etc/tomoyo"
 CONFFILES="domain_policy.conf exception_policy.conf manager.conf profile.conf meminfo.conf stat.conf"
+GRUBCONF="/etc/default/grub"
+FLAG="security=tomoyo"
 
 case "$1" in
     upgrade|failed-upgrade|abort-install|abort-upgrade|disappear)
@@ -11,8 +13,7 @@
 
     remove)
     if [ -f /etc/default/grub ] && [ -x /usr/sbin/update-grub ]; then
-      sed -e s/GRUB_CMDLINE_LINUX=\"security=tomoyo\"/GRUB_CMDLINE_LINUX=\"\"/ \
-	  -i /etc/default/grub && update-grub
+      sed -e /^GRUB_CMDLINE_LINUX/s/$FLAG//g -i $GRUBCONF && update-grub
     fi
     ;;
 
@@ -28,8 +29,7 @@
     fi
 
     if [ -f /etc/default/grub ] && [ -x /usr/sbin/update-grub ]; then
-      sed -e s/GRUB_CMDLINE_LINUX=\"security=tomoyo\"/GRUB_CMDLINE_LINUX=\"\"/ \
-	  -i /etc/default/grub && update-grub
+      sed -e /^GRUB_CMDLINE_LINUX/s/$FLAG//g -i $GRUBCONF && update-grub
     fi
     ;;
 
Binary files /tmp/eGWQXCSokt/tomoyo-tools-2.5.0-20140105/debian/upstream/signing-key.pgp and /tmp/uwGXcSQtNO/tomoyo-tools-2.5.0-20140105/debian/upstream/signing-key.pgp differ
Binary files /tmp/eGWQXCSokt/tomoyo-tools-2.5.0-20140105/debian/upstream-signing-key.pgp and /tmp/uwGXcSQtNO/tomoyo-tools-2.5.0-20140105/debian/upstream-signing-key.pgp differ