aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorIain Lane <iain.lane@canonical.com>2013-02-22 15:07:42 +0000
committerTarmac <Unknown>2013-02-22 15:07:42 +0000
commit3a73f298773320d247ece1737e7af50c0b4ecd58 (patch)
treedc2ee1dfb8400f6db40dea2c3d422f2158a2a992
parent150610dc58dce0e4a7461d30e62775ebd2728b8f (diff)
parent319a606200ce59a9b86372ef40e0015b09d47a07 (diff)
downloadlibayatana-indicator-3a73f298773320d247ece1737e7af50c0b4ecd58.tar.gz
libayatana-indicator-3a73f298773320d247ece1737e7af50c0b4ecd58.tar.bz2
libayatana-indicator-3a73f298773320d247ece1737e7af50c0b4ecd58.zip
Install the gtk2 library into the multiarch directory. Fixes: https://bugs.launchpad.net/bugs/1131708.
Approved by PS Jenkins bot, Mathieu Trudel-Lapierre.
-rw-r--r--debian/libindicator7.install2
-rwxr-xr-xdebian/rules4
2 files changed, 4 insertions, 2 deletions
diff --git a/debian/libindicator7.install b/debian/libindicator7.install
index 4e561b8..473cb9d 100644
--- a/debian/libindicator7.install
+++ b/debian/libindicator7.install
@@ -1 +1 @@
-usr/lib/*/libindicator.so.* /usr/lib/
+usr/lib/*/libindicator.so.*
diff --git a/debian/rules b/debian/rules
index ec764bb..b73bf84 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,6 +2,8 @@
FLAVORS = gtk2 gtk3
+COMMON_CONFIGURE_FLAGS = --disable-silent-rules
+
CONFIGURE_FLAGS_gtk2 = --with-gtk=2
CONFIGURE_FLAGS_gtk3 = --with-gtk=3
@@ -19,7 +21,7 @@ override_dh_autoreconf:
override_dh_auto_configure: $(FLAVORS:%=doconfigure-%)
doconfigure-%:
- DH_VERBOSE=1 dh_auto_configure --builddirectory=builddir/$* -- $(CONFIGURE_FLAGS_$*)
+ DH_VERBOSE=1 dh_auto_configure --builddirectory=builddir/$* -- $(COMMON_CONFIGURE_FLAGS) $(CONFIGURE_FLAGS_$*)
override_dh_auto_build: $(FLAVORS:%=dobuild-%)