Merge lp:~larsu/indicator-messages/arch-dependent-libdir into lp:~indicator-applet-developers/indicator-messages/trunk.13.10

[Lars Karlitski]

Install into /usr/lib/$arch, to be consistent with the other indicators

[Sebastien Bacher (seb128)]

thanks, I don't think the gir stack handles multiarch though (e.g that's likely to make the gir not work)...

review: Needs Fixing

[Sebastien Bacher (seb128)]

sorry, I didn't notice at first that the .install was installing those in /usr/lib ... seems good ;-)

review: Approve

[PS Jenkins bot (ps-jenkins)]

review: Approve (continuous-integration)

=== modified file 'data/Makefile.am'
--- data/Makefile.am	2013-08-20 10:38:10 +0000
+++ data/Makefile.am	2013-09-06 12:03:38 +0000
@@ -4,7 +4,7 @@
 dbus_services_DATA = indicator-messages.service
 
 %.service: %.service.in
-	sed -e "s|\@libexecdir\@|$(libexecdir)|" $< > $@
+	sed -e "s|\@pkglibexecdir\@|$(pkglibexecdir)|" $< > $@
 
 gsettings_SCHEMAS = com.canonical.indicator.messages.gschema.xml
 @GSETTINGS_RULES@

=== modified file 'data/indicator-messages.service.in'
--- data/indicator-messages.service.in	2011-01-27 23:00:31 +0000
+++ data/indicator-messages.service.in	2013-09-06 12:03:38 +0000
@@ -1,3 +1,3 @@
 [D-BUS Service]
 Name=com.canonical.indicator.messages
-Exec=@libexecdir@/indicator-messages-service
+Exec=@pkglibexecdir@/indicator-messages-service

=== modified file 'debian/gir1.2-messagingmenu-1.0.install'
--- debian/gir1.2-messagingmenu-1.0.install	2012-08-23 11:28:52 +0000
+++ debian/gir1.2-messagingmenu-1.0.install	2013-09-06 12:03:38 +0000
@@ -1,1 +1,1 @@
-usr/lib/girepository-1.0/*.typelib
+usr/lib/*/girepository-1.0 /usr/lib

=== modified file 'debian/indicator-messages.install'
--- debian/indicator-messages.install	2013-08-20 10:38:10 +0000
+++ debian/indicator-messages.install	2013-09-06 12:03:38 +0000
@@ -1,4 +1,4 @@
-usr/lib/indicator-messages/indicator-messages-service
+usr/lib/*/indicator-messages/indicator-messages-service
 usr/share/dbus-1
 usr/share/glib-2.0
 usr/share/icons

=== modified file 'debian/libmessaging-menu-dev.install'
--- debian/libmessaging-menu-dev.install	2013-08-20 10:38:10 +0000
+++ debian/libmessaging-menu-dev.install	2013-09-06 12:03:38 +0000
@@ -1,5 +1,5 @@
-usr/lib/libmessaging-menu.so 
-usr/lib/pkgconfig
+usr/lib/*/libmessaging-menu.so 
+usr/lib/*/pkgconfig
 usr/include /usr/
 usr/share/gir-1.0/
 usr/share/vala/

=== modified file 'debian/libmessaging-menu0.install'
--- debian/libmessaging-menu0.install	2012-08-23 11:28:52 +0000
+++ debian/libmessaging-menu0.install	2013-09-06 12:03:38 +0000
@@ -1,1 +1,1 @@
-usr/lib/libmessaging-menu.so.* /usr/lib/
+usr/lib/*/libmessaging-menu.so.*

=== modified file 'debian/rules'
--- debian/rules	2012-11-13 18:45:32 +0000
+++ debian/rules	2013-09-06 12:03:38 +0000
@@ -9,7 +9,7 @@
 	NO_CONFIGURE=1 dh_autoreconf ./autogen.sh
 
 override_dh_auto_configure:
-	dh_auto_configure -- --libdir="\$${prefix}/lib" --libexecdir="\$${prefix}/lib/indicator-messages" --enable-gtk-doc
+	dh_auto_configure -- --enable-gtk-doc
 
 override_dh_install:
 	find debian/tmp/usr/lib -name *.la -delete

=== modified file 'src/Makefile.am'
--- src/Makefile.am	2013-08-28 10:23:31 +0000
+++ src/Makefile.am	2013-09-06 12:03:38 +0000
@@ -1,7 +1,7 @@
 
 EXTRA_DIST =
 
-libexec_PROGRAMS = indicator-messages-service
+pkglibexec_PROGRAMS = indicator-messages-service
 
 indicator_messages_service_SOURCES = \
 	messages-service.c \