Merge lp:~mitya57/indicator-appmenu/fix-dbusmenu-dumper into lp:indicator-appmenu/15.04

[Dmitry Shachnev]

Look for dbusmenu-dumper in correct location

Quite an old change, which I forgot to propose for merging that time.

Look for dbusmenu-dumper in correct location (/usr/lib/$(DEB_HOST_MULTIARCH)/ instead of /usr/lib/).

[Ted Gould (ted)]

review: Approve

=== modified file 'debian/control'
--- debian/control	2014-03-21 10:23:09 +0000
+++ debian/control	2014-12-10 09:16:00 +0000
@@ -44,8 +44,7 @@
 Depends: ${shlibs:Depends},
          ${misc:Depends},
          indicator-appmenu (= ${binary:Version}),
-         libdbusmenu-tools,
+         libdbusmenu-tools (>= 12.10.3daily13.02.01),
 Description: Tools for debuging application menus.
  .
  This package provides tools for supporting application menus.
-

=== modified file 'tools/current-menu-dump.in'
--- tools/current-menu-dump.in	2012-02-03 05:51:58 +0000
+++ tools/current-menu-dump.in	2014-12-10 09:16:00 +0000
@@ -2,11 +2,7 @@
 
 TMPFILE=`mktemp`
 CURMENU="@LIBEXECDIR@/current-menu"
-if [ -x /usr/lib/libdbusmenu/dbusmenu-dumper ]; then
-  DBUSDUMP="/usr/lib/libdbusmenu/dbusmenu-dumper"
-else
-  DBUSDUMP="/usr/lib/dbusmenu-dumper"
-fi
+DBUSDUMP="@LIBEXECDIR@/dbusmenu-dumper"
 
 $CURMENU > $TMPFILE