1
=== modified file 'debian/mir-client-platform-mesa-dev.install'
2
--- debian/mir-client-platform-mesa-dev.install	2016-01-29 08:18:22 +0000
3
+++ debian/mir-client-platform-mesa-dev.install	2017-06-02 08:19:19 +0000
4
@@ -1,2 +1,2 @@
6
1
usr/include/mirplatform/mir_toolkit/mesa
1
usr/include/mirplatforms/mir_toolkit/mesa
7
2
usr/lib/*/pkgconfig/mir-client-platform-mesa.pc
2
usr/lib/*/pkgconfig/mir-client-platform-mesa.pc
8
3
3
9
=== modified file 'debian/rules'
10
--- debian/rules	2017-05-25 08:58:03 +0000
11
+++ debian/rules	2017-06-02 08:19:19 +0000
12
@@ -4,6 +4,7 @@
13
4
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
4
DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH)
14
5
DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
5
DEB_HOST_ARCH_ENDIAN ?= $(shell dpkg-architecture -qDEB_HOST_ARCH_ENDIAN)
15
6
EXACT_PACKAGE_VERSION = $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f 2)
6
EXACT_PACKAGE_VERSION = $(shell dpkg-parsechangelog | grep Version | cut -d' ' -f 2)
16
7
DISTRIB_CODENAME = $(shell grep DISTRIB_CODENAME /etc/lsb-release | cut -d= -f2)
17
7
8
18
8
export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
9
export DPKG_GENSYMBOLS_CHECK_LEVEL = 4
19
9
10
20
@@ -65,8 +66,12 @@
21
65
# Delete the symlink so that --fail-missing doesn't think we've missed it
66
# Delete the symlink so that --fail-missing doesn't think we've missed it
22
66
# accidentally.
67
# accidentally.
23
67
	-rm debian/tmp/usr/lib/*/libmirprotobuf.so
68
	-rm debian/tmp/usr/lib/*/libmirprotobuf.so
26
68
	dh_install -p libmirplatform-dev -Xmesa --fail-missing
69
ifeq ($(filter xenial yakkety zesty,$(DISTRIB_CODENAME)),)
27
69
	dh_install --remaining-packages --fail-missing -Xjquery.js
70
	dh_install
28
71
else
29
72
	# xenial, yakkety & zesty predate dh_missing
30
73
	dh_install --fail-missing
31
74
endif
32
70
75
33
71
# Don't try to strip libraries used as test data
76
# Don't try to strip libraries used as test data
34
72
override_dh_strip:
77
override_dh_strip:
35
73
78
36
=== modified file 'src/platforms/mesa/CMakeLists.txt'
37
--- src/platforms/mesa/CMakeLists.txt	2017-05-08 03:04:26 +0000
38
+++ src/platforms/mesa/CMakeLists.txt	2017-06-02 08:19:19 +0000
39
@@ -17,7 +17,7 @@
40
17
17
41
18
install(
18
install(
42
19
  DIRECTORY ${CMAKE_SOURCE_DIR}/include/platforms/mesa/mir_toolkit
19
  DIRECTORY ${CMAKE_SOURCE_DIR}/include/platforms/mesa/mir_toolkit
44
20
  DESTINATION "include/mirplatform"
20
  DESTINATION "include/mirplatforms"
45
21
)
21
)
46
22
22
47
23
install(
23
install(
48
24
24
49
=== modified file 'src/platforms/mesa/mir-client-platform-mesa.pc.in'
50
--- src/platforms/mesa/mir-client-platform-mesa.pc.in	2016-01-29 08:18:22 +0000
51
+++ src/platforms/mesa/mir-client-platform-mesa.pc.in	2017-06-02 08:19:19 +0000
52
@@ -1,4 +1,4 @@
54
1
includedir=@INCLUDEDIR@/mirplatform
1
includedir=@INCLUDEDIR@/mirplatforms
55
2
2
56
3
Name: mir-client-platform-mesa
3
Name: mir-client-platform-mesa
57
4
Description: Mir Mesa client platform development files
4
Description: Mir Mesa client platform development files
Status:	Merged
Approved by:	Alan Griffiths on 2017-06-02
Approved revision:	no longer in the source branch.
Merged at revision:	4184
Proposed branch:	lp:~alan-griffiths/mir/debian-rules-for-artful
Merge into:	lp:mir
Diff against target:	57 lines (+10/-5) 4 files modified debian/mir-client-platform-mesa-dev.install (+1/-1) debian/rules (+7/-2) src/platforms/mesa/CMakeLists.txt (+1/-1) src/platforms/mesa/mir-client-platform-mesa.pc.in (+1/-1)
To merge this branch:	bzr merge lp:~alan-griffiths/mir/debian-rules-for-artful
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Mir CI Bot	continuous-integration		Approve on 2017-06-02
Mir development team		2017-06-01	Pending
Review via email: mp+324917@code.launchpad.net