summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGravatar Benjamin Barenblat <bbaren@mit.edu>2015-01-22 13:21:14 -0500
committerGravatar Benjamin Barenblat <bbaren@mit.edu>2015-01-22 13:21:14 -0500
commit8d5dc56a876009ead7c03fe6962483367bc22c93 (patch)
treec6e8fe2ff2c7ceb97068227c258058a6b36a0ebc
parentedb07d1113206fdea167f8083f7d01889e16cf03 (diff)
Don’t use asterisks in multiarch install files
Alex Chernyakhovsky <achernya@mit.edu> recommends using /usr/lib/${DEB_HOST_MULTIARCH}/whatever instead of /usr/lib/*/whatever to install multiarch-aware libraries. This seems pretty reasonable to me, so I’ve made the change.
-rw-r--r--debian/deadbeef-plugin-aac.install2
-rw-r--r--debian/deadbeef-plugin-alac.install2
-rw-r--r--debian/deadbeef-plugin-alsa.install2
-rw-r--r--debian/deadbeef-plugin-artwork.install2
-rw-r--r--debian/deadbeef-plugin-cdda.install2
-rw-r--r--debian/deadbeef-plugin-converter-core.install2
-rw-r--r--debian/deadbeef-plugin-converter-gtk2.install2
-rw-r--r--debian/deadbeef-plugin-converter-gtk3.install2
-rw-r--r--debian/deadbeef-plugin-curl.install2
-rw-r--r--debian/deadbeef-plugin-flac.install2
-rw-r--r--debian/deadbeef-plugin-gui-gtk2.install2
-rw-r--r--debian/deadbeef-plugin-gui-gtk3.install2
-rw-r--r--debian/deadbeef-plugin-hotkeys.install2
-rw-r--r--debian/deadbeef-plugin-lastfm.install2
-rw-r--r--debian/deadbeef-plugin-libavcodec.install2
-rw-r--r--debian/deadbeef-plugin-m3u.install2
-rw-r--r--debian/deadbeef-plugin-mono2stereo.install2
-rw-r--r--debian/deadbeef-plugin-mp3.install2
-rw-r--r--debian/deadbeef-plugin-notify.install2
-rw-r--r--debian/deadbeef-plugin-nullout.install2
-rw-r--r--debian/deadbeef-plugin-oss.install2
-rw-r--r--debian/deadbeef-plugin-pltbrowser-gtk2.install2
-rw-r--r--debian/deadbeef-plugin-pltbrowser-gtk3.install2
-rw-r--r--debian/deadbeef-plugin-pulse.install2
-rw-r--r--debian/deadbeef-plugin-resampler.install2
-rw-r--r--debian/deadbeef-plugin-shellexec-core.install2
-rw-r--r--debian/deadbeef-plugin-shellexec-gtk2.install2
-rw-r--r--debian/deadbeef-plugin-shellexec-gtk3.install2
-rw-r--r--debian/deadbeef-plugin-sndfile.install2
-rw-r--r--debian/deadbeef-plugin-supereq.install2
-rw-r--r--debian/deadbeef-plugin-tta.install2
-rw-r--r--debian/deadbeef-plugin-vorbis.install2
-rw-r--r--debian/deadbeef-plugin-vtx.install2
-rw-r--r--debian/deadbeef-plugin-wavpack.install2
34 files changed, 34 insertions, 34 deletions
diff --git a/debian/deadbeef-plugin-aac.install b/debian/deadbeef-plugin-aac.install
index 87c58878..dcfaaf79 100644
--- a/debian/deadbeef-plugin-aac.install
+++ b/debian/deadbeef-plugin-aac.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/aac.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/aac.so
diff --git a/debian/deadbeef-plugin-alac.install b/debian/deadbeef-plugin-alac.install
index 4b9c3c5a..12053b52 100644
--- a/debian/deadbeef-plugin-alac.install
+++ b/debian/deadbeef-plugin-alac.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/alac.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/alac.so
diff --git a/debian/deadbeef-plugin-alsa.install b/debian/deadbeef-plugin-alsa.install
index 51276585..e88dbca5 100644
--- a/debian/deadbeef-plugin-alsa.install
+++ b/debian/deadbeef-plugin-alsa.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/alsa.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/alsa.so
diff --git a/debian/deadbeef-plugin-artwork.install b/debian/deadbeef-plugin-artwork.install
index 0ada635a..86c64052 100644
--- a/debian/deadbeef-plugin-artwork.install
+++ b/debian/deadbeef-plugin-artwork.install
@@ -1,2 +1,2 @@
-usr/lib/*/deadbeef/artwork.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/artwork.so
usr/share/deadbeef/pixmaps/noartwork.png
diff --git a/debian/deadbeef-plugin-cdda.install b/debian/deadbeef-plugin-cdda.install
index 5d564759..5dcddf65 100644
--- a/debian/deadbeef-plugin-cdda.install
+++ b/debian/deadbeef-plugin-cdda.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/cdda.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/cdda.so
diff --git a/debian/deadbeef-plugin-converter-core.install b/debian/deadbeef-plugin-converter-core.install
index efaf0b54..2fa12874 100644
--- a/debian/deadbeef-plugin-converter-core.install
+++ b/debian/deadbeef-plugin-converter-core.install
@@ -1,2 +1,2 @@
-usr/lib/*/deadbeef/converter.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/converter.so
usr/share/deadbeef/convpresets
diff --git a/debian/deadbeef-plugin-converter-gtk2.install b/debian/deadbeef-plugin-converter-gtk2.install
index cb255895..a35fe809 100644
--- a/debian/deadbeef-plugin-converter-gtk2.install
+++ b/debian/deadbeef-plugin-converter-gtk2.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/converter_gtk2.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/converter_gtk2.so
diff --git a/debian/deadbeef-plugin-converter-gtk3.install b/debian/deadbeef-plugin-converter-gtk3.install
index b9813bbd..1baccdcc 100644
--- a/debian/deadbeef-plugin-converter-gtk3.install
+++ b/debian/deadbeef-plugin-converter-gtk3.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/converter_gtk3.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/converter_gtk3.so
diff --git a/debian/deadbeef-plugin-curl.install b/debian/deadbeef-plugin-curl.install
index 22f6842b..f7413cb4 100644
--- a/debian/deadbeef-plugin-curl.install
+++ b/debian/deadbeef-plugin-curl.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/vfs_curl.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/vfs_curl.so
diff --git a/debian/deadbeef-plugin-flac.install b/debian/deadbeef-plugin-flac.install
index 9c7ae88c..1a3e04cc 100644
--- a/debian/deadbeef-plugin-flac.install
+++ b/debian/deadbeef-plugin-flac.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/flac.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/flac.so
diff --git a/debian/deadbeef-plugin-gui-gtk2.install b/debian/deadbeef-plugin-gui-gtk2.install
index d7090ab9..17a8ec78 100644
--- a/debian/deadbeef-plugin-gui-gtk2.install
+++ b/debian/deadbeef-plugin-gui-gtk2.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/ddb_gui_GTK2.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/ddb_gui_GTK2.so
diff --git a/debian/deadbeef-plugin-gui-gtk3.install b/debian/deadbeef-plugin-gui-gtk3.install
index 987769c2..01b6237e 100644
--- a/debian/deadbeef-plugin-gui-gtk3.install
+++ b/debian/deadbeef-plugin-gui-gtk3.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/ddb_gui_GTK3.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/ddb_gui_GTK3.so
diff --git a/debian/deadbeef-plugin-hotkeys.install b/debian/deadbeef-plugin-hotkeys.install
index 75ac849a..04578c6e 100644
--- a/debian/deadbeef-plugin-hotkeys.install
+++ b/debian/deadbeef-plugin-hotkeys.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/hotkeys.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/hotkeys.so
diff --git a/debian/deadbeef-plugin-lastfm.install b/debian/deadbeef-plugin-lastfm.install
index 70a3ffd5..4b46b109 100644
--- a/debian/deadbeef-plugin-lastfm.install
+++ b/debian/deadbeef-plugin-lastfm.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/lastfm.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/lastfm.so
diff --git a/debian/deadbeef-plugin-libavcodec.install b/debian/deadbeef-plugin-libavcodec.install
index 4e4f4371..a3ba2b08 100644
--- a/debian/deadbeef-plugin-libavcodec.install
+++ b/debian/deadbeef-plugin-libavcodec.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/ffmpeg.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/ffmpeg.so
diff --git a/debian/deadbeef-plugin-m3u.install b/debian/deadbeef-plugin-m3u.install
index dbd36702..2cfe5b46 100644
--- a/debian/deadbeef-plugin-m3u.install
+++ b/debian/deadbeef-plugin-m3u.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/m3u.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/m3u.so
diff --git a/debian/deadbeef-plugin-mono2stereo.install b/debian/deadbeef-plugin-mono2stereo.install
index 576b0bf4..2a0f3ab0 100644
--- a/debian/deadbeef-plugin-mono2stereo.install
+++ b/debian/deadbeef-plugin-mono2stereo.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/ddb_mono2stereo.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/ddb_mono2stereo.so
diff --git a/debian/deadbeef-plugin-mp3.install b/debian/deadbeef-plugin-mp3.install
index dd19ef5c..e0c2465b 100644
--- a/debian/deadbeef-plugin-mp3.install
+++ b/debian/deadbeef-plugin-mp3.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/mpgmad.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/mpgmad.so
diff --git a/debian/deadbeef-plugin-notify.install b/debian/deadbeef-plugin-notify.install
index 4747f2f4..8a41f511 100644
--- a/debian/deadbeef-plugin-notify.install
+++ b/debian/deadbeef-plugin-notify.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/notify.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/notify.so
diff --git a/debian/deadbeef-plugin-nullout.install b/debian/deadbeef-plugin-nullout.install
index 19eb3c18..71e5418b 100644
--- a/debian/deadbeef-plugin-nullout.install
+++ b/debian/deadbeef-plugin-nullout.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/nullout.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/nullout.so
diff --git a/debian/deadbeef-plugin-oss.install b/debian/deadbeef-plugin-oss.install
index 60b14a99..1424b0d4 100644
--- a/debian/deadbeef-plugin-oss.install
+++ b/debian/deadbeef-plugin-oss.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/oss.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/oss.so
diff --git a/debian/deadbeef-plugin-pltbrowser-gtk2.install b/debian/deadbeef-plugin-pltbrowser-gtk2.install
index d660e4e0..0087ce54 100644
--- a/debian/deadbeef-plugin-pltbrowser-gtk2.install
+++ b/debian/deadbeef-plugin-pltbrowser-gtk2.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/pltbrowser_gtk2.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/pltbrowser_gtk2.so
diff --git a/debian/deadbeef-plugin-pltbrowser-gtk3.install b/debian/deadbeef-plugin-pltbrowser-gtk3.install
index 5c890495..a8021b19 100644
--- a/debian/deadbeef-plugin-pltbrowser-gtk3.install
+++ b/debian/deadbeef-plugin-pltbrowser-gtk3.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/pltbrowser_gtk3.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/pltbrowser_gtk3.so
diff --git a/debian/deadbeef-plugin-pulse.install b/debian/deadbeef-plugin-pulse.install
index 987ec455..2b02f7bb 100644
--- a/debian/deadbeef-plugin-pulse.install
+++ b/debian/deadbeef-plugin-pulse.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/pulse.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/pulse.so
diff --git a/debian/deadbeef-plugin-resampler.install b/debian/deadbeef-plugin-resampler.install
index 4d6a6f00..b2eef6da 100644
--- a/debian/deadbeef-plugin-resampler.install
+++ b/debian/deadbeef-plugin-resampler.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/dsp_libsrc.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/dsp_libsrc.so
diff --git a/debian/deadbeef-plugin-shellexec-core.install b/debian/deadbeef-plugin-shellexec-core.install
index 95389685..a221a7e3 100644
--- a/debian/deadbeef-plugin-shellexec-core.install
+++ b/debian/deadbeef-plugin-shellexec-core.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/shellexec.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/shellexec.so
diff --git a/debian/deadbeef-plugin-shellexec-gtk2.install b/debian/deadbeef-plugin-shellexec-gtk2.install
index 7a79a767..169bddba 100644
--- a/debian/deadbeef-plugin-shellexec-gtk2.install
+++ b/debian/deadbeef-plugin-shellexec-gtk2.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/shellexecui_gtk2.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/shellexecui_gtk2.so
diff --git a/debian/deadbeef-plugin-shellexec-gtk3.install b/debian/deadbeef-plugin-shellexec-gtk3.install
index b778573a..32aca5f3 100644
--- a/debian/deadbeef-plugin-shellexec-gtk3.install
+++ b/debian/deadbeef-plugin-shellexec-gtk3.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/shellexecui_gtk3.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/shellexecui_gtk3.so
diff --git a/debian/deadbeef-plugin-sndfile.install b/debian/deadbeef-plugin-sndfile.install
index 4b7f1ebf..582eb654 100644
--- a/debian/deadbeef-plugin-sndfile.install
+++ b/debian/deadbeef-plugin-sndfile.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/sndfile.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/sndfile.so
diff --git a/debian/deadbeef-plugin-supereq.install b/debian/deadbeef-plugin-supereq.install
index 3fdc1c99..9847c3dc 100644
--- a/debian/deadbeef-plugin-supereq.install
+++ b/debian/deadbeef-plugin-supereq.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/supereq.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/supereq.so
diff --git a/debian/deadbeef-plugin-tta.install b/debian/deadbeef-plugin-tta.install
index 6c5845b2..aefc4776 100644
--- a/debian/deadbeef-plugin-tta.install
+++ b/debian/deadbeef-plugin-tta.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/tta.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/tta.so
diff --git a/debian/deadbeef-plugin-vorbis.install b/debian/deadbeef-plugin-vorbis.install
index f0aa959c..1fce5be9 100644
--- a/debian/deadbeef-plugin-vorbis.install
+++ b/debian/deadbeef-plugin-vorbis.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/vorbis.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/vorbis.so
diff --git a/debian/deadbeef-plugin-vtx.install b/debian/deadbeef-plugin-vtx.install
index ba4d57fd..d2dbe946 100644
--- a/debian/deadbeef-plugin-vtx.install
+++ b/debian/deadbeef-plugin-vtx.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/vtx.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/vtx.so
diff --git a/debian/deadbeef-plugin-wavpack.install b/debian/deadbeef-plugin-wavpack.install
index cd514c04..0406b89a 100644
--- a/debian/deadbeef-plugin-wavpack.install
+++ b/debian/deadbeef-plugin-wavpack.install
@@ -1 +1 @@
-usr/lib/*/deadbeef/wavpack.so
+usr/lib/${DEB_HOST_MULTIARCH}/deadbeef/wavpack.so