Noise

Merge lp:~tintou/noise/deb-packaging into lp:~elementary-os/noise/deb-packaging

  1. deb-packaging
  2. Merge into deb-packaging
Proposed by Corentin Noël
Status: Merged
Approved by: Rico Tzschichholz
Approved revision: 54
Merged at revision: 54
Proposed branch: lp:~tintou/noise/deb-packaging
Merge into: lp:~elementary-os/noise/deb-packaging
Diff against target: 55 lines (+8/-8)
4 files modified
debian/control (+2/-2)
debian/libnoise-core-dev.install (+3/-3)
debian/libnoise-core0.install (+1/-1)
debian/noise.install (+2/-2)
To merge this branch: bzr merge lp:~tintou/noise/deb-packaging
Reviewer Review Type Date Requested Status
Rico Tzschichholz Approve
Review via email: mp+209958@code.launchpad.net

Commit message

Adjust *.install for multiarch installation targets

Description of the change

Now using multiarch

To post a comment you must log in.
Revision history for this message
Rico Tzschichholz (ricotz) :
review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'debian/control'
2--- debian/control 2014-02-08 23:48:34 +0000
3+++ debian/control 2014-03-07 16:10:12 +0000
4@@ -23,7 +23,7 @@
5 libtagc0-dev (>= 1.6.3),
6 libxml2-dev (>= 2.7.7),
7 libzeitgeist-dev,
8- valac (>= 0.18)
9+ valac (>= 0.22)
10 Standards-Version: 3.9.5
11 Homepage: https://launchpad.net/noise
12
13@@ -109,4 +109,4 @@
14 find music similar to the currently playing song, simple UI, fast searching
15 for music, queue system, mass song editing and more...
16 .
17- This package contains the development files.
18+ This package contains the development files.
19\ No newline at end of file
20
21=== modified file 'debian/libnoise-core-dev.install'
22--- debian/libnoise-core-dev.install 2013-06-27 08:16:47 +0000
23+++ debian/libnoise-core-dev.install 2014-03-07 16:10:12 +0000
24@@ -1,4 +1,4 @@
25 usr/include/noise-core
26-usr/lib/lib*.so
27-usr/lib/pkgconfig
28-usr/share/vala/vapi
29+usr/lib/*/lib*.so
30+usr/lib/*/pkgconfig
31+usr/share/vala/vapi
32\ No newline at end of file
33
34=== modified file 'debian/libnoise-core0.install'
35--- debian/libnoise-core0.install 2013-06-27 08:16:47 +0000
36+++ debian/libnoise-core0.install 2014-03-07 16:10:12 +0000
37@@ -1,1 +1,1 @@
38-usr/lib/lib*.so.0*
39+usr/lib/*/lib*.so.0*
40\ No newline at end of file
41
42=== modified file 'debian/noise.install'
43--- debian/noise.install 2013-06-27 08:16:47 +0000
44+++ debian/noise.install 2014-03-07 16:10:12 +0000
45@@ -1,7 +1,7 @@
46 usr/bin
47-usr/lib/noise/plugins
48+usr/lib/*/noise/plugins
49 usr/share/applications
50 usr/share/glib-2.0
51 usr/share/icons
52 usr/share/locale
53-usr/share/noise
54+usr/share/noise
55\ No newline at end of file

Subscribers

People subscribed via source and target branches