r29798 - /packages/unstable/cogl/debian/
bigon at users.alioth.debian.org
bigon at users.alioth.debian.org
Wed Sep 28 17:20:27 UTC 2011
Author: bigon
Date: Wed Sep 28 17:20:27 2011
New Revision: 29798
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=29798
Log:
* Split libcogl-pango out of the main libcogl package
* debian/control.in:
- Move Vcs-* to the unstable branch
* debian/rules:
- Explicitly pass --enable-gdk-pixbuf and --enable-cogl-pango flags
to the configure
Added:
packages/unstable/cogl/debian/gir1.2-coglpango-1.0.install
packages/unstable/cogl/debian/libcogl-pango-dev.install
packages/unstable/cogl/debian/libcogl-pango0.install
packages/unstable/cogl/debian/libcogl-pango0.symbols
Modified:
packages/unstable/cogl/debian/changelog
packages/unstable/cogl/debian/control
packages/unstable/cogl/debian/control.in
packages/unstable/cogl/debian/gir1.2-cogl-1.0.install
packages/unstable/cogl/debian/libcogl-dev.install
packages/unstable/cogl/debian/libcogl5.install
packages/unstable/cogl/debian/libcogl5.symbols
packages/unstable/cogl/debian/rules
Modified: packages/unstable/cogl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/cogl/debian/changelog?rev=29798&op=diff
==============================================================================
--- packages/unstable/cogl/debian/changelog [utf-8] (original)
+++ packages/unstable/cogl/debian/changelog [utf-8] Wed Sep 28 17:20:27 2011
@@ -9,9 +9,15 @@
- conflicts/replaces with libcogl2
[ Laurent Bigonville ]
+ * Split libcogl-pango out of the main libcogl package
* debian/copyright: Fix copyright file format
+ * debian/control.in:
+ - Move Vcs-* to the unstable branch
+ * debian/rules:
+ - Explicitly pass --enable-gdk-pixbuf and --enable-cogl-pango flags
+ to the configure
- -- Laurent Bigonville <bigon at debian.org> Tue, 27 Sep 2011 19:15:02 +0200
+ -- Laurent Bigonville <bigon at debian.org> Wed, 28 Sep 2011 19:20:07 +0200
cogl (1.7.8-1) experimental; urgency=low
Modified: packages/unstable/cogl/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/cogl/debian/control?rev=29798&op=diff
==============================================================================
--- packages/unstable/cogl/debian/control [utf-8] (original)
+++ packages/unstable/cogl/debian/control [utf-8] Wed Sep 28 17:20:27 2011
@@ -7,7 +7,7 @@
Section: libs
Priority: optional
Maintainer: Rico Tzschichholz <ricotz at ubuntu.com>
-Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>
+Uploaders: Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Laurent Bigonville <bigon at debian.org>
Build-Depends: debhelper (>= 8.1.3~),
cdbs (>= 0.4.93~),
gnome-pkg-tools,
@@ -24,8 +24,8 @@
gobject-introspection (>= 0.9.12-4~),
libgirepository1.0-dev (>= 0.9.12)
Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/experimental/cogl
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/experimental/cogl/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/cogl
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/cogl/
Package: libcogl5
Architecture: any
@@ -60,6 +60,95 @@
Architecture: any
Depends: libcogl5 (= ${binary:Version}),
gir1.2-cogl-1.0 (= ${binary:Version}),
+ libglib2.0-dev (>= 2.26.0),
+ libdrm-dev [!hurd-any],
+ libgdk-pixbuf2.0-dev (>= 2.0),
+ libx11-dev,
+ libxcomposite-dev,
+ libxext-dev,
+ libxfixes-dev,
+ libxdamage-dev,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: pkg-config
+Suggests: libcogl-doc
+Replaces: libclutter-1.0-dev (<< 1.7)
+Breaks: libclutter-1.0-dev (<< 1.7)
+Description: Object oriented GL/GLES Abstraction/Utility Layer (development files)
+ Cogl is a small open source library for using 3D graphics hardware to draw
+ pretty pictures. The API departs from the flat state machine style of
+ OpenGL and is designed to make it easy to write orthogonal components that
+ can render without stepping on each others toes.
+ .
+ This package contains the development files for libcogl.
+
+Package: libcogl5-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libcogl5 (= ${binary:Version}),
+ ${misc:Depends}
+Multi-Arch: same
+Description: Object oriented GL/GLES Abstraction/Utility Layer (debug files)
+ Cogl is a small open source library for using 3D graphics hardware to draw
+ pretty pictures. The API departs from the flat state machine style of
+ OpenGL and is designed to make it easy to write orthogonal components that
+ can render without stepping on each others toes.
+ .
+ This package contains the debug files for libcogl.
+
+Package: libcogl-doc
+Section: doc
+Architecture: all
+Depends: ${misc:Depends}
+Suggests: devhelp
+Replaces: libclutter-1.0-doc (<< 1.7)
+Breaks: libclutter-1.0-doc (<< 1.7)
+Description: Object oriented GL/GLES Abstraction/Utility Layer (documentation)
+ Cogl is a small open source library for using 3D graphics hardware to draw
+ pretty pictures. The API departs from the flat state machine style of
+ OpenGL and is designed to make it easy to write orthogonal components that
+ can render without stepping on each others toes.
+ .
+ This package contains the documentation.
+
+Package: gir1.2-cogl-1.0
+Architecture: any
+Depends: ${gir:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: gir1.2-clutter-1.0 (<< 1.7)
+Breaks: gir1.2-clutter-1.0 (<< 1.7)
+Description: GObject introspection data for the Cogl 1.0 library
+ This package contains introspection data for the Clutter scene
+ graph library.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings for libcogl.
+
+Package: libcogl-pango0
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+Recommends: libcogl-common
+Conflicts: libcogl2
+Replaces: libcogl2, libcogl5 (<< 1.8.0-1)
+Breaks: libcogl5 (<< 1.8.0-1)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Object oriented GL/GLES Abstraction/Utility Layer
+ Cogl is a small open source library for using 3D graphics hardware to draw
+ pretty pictures. The API departs from the flat state machine style of
+ OpenGL and is designed to make it easy to write orthogonal components that
+ can render without stepping on each others toes.
+
+Package: libcogl-pango-dev
+Section: libdevel
+Architecture: any
+Depends: libcogl-pango0 (= ${binary:Version}),
+ gir1.2-coglpango-1.0 (= ${binary:Version}),
+ libcogl-dev (= ${binary:Version}),
+ libglib2.0-dev (>= 2.26.0),
libcairo2-dev (>= 1.10),
libdrm-dev [!hurd-any],
libgdk-pixbuf2.0-dev (>= 2.0),
@@ -73,22 +162,24 @@
${shlibs:Depends}
Recommends: pkg-config
Suggests: libcogl-doc
-Replaces: libclutter-1.0-dev (<< 1.7)
-Breaks: libclutter-1.0-dev (<< 1.7)
+Replaces: libcogl-dev (<< 1.8.0-1)
+Breaks: libcogl-dev (<< 1.8.0-1)
Description: Object oriented GL/GLES Abstraction/Utility Layer (development files)
Cogl is a small open source library for using 3D graphics hardware to draw
pretty pictures. The API departs from the flat state machine style of
OpenGL and is designed to make it easy to write orthogonal components that
can render without stepping on each others toes.
.
- This package contains the development files.
-
-Package: libcogl5-dbg
+ This package contains the development files for libcogl-pango.
+
+Package: libcogl-pango0-dbg
Section: debug
Priority: extra
Architecture: any
-Depends: libcogl5 (= ${binary:Version}),
- ${misc:Depends}
+Depends: libcogl-pango0 (= ${binary:Version}),
+ ${misc:Depends}
+Replaces: libcogl5-dbg (<< 1.8.0-1)
+Breaks: libcogl5-dbg (<< 1.8.0-1)
Multi-Arch: same
Description: Object oriented GL/GLES Abstraction/Utility Layer (debug files)
Cogl is a small open source library for using 3D graphics hardware to draw
@@ -96,33 +187,18 @@
OpenGL and is designed to make it easy to write orthogonal components that
can render without stepping on each others toes.
.
- This package contains the debug files.
-
-Package: libcogl-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
-Suggests: devhelp
-Replaces: libclutter-1.0-doc (<< 1.7)
-Breaks: libclutter-1.0-doc (<< 1.7)
-Description: Object oriented GL/GLES Abstraction/Utility Layer (documentation)
- Cogl is a small open source library for using 3D graphics hardware to draw
- pretty pictures. The API departs from the flat state machine style of
- OpenGL and is designed to make it easy to write orthogonal components that
- can render without stepping on each others toes.
- .
- This package contains the documentation.
-
-Package: gir1.2-cogl-1.0
+ This package contains the debug files for libcogl-pango.
+
+Package: gir1.2-coglpango-1.0
Architecture: any
Depends: ${gir:Depends},
${shlibs:Depends},
${misc:Depends}
-Replaces: gir1.2-clutter-1.0 (<< 1.7)
-Breaks: gir1.2-clutter-1.0 (<< 1.7)
-Description: GObject introspection data for the Cogl 1.0 library
+Replaces: gir1.2-cogl-1.0 (<< 1.8.0-1)
+Breaks: gir1.2-cogl-1.0 (<< 1.8.0-1)
+Description: GObject introspection data for the CoglPango 1.0 library
This package contains introspection data for the Clutter scene
graph library.
.
It can be used by packages using the GIRepository format to generate
- dynamic bindings.
+ dynamic bindings for libcogl-pango.
Modified: packages/unstable/cogl/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/cogl/debian/control.in?rev=29798&op=diff
==============================================================================
--- packages/unstable/cogl/debian/control.in [utf-8] (original)
+++ packages/unstable/cogl/debian/control.in [utf-8] Wed Sep 28 17:20:27 2011
@@ -19,8 +19,8 @@
gobject-introspection (>= 0.9.12-4~),
libgirepository1.0-dev (>= 0.9.12)
Standards-Version: 3.9.2
-Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/experimental/cogl
-Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/experimental/cogl/
+Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/cogl
+Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-gnome/packages/unstable/cogl/
Package: libcogl5
Architecture: any
@@ -55,10 +55,9 @@
Architecture: any
Depends: libcogl5 (= ${binary:Version}),
gir1.2-cogl-1.0 (= ${binary:Version}),
- libcairo2-dev (>= 1.10),
+ libglib2.0-dev (>= 2.26.0),
libdrm-dev [!hurd-any],
libgdk-pixbuf2.0-dev (>= 2.0),
- libpango1.0-dev (>= 1.20),
libx11-dev,
libxcomposite-dev,
libxext-dev,
@@ -76,7 +75,7 @@
OpenGL and is designed to make it easy to write orthogonal components that
can render without stepping on each others toes.
.
- This package contains the development files.
+ This package contains the development files for libcogl.
Package: libcogl5-dbg
Section: debug
@@ -91,7 +90,7 @@
OpenGL and is designed to make it easy to write orthogonal components that
can render without stepping on each others toes.
.
- This package contains the debug files.
+ This package contains the debug files for libcogl.
Package: libcogl-doc
Section: doc
@@ -120,4 +119,81 @@
graph library.
.
It can be used by packages using the GIRepository format to generate
- dynamic bindings.
+ dynamic bindings for libcogl.
+
+Package: libcogl-pango0
+Architecture: any
+Depends: ${shlibs:Depends},
+ ${misc:Depends},
+Recommends: libcogl-common
+Conflicts: libcogl2
+Replaces: libcogl2, libcogl5 (<< 1.8.0-1)
+Breaks: libcogl5 (<< 1.8.0-1)
+Pre-Depends: ${misc:Pre-Depends}
+Multi-Arch: same
+Description: Object oriented GL/GLES Abstraction/Utility Layer
+ Cogl is a small open source library for using 3D graphics hardware to draw
+ pretty pictures. The API departs from the flat state machine style of
+ OpenGL and is designed to make it easy to write orthogonal components that
+ can render without stepping on each others toes.
+
+Package: libcogl-pango-dev
+Section: libdevel
+Architecture: any
+Depends: libcogl-pango0 (= ${binary:Version}),
+ gir1.2-coglpango-1.0 (= ${binary:Version}),
+ libcogl-dev (= ${binary:Version}),
+ libglib2.0-dev (>= 2.26.0),
+ libcairo2-dev (>= 1.10),
+ libdrm-dev [!hurd-any],
+ libgdk-pixbuf2.0-dev (>= 2.0),
+ libpango1.0-dev (>= 1.20),
+ libx11-dev,
+ libxcomposite-dev,
+ libxext-dev,
+ libxfixes-dev,
+ libxdamage-dev,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends: pkg-config
+Suggests: libcogl-doc
+Replaces: libcogl-dev (<< 1.8.0-1)
+Breaks: libcogl-dev (<< 1.8.0-1)
+Description: Object oriented GL/GLES Abstraction/Utility Layer (development files)
+ Cogl is a small open source library for using 3D graphics hardware to draw
+ pretty pictures. The API departs from the flat state machine style of
+ OpenGL and is designed to make it easy to write orthogonal components that
+ can render without stepping on each others toes.
+ .
+ This package contains the development files for libcogl-pango.
+
+Package: libcogl-pango0-dbg
+Section: debug
+Priority: extra
+Architecture: any
+Depends: libcogl-pango0 (= ${binary:Version}),
+ ${misc:Depends}
+Replaces: libcogl5-dbg (<< 1.8.0-1)
+Breaks: libcogl5-dbg (<< 1.8.0-1)
+Multi-Arch: same
+Description: Object oriented GL/GLES Abstraction/Utility Layer (debug files)
+ Cogl is a small open source library for using 3D graphics hardware to draw
+ pretty pictures. The API departs from the flat state machine style of
+ OpenGL and is designed to make it easy to write orthogonal components that
+ can render without stepping on each others toes.
+ .
+ This package contains the debug files for libcogl-pango.
+
+Package: gir1.2-coglpango-1.0
+Architecture: any
+Depends: ${gir:Depends},
+ ${shlibs:Depends},
+ ${misc:Depends}
+Replaces: gir1.2-cogl-1.0 (<< 1.8.0-1)
+Breaks: gir1.2-cogl-1.0 (<< 1.8.0-1)
+Description: GObject introspection data for the CoglPango 1.0 library
+ This package contains introspection data for the Clutter scene
+ graph library.
+ .
+ It can be used by packages using the GIRepository format to generate
+ dynamic bindings for libcogl-pango.
Modified: packages/unstable/cogl/debian/gir1.2-cogl-1.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/cogl/debian/gir1.2-cogl-1.0.install?rev=29798&op=diff
==============================================================================
--- packages/unstable/cogl/debian/gir1.2-cogl-1.0.install [utf-8] (original)
+++ packages/unstable/cogl/debian/gir1.2-cogl-1.0.install [utf-8] Wed Sep 28 17:20:27 2011
@@ -1,1 +1,1 @@
-usr/lib/*/girepository-1.0 usr/lib/
+usr/lib/*/girepository-1.0/Cogl-* usr/lib/girepository-1.0
Added: packages/unstable/cogl/debian/gir1.2-coglpango-1.0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/cogl/debian/gir1.2-coglpango-1.0.install?rev=29798&op=file
==============================================================================
--- packages/unstable/cogl/debian/gir1.2-coglpango-1.0.install (added)
+++ packages/unstable/cogl/debian/gir1.2-coglpango-1.0.install [utf-8] Wed Sep 28 17:20:27 2011
@@ -1,0 +1,1 @@
+usr/lib/*/girepository-1.0/CoglPango-* usr/lib/girepository-1.0
Modified: packages/unstable/cogl/debian/libcogl-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/cogl/debian/libcogl-dev.install?rev=29798&op=diff
==============================================================================
--- packages/unstable/cogl/debian/libcogl-dev.install [utf-8] (original)
+++ packages/unstable/cogl/debian/libcogl-dev.install [utf-8] Wed Sep 28 17:20:27 2011
@@ -1,4 +1,6 @@
-usr/lib/*/*.so
-usr/lib/*/pkgconfig/
-usr/include/
-usr/share/gir-1.0/
+usr/lib/*/libcogl.so
+usr/lib/*/pkgconfig/cogl-gl-*
+usr/lib/*/pkgconfig/cogl-1.0.pc
+usr/lib/*/pkgconfig/cogl-2.0-experimental.pc
+usr/include/cogl/cogl/
+usr/share/gir-1.0/Cogl-*
Added: packages/unstable/cogl/debian/libcogl-pango-dev.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/cogl/debian/libcogl-pango-dev.install?rev=29798&op=file
==============================================================================
--- packages/unstable/cogl/debian/libcogl-pango-dev.install (added)
+++ packages/unstable/cogl/debian/libcogl-pango-dev.install [utf-8] Wed Sep 28 17:20:27 2011
@@ -1,0 +1,4 @@
+usr/lib/*/libcogl-pango.so
+usr/lib/*/pkgconfig/cogl-pango-*
+usr/include/cogl/cogl-pango/
+usr/share/gir-1.0/CoglPango-*
Added: packages/unstable/cogl/debian/libcogl-pango0.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/cogl/debian/libcogl-pango0.install?rev=29798&op=file
==============================================================================
--- packages/unstable/cogl/debian/libcogl-pango0.install (added)
+++ packages/unstable/cogl/debian/libcogl-pango0.install [utf-8] Wed Sep 28 17:20:27 2011
@@ -1,0 +1,1 @@
+usr/lib/*/libcogl-pango.so.*
Added: packages/unstable/cogl/debian/libcogl-pango0.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/cogl/debian/libcogl-pango0.symbols?rev=29798&op=file
==============================================================================
--- packages/unstable/cogl/debian/libcogl-pango0.symbols (added)
+++ packages/unstable/cogl/debian/libcogl-pango0.symbols [utf-8] Wed Sep 28 17:20:27 2011
@@ -1,0 +1,18 @@
+libcogl-pango.so.0 libcogl-pango0 #MINVER#
+ cogl_pango_ensure_glyph_cache_for_layout at Base 1.7.4
+ cogl_pango_font_map_clear_glyph_cache at Base 1.7.4
+ cogl_pango_font_map_create_context at Base 1.7.4
+ cogl_pango_font_map_get_renderer at Base 1.7.4
+ cogl_pango_font_map_get_use_mipmapping at Base 1.7.4
+ cogl_pango_font_map_new at Base 1.7.4
+ cogl_pango_font_map_set_resolution at Base 1.7.4
+ cogl_pango_font_map_set_use_mipmapping at Base 1.7.4
+ cogl_pango_glyph_cache_clear at Base 1.7.4
+ cogl_pango_glyph_cache_free at Base 1.7.4
+ cogl_pango_glyph_cache_lookup at Base 1.7.4
+ cogl_pango_glyph_cache_new at Base 1.7.4
+ cogl_pango_render_layout at Base 1.7.4
+ cogl_pango_render_layout_line at Base 1.7.4
+ cogl_pango_render_layout_subpixel at Base 1.7.4
+ cogl_pango_renderer_get_type at Base 1.7.4
+ cogl_pango_renderer_slice_cb at Base 1.7.4
Modified: packages/unstable/cogl/debian/libcogl5.install
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/cogl/debian/libcogl5.install?rev=29798&op=diff
==============================================================================
--- packages/unstable/cogl/debian/libcogl5.install [utf-8] (original)
+++ packages/unstable/cogl/debian/libcogl5.install [utf-8] Wed Sep 28 17:20:27 2011
@@ -1,1 +1,1 @@
-usr/lib/*/*.so.*
+usr/lib/*/libcogl.so.*
Modified: packages/unstable/cogl/debian/libcogl5.symbols
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/cogl/debian/libcogl5.symbols?rev=29798&op=diff
==============================================================================
--- packages/unstable/cogl/debian/libcogl5.symbols [utf-8] (original)
+++ packages/unstable/cogl/debian/libcogl5.symbols [utf-8] Wed Sep 28 17:20:27 2011
@@ -1,21 +1,3 @@
-libcogl-pango.so.0 libcogl5 #MINVER#
- cogl_pango_ensure_glyph_cache_for_layout at Base 1.7.4
- cogl_pango_font_map_clear_glyph_cache at Base 1.7.4
- cogl_pango_font_map_create_context at Base 1.7.4
- cogl_pango_font_map_get_renderer at Base 1.7.4
- cogl_pango_font_map_get_use_mipmapping at Base 1.7.4
- cogl_pango_font_map_new at Base 1.7.4
- cogl_pango_font_map_set_resolution at Base 1.7.4
- cogl_pango_font_map_set_use_mipmapping at Base 1.7.4
- cogl_pango_glyph_cache_clear at Base 1.7.4
- cogl_pango_glyph_cache_free at Base 1.7.4
- cogl_pango_glyph_cache_lookup at Base 1.7.4
- cogl_pango_glyph_cache_new at Base 1.7.4
- cogl_pango_render_layout at Base 1.7.4
- cogl_pango_render_layout_line at Base 1.7.4
- cogl_pango_render_layout_subpixel at Base 1.7.4
- cogl_pango_renderer_get_type at Base 1.7.4
- cogl_pango_renderer_slice_cb at Base 1.7.4
libcogl.so.5 libcogl5 #MINVER#
_cogl_atlas_add_reorganize_callback at Base 1.7.4
_cogl_atlas_new at Base 1.7.4
Modified: packages/unstable/cogl/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/cogl/debian/rules?rev=29798&op=diff
==============================================================================
--- packages/unstable/cogl/debian/rules [utf-8] (original)
+++ packages/unstable/cogl/debian/rules [utf-8] Wed Sep 28 17:20:27 2011
@@ -9,9 +9,12 @@
GNOME_MODULE = cogl
DEB_DH_MAKESHLIBS_ARGS_libcogl5 += -V -- -c4
+DEB_DH_MAKESHLIBS_ARGS_libcogl-pango0 += -V -- -c4
DEB_CONFIGURE_EXTRA_FLAGS += \
--libdir=\$${prefix}/lib/$(DEB_HOST_MULTIARCH) \
--enable-gtk-doc \
+ --enable-gdk-pixbuf \
+ --enable-cogl-pango \
--enable-introspection=yes
ifeq ($(DEB_HOST_ARCH),$(findstring $(DEB_HOST_ARCH),armel armhf))
More information about the pkg-gnome-commits
mailing list