diff -pruN 0.10.8-1/debian/changelog 0.10.8-1ubuntu2/debian/changelog --- 0.10.8-1/debian/changelog 2010-10-25 18:19:37.000000000 +0000 +++ 0.10.8-1ubuntu2/debian/changelog 2011-12-26 19:20:16.000000000 +0000 @@ -1,3 +1,22 @@ +clutter-gtk-0.10 (0.10.8-1ubuntu2) precise; urgency=low + + * Add patch eliminating usage of g_thread_init() that is now deprecated. + Fixes FTBFS. + + -- Daniel T Chen Mon, 26 Dec 2011 14:19:25 -0500 + +clutter-gtk-0.10 (0.10.8-1ubuntu1) natty; urgency=low + + * Merge from debian experimental. Remaining changes: + - Build gir1.2 package + * Should fix clutter views not being updated correctly (LP: #603507) + * debian/control: Bump gobject-introspection and libgirepository1.0-dev + build-dependencies to 0.9.3 + * Drop debian/patches/gdk_display.patch: applied upstream + * debian/rules: Rely on .symbols file to set minimal shlibs version + + -- Laurent Bigonville Sat, 08 Jan 2011 23:00:19 +0100 + clutter-gtk-0.10 (0.10.8-1) experimental; urgency=low * New upstream release @@ -17,6 +36,53 @@ clutter-gtk-0.10 (0.10.8-1) experimental -- Laurent Bigonville Mon, 25 Oct 2010 20:19:35 +0200 +clutter-gtk-0.10 (0.10.4-1ubuntu6) natty; urgency=low + + * debian/control: + - Use gir1.2 not gir1.0 for abi change + + -- Michael Terry Thu, 16 Dec 2010 14:21:06 -0500 + +clutter-gtk-0.10 (0.10.4-1ubuntu5) natty; urgency=low + + * debian/patches/gdk_display.patch: + - Remove obsolete GDK_DISPLAY() macro usage + + -- Robert Ancell Fri, 22 Oct 2010 14:45:37 +1100 + +clutter-gtk-0.10 (0.10.4-1ubuntu4) natty; urgency=low + + * debian/control: + - Remove obsolete gir-repository-dev build-depend + + -- Robert Ancell Mon, 18 Oct 2010 16:44:11 +1100 + +clutter-gtk-0.10 (0.10.4-1ubuntu3) maverick; urgency=low + + * no change rebuild after landing clutter .pc file fixes; see LP: #623376 + + -- Alexander Sack Tue, 24 Aug 2010 23:05:39 +0200 + +clutter-gtk-0.10 (0.10.4-1ubuntu2) maverick; urgency=low + + * Rebuild with the current gobject introspection + + -- Sebastien Bacher Tue, 10 Aug 2010 22:10:26 +0200 + +clutter-gtk-0.10 (0.10.4-1ubuntu1) maverick; urgency=low + + * Resync on Debian + * debian/control.in: + - suggest the correct documentation binary + - updated the build-depends and the binaries list for the gir + * debian/gir1.0-clutter-gtk-0.10.install, + debian/libclutter-gtk-0.10-dev.install: + - updated to install the gir and typelib + * debian/rules: + - build with gir + + -- Sebastien Bacher Thu, 05 Aug 2010 17:32:59 +0200 + clutter-gtk-0.10 (0.10.4-1) unstable; urgency=low * New upstream release diff -pruN 0.10.8-1/debian/control 0.10.8-1ubuntu2/debian/control --- 0.10.8-1/debian/control 2010-10-25 18:23:34.000000000 +0000 +++ 0.10.8-1ubuntu2/debian/control 2011-12-26 19:23:32.000000000 +0000 @@ -6,13 +6,22 @@ Source: clutter-gtk-0.10 Section: libs Priority: optional -Maintainer: Ross Burton -Uploaders: Debian GNOME Maintainers , Laurent Bigonville , Rob Bradford , Sjoerd Simons +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ross Burton +Uploaders: Debian GNOME Maintainers , Laurent Bigonville , Rob Bradford Build-Depends: debhelper (>= 5), cdbs, gnome-pkg-tools, - libclutter-1.0-dev, - libgtk2.0-dev + libclutter-1.0-dev (>= 1.2.12-0ubuntu10~), + libgtk2.0-dev, + libgirepository1.0-dev (>= 0.9.3), + gobject-introspection (>= 0.9.3), + gir1.2-atk-1.0, + gir1.2-clutter-1.0 (>= 1.2.12-0ubuntu10~), + gir1.2-freedesktop, + gir1.2-gtk-2.0 (>= 2.19.5), + gir1.2-glib-2.0, + gir1.2-pango-1.0 Standards-Version: 3.9.1 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-gtk-0.10/ Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/clutter-gtk-0.10/ @@ -26,6 +35,18 @@ Description: Open GL based interactive c fast, mainly 2D single window applications such as media box UIs, presentations, kiosk style applications and so on. +Package: gir1.2-clutter-gtk-0.10 +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, ${gir:Depends} +Conflicts: gir1.0-clutter-gtk-0.10 +Replaces: gir1.0-clutter-gtk-0.10 +Description: GObject introspection data for the GTK+ Clutter library + This package contains introspection data for the GTK+ Clutter widget. + . + It can be used by packages using the GIRepository format to generate + dynamic bindings. + Package: libclutter-gtk-0.10-dev Section: libdevel Architecture: any diff -pruN 0.10.8-1/debian/control.in 0.10.8-1ubuntu2/debian/control.in --- 0.10.8-1/debian/control.in 2010-10-25 18:14:05.000000000 +0000 +++ 0.10.8-1ubuntu2/debian/control.in 2011-01-20 16:21:14.000000000 +0000 @@ -1,13 +1,22 @@ Source: clutter-gtk-0.10 Section: libs Priority: optional -Maintainer: Ross Burton +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: Ross Burton Uploaders: @GNOME_TEAM@ Build-Depends: debhelper (>= 5), cdbs, gnome-pkg-tools, - libclutter-1.0-dev, - libgtk2.0-dev + libclutter-1.0-dev (>= 1.2.12-0ubuntu10~), + libgtk2.0-dev, + libgirepository1.0-dev (>= 0.9.3), + gobject-introspection (>= 0.9.3), + gir1.2-atk-1.0, + gir1.2-clutter-1.0 (>= 1.2.12-0ubuntu10~), + gir1.2-freedesktop, + gir1.2-gtk-2.0 (>= 2.19.5), + gir1.2-glib-2.0, + gir1.2-pango-1.0 Standards-Version: 3.9.1 Vcs-Browser: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/clutter-gtk-0.10/ Vcs-Svn: svn://svn.debian.org/svn/pkg-gnome/packages/unstable/clutter-gtk-0.10/ @@ -21,6 +30,18 @@ Description: Open GL based interactive c fast, mainly 2D single window applications such as media box UIs, presentations, kiosk style applications and so on. +Package: gir1.2-clutter-gtk-0.10 +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends}, ${gir:Depends} +Conflicts: gir1.0-clutter-gtk-0.10 +Replaces: gir1.0-clutter-gtk-0.10 +Description: GObject introspection data for the GTK+ Clutter library + This package contains introspection data for the GTK+ Clutter widget. + . + It can be used by packages using the GIRepository format to generate + dynamic bindings. + Package: libclutter-gtk-0.10-dev Section: libdevel Architecture: any diff -pruN 0.10.8-1/debian/gir1.2-clutter-gtk-0.10.install 0.10.8-1ubuntu2/debian/gir1.2-clutter-gtk-0.10.install --- 0.10.8-1/debian/gir1.2-clutter-gtk-0.10.install 1970-01-01 00:00:00.000000000 +0000 +++ 0.10.8-1ubuntu2/debian/gir1.2-clutter-gtk-0.10.install 2011-01-20 16:21:14.000000000 +0000 @@ -0,0 +1 @@ +debian/tmp/usr/lib/girepository-1.0/ diff -pruN 0.10.8-1/debian/libclutter-gtk-0.10-dev.install 0.10.8-1ubuntu2/debian/libclutter-gtk-0.10-dev.install --- 0.10.8-1/debian/libclutter-gtk-0.10-dev.install 2010-10-25 17:52:20.000000000 +0000 +++ 0.10.8-1ubuntu2/debian/libclutter-gtk-0.10-dev.install 2011-01-20 16:21:14.000000000 +0000 @@ -1,3 +1,4 @@ debian/tmp/usr/lib/*.so debian/tmp/usr/lib/pkgconfig/ debian/tmp/usr/include/ +debian/tmp/usr/share/gir-1.0/ diff -pruN 0.10.8-1/debian/patches/deprecated-g_thread_init.diff 0.10.8-1ubuntu2/debian/patches/deprecated-g_thread_init.diff --- 0.10.8-1/debian/patches/deprecated-g_thread_init.diff 1970-01-01 00:00:00.000000000 +0000 +++ 0.10.8-1ubuntu2/debian/patches/deprecated-g_thread_init.diff 2011-12-26 19:23:16.000000000 +0000 @@ -0,0 +1,11 @@ +diff -Nur -x '*.orig' -x '*~' clutter-gtk-0.10-0.10.8//examples/gtk-clutter-viewport.c clutter-gtk-0.10-0.10.8.new//examples/gtk-clutter-viewport.c +--- clutter-gtk-0.10-0.10.8//examples/gtk-clutter-viewport.c 2010-09-16 08:49:53.000000000 -0400 ++++ clutter-gtk-0.10-0.10.8.new//examples/gtk-clutter-viewport.c 2011-12-26 14:23:11.000000000 -0500 +@@ -36,7 +36,6 @@ + GtkWidget *table, *scrollbar, *slider; + GtkAdjustment *h_adjustment, *v_adjustment, *z_adjustment; + +- g_thread_init (NULL); + gdk_threads_init (); + clutter_threads_init (); + diff -pruN 0.10.8-1/debian/rules 0.10.8-1ubuntu2/debian/rules --- 0.10.8-1/debian/rules 2010-10-25 18:02:10.000000000 +0000 +++ 0.10.8-1ubuntu2/debian/rules 2011-12-26 19:22:06.000000000 +0000 @@ -3,9 +3,15 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/rules/utils.mk +include /usr/share/cdbs/1/rules/simple-patchsys.mk include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk DEB_CONFIGURE_SCRIPT_ENV += LDFLAGS="-Wl,-O1 -Wl,--as-needed" DEB_COMPRESS_EXCLUDE = .c +DEB_CONFIGURE_EXTRA_FLAGS += --enable-introspection=yes + common-binary-predeb-arch:: list-missing + +$(patsubst %,binary-predeb/%,$(DEB_ALL_PACKAGES)) :: + dh_girepository -p$(cdbs_curpkg)