Merge lp:~raof/mir/reinstate-old-pc-file into lp:mir/0.17

[Chris Halse Rogers]

Un-rename mir-client-platform-mesa-dev.

This reverts the merge in r2965; this landed post-feature-freeze and results in Mesa (among others) being unbuildable.

This rename still applies on trunk; mesa, xserver and others need updating for Xenial.

Fixes: https://bugs.launchpad.net/ubuntu/+source/mir/+bug/1509005

[Daniel van Vugt (vanvugt)]

Unfortunately we now have projects in the wild that expect mir-client-platform-mesa.pc

So if you change anything then both files need to exist side-by-side.

review: Needs Fixing

[Chris Halse Rogers (raof)]

What projects in the wild expect mir-client-platform-mesa? Nothing that's in Wily, clearly.

[Daniel van Vugt (vanvugt)]

Oh good point. It's possible only Xmir is affected. And even then only upstream (not wily) Xmir is affected..

"projects" perhaps is only "project" and not technically "in the wild" yet. Although it's hard to tell because the regression has been released "in the wild" as 0.17.0 for 8 days now.

review: Abstain

[Daniel van Vugt (vanvugt)]

Looking at wily distro, both mesa and xorg still use the old syntax: mir-client-platform-mesa-dev

So let's go with that then. A full revert is OK too.

review: Approve

[Daniel van Vugt (vanvugt)]

Although alf has just pointed out that at most we probably only need to update xorg-server and mesa packages with the new name. And the new name is nicer....

[Chris Halse Rogers (raof)]

This is only reverted on the 0.17 branch; once we land a release from
trunk in Xenial only the new name will remain.

[Alan Griffiths (alan-griffiths)]

I'd prefer to update the (two?) downstreams to the improved name.

As a "quick fix" I'd prefer "ln mir-client-platform-mesa-dev mir-client-platform-mesa"

review: Abstain

[Kevin DuBois (kdub)]

alright by me

review: Approve

[Daniel van Vugt (vanvugt)]

Oh I failed to notice the target branch was lp:mir/0.17 and not trunk. Even better.

review: Approve

[Daniel van Vugt (vanvugt)]

/me wonders if this branch really builds, come to think of it.

[Daniel van Vugt (vanvugt)]

CMake fails and the build never even starts. The problem is you have two target .pc files but only one source .pc.in file exists now...

CMake Error: File src/platforms/mesa/mir-client-platform-mesa.pc.in does not exist.

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Still doesn't build. Still the same issue...

CMake Error: File /home/dan/bzr/mir/tmp.raof/src/platforms/mesa/mir-client-platform-mesa.pc.in does not exist.
CMake Error at src/platforms/mesa/CMakeLists.txt:9 (configure_file):
  configure_file Problem configuring file

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Internal name and file name mismatch:

51 +++ src/platforms/mesa/mir-client-platform-mesa.pc.in 2015-10-27 04:18:26 +0000
52 @@ -0,0 +1,7 @@
53 +includedir=@INCLUDEDIR@/mirplatform
54 +
55 +Name: mir-client-platform-mesa-dev

review: Needs Fixing

[Daniel van Vugt (vanvugt)]

Okee

review: Approve

=== modified file 'debian/mir-client-platform-mesa-dev.install'
--- debian/mir-client-platform-mesa-dev.install	2015-09-24 22:30:09 +0000
+++ debian/mir-client-platform-mesa-dev.install	2015-10-27 04:35:25 +0000
@@ -1,2 +1,3 @@
 usr/include/mirplatform/mir_toolkit/mesa
+usr/lib/*/pkgconfig/mir-client-platform-mesa-dev.pc
 usr/lib/*/pkgconfig/mir-client-platform-mesa.pc
 
=== modified file 'src/platforms/mesa/CMakeLists.txt'
--- src/platforms/mesa/CMakeLists.txt	2015-09-24 22:30:09 +0000
+++ src/platforms/mesa/CMakeLists.txt	2015-10-27 04:35:25 +0000
@@ -1,6 +1,12 @@
 set(INCLUDEDIR "${CMAKE_INSTALL_PREFIX}/include")
 
 configure_file(
+  ${CMAKE_CURRENT_SOURCE_DIR}/mir-client-platform-mesa-dev.pc.in
+  ${CMAKE_CURRENT_BINARY_DIR}/mir-client-platform-mesa-dev.pc
+  @ONLY
+)
+
+configure_file(
   ${CMAKE_CURRENT_SOURCE_DIR}/mir-client-platform-mesa.pc.in
   ${CMAKE_CURRENT_BINARY_DIR}/mir-client-platform-mesa.pc
   @ONLY
@@ -20,6 +26,9 @@
 )
 
 install(
-  FILES ${CMAKE_CURRENT_BINARY_DIR}/mir-client-platform-mesa.pc
+  FILES
+  ${CMAKE_CURRENT_BINARY_DIR}/mir-client-platform-mesa-dev.pc
+  ${CMAKE_CURRENT_BINARY_DIR}/mir-client-platform-mesa.pc
+
   DESTINATION ${CMAKE_INSTALL_LIBDIR}/pkgconfig
 )
 
=== renamed file 'src/platforms/mesa/mir-client-platform-mesa.pc.in' => 'src/platforms/mesa/mir-client-platform-mesa-dev.pc.in'
--- src/platforms/mesa/mir-client-platform-mesa.pc.in	2015-10-07 12:53:33 +0000
+++ src/platforms/mesa/mir-client-platform-mesa-dev.pc.in	2015-10-27 04:35:25 +0000
@@ -1,6 +1,6 @@
 includedir=@INCLUDEDIR@/mirplatform
 
-Name: mir-client-platform-mesa
+Name: mir-client-platform-mesa-dev
 Description: Mir Mesa client platform development files
 Version: @MIR_VERSION@
 Requires.private: mirclient
 
=== added file 'src/platforms/mesa/mir-client-platform-mesa.pc.in'
--- src/platforms/mesa/mir-client-platform-mesa.pc.in	1970-01-01 00:00:00 +0000
+++ src/platforms/mesa/mir-client-platform-mesa.pc.in	2015-10-27 04:35:25 +0000
@@ -0,0 +1,7 @@
+includedir=@INCLUDEDIR@/mirplatform
+
+Name: mir-client-platform-mesa
+Description: Mir Mesa client platform development files
+Version: @MIR_VERSION@
+Requires.private: mirclient
+Cflags: -I${includedir}