diff -r dd5e724e80ac -r b453d81e6fdc components/gnome/cogl/cogl.p5m --- a/components/gnome/cogl/cogl.p5m Fri Jul 08 15:55:02 2016 +0000 +++ b/components/gnome/cogl/cogl.p5m Tue Jul 12 13:06:47 2016 +0000 @@ -132,7 +132,7 @@ file path=usr/include/cogl/cogl/gl-prototypes/cogl-glsl-functions.h file path=usr/include/cogl/cogl/gl-prototypes/cogl-in-gles-core-functions.h file path=usr/include/cogl/cogl/gl-prototypes/cogl-in-gles2-core-functions.h -#file path=usr/lib/$(MACH64)/girepository-1.0/Cogl-1.0.typelib +file path=usr/lib/$(MACH64)/girepository-1.0/Cogl-1.0.typelib file path=usr/lib/$(MACH64)/girepository-1.0/Cogl-2.0.typelib file path=usr/lib/$(MACH64)/girepository-1.0/CoglGst-2.0.typelib file path=usr/lib/$(MACH64)/girepository-1.0/CoglPango-1.0.typelib @@ -150,16 +150,16 @@ link path=usr/lib/$(MACH64)/libcogl.so target=libcogl.so.20.4.1 link path=usr/lib/$(MACH64)/libcogl.so.20 target=libcogl.so.20.4.1 file path=usr/lib/$(MACH64)/libcogl.so.20.4.1 -#file path=usr/lib/$(MACH64)/pkgconfig/cogl-1.0.pc +file path=usr/lib/$(MACH64)/pkgconfig/cogl-1.0.pc file path=usr/lib/$(MACH64)/pkgconfig/cogl-2.0-experimental.pc -#file path=usr/lib/$(MACH64)/pkgconfig/cogl-gl-1.0.pc +file path=usr/lib/$(MACH64)/pkgconfig/cogl-gl-1.0.pc file path=usr/lib/$(MACH64)/pkgconfig/cogl-gst-1.0.pc file path=usr/lib/$(MACH64)/pkgconfig/cogl-gst-2.0-experimental.pc file path=usr/lib/$(MACH64)/pkgconfig/cogl-pango-1.0.pc file path=usr/lib/$(MACH64)/pkgconfig/cogl-pango-2.0-experimental.pc file path=usr/lib/$(MACH64)/pkgconfig/cogl-path-1.0.pc file path=usr/lib/$(MACH64)/pkgconfig/cogl-path-2.0-experimental.pc -#file path=usr/lib/girepository-1.0/Cogl-1.0.typelib +file path=usr/lib/girepository-1.0/Cogl-1.0.typelib file path=usr/lib/girepository-1.0/Cogl-2.0.typelib file path=usr/lib/girepository-1.0/CoglGst-2.0.typelib file path=usr/lib/girepository-1.0/CoglPango-1.0.typelib @@ -177,9 +177,9 @@ link path=usr/lib/libcogl.so target=libcogl.so.20.4.1 link path=usr/lib/libcogl.so.20 target=libcogl.so.20.4.1 file path=usr/lib/libcogl.so.20.4.1 -#file path=usr/lib/pkgconfig/cogl-1.0.pc +file path=usr/lib/pkgconfig/cogl-1.0.pc file path=usr/lib/pkgconfig/cogl-2.0-experimental.pc -#file path=usr/lib/pkgconfig/cogl-gl-1.0.pc +file path=usr/lib/pkgconfig/cogl-gl-1.0.pc file path=usr/lib/pkgconfig/cogl-gst-1.0.pc file path=usr/lib/pkgconfig/cogl-gst-2.0-experimental.pc file path=usr/lib/pkgconfig/cogl-pango-1.0.pc @@ -187,7 +187,7 @@ file path=usr/lib/pkgconfig/cogl-path-1.0.pc file path=usr/lib/pkgconfig/cogl-path-2.0-experimental.pc file path=usr/share/cogl/examples-data/crate.jpg -#file path=usr/share/gir-1.0/Cogl-1.0.gir +file path=usr/share/gir-1.0/Cogl-1.0.gir file path=usr/share/gir-1.0/Cogl-2.0.gir file path=usr/share/gir-1.0/CoglGst-2.0.gir file path=usr/share/gir-1.0/CoglPango-1.0.gir @@ -248,3 +248,6 @@ file path=usr/share/locale/zh_HK/LC_MESSAGES/cogl.mo file path=usr/share/locale/zh_TW/LC_MESSAGES/cogl.mo license COPYING license=COGL +# Avoid collisions with older versions of clutter package which +# delivered the Cogl-1.0.pc files now found in this package. +depend type=optional fmri=library/desktop/clutter@1.24.0