r27025 - in /packages/unstable/gir-repository/debian: changelog control control.in gir1.0-gtk-2.0.install gir1.0-soup-2.4.install gir1.2-gtk-2.0.install gir1.2-soup-2.4.install patches/02_fix_gtk_gir_build.patch patches/series rules source/ source/format
pochu at users.alioth.debian.org
pochu at users.alioth.debian.org
Tue Mar 22 00:39:04 UTC 2011
Author: pochu
Date: Tue Mar 22 00:39:03 2011
New Revision: 27025
URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=27025
Log:
* debian/patches/02_fix_gtk_gir_build.patch:
- Fix the gir build for the gtk and gdk bindings.
* debian/source/format,
debian/control.in,
debian/rules:
- Switch to source format 3.0 (quilt).
* debian/control.in,
debian/rules:
- Use dh-autoreconf.
* debian/control.in,
debian/gir1.[02]*.install:
- Move to gir1.2 packages.
* debian/control.in:
- Remove unneeded build dependencies.
Added:
packages/unstable/gir-repository/debian/gir1.2-gtk-2.0.install
- copied unchanged from r26976, packages/unstable/gir-repository/debian/gir1.0-gtk-2.0.install
packages/unstable/gir-repository/debian/gir1.2-soup-2.4.install
- copied unchanged from r26976, packages/unstable/gir-repository/debian/gir1.0-soup-2.4.install
packages/unstable/gir-repository/debian/patches/02_fix_gtk_gir_build.patch
packages/unstable/gir-repository/debian/source/
packages/unstable/gir-repository/debian/source/format
Removed:
packages/unstable/gir-repository/debian/gir1.0-gtk-2.0.install
packages/unstable/gir-repository/debian/gir1.0-soup-2.4.install
Modified:
packages/unstable/gir-repository/debian/changelog
packages/unstable/gir-repository/debian/control
packages/unstable/gir-repository/debian/control.in
packages/unstable/gir-repository/debian/patches/series
packages/unstable/gir-repository/debian/rules
Modified: packages/unstable/gir-repository/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gir-repository/debian/changelog?rev=27025&op=diff
==============================================================================
--- packages/unstable/gir-repository/debian/changelog [utf-8] (original)
+++ packages/unstable/gir-repository/debian/changelog [utf-8] Tue Mar 22 00:39:03 2011
@@ -1,3 +1,22 @@
+gir-repository (0.6.5-9) unstable; urgency=low
+
+ * debian/patches/02_fix_gtk_gir_build.patch:
+ - Fix the gir build for the gtk and gdk bindings.
+ * debian/source/format,
+ debian/control.in,
+ debian/rules:
+ - Switch to source format 3.0 (quilt).
+ * debian/control.in,
+ debian/rules:
+ - Use dh-autoreconf.
+ * debian/control.in,
+ debian/gir1.[02]*.install:
+ - Move to gir1.2 packages.
+ * debian/control.in:
+ - Remove unneeded build dependencies.
+
+ -- Emilio Pozuelo Monfort <pochu at debian.org> Tue, 22 Mar 2011 00:36:59 +0000
+
gir-repository (0.6.5-8) unstable; urgency=low
* Remove all bindings except for gir1.0-gtk-2.0 and gir1.0-soup-2.4.
Modified: packages/unstable/gir-repository/debian/control
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gir-repository/debian/control?rev=27025&op=diff
==============================================================================
--- packages/unstable/gir-repository/debian/control [utf-8] (original)
+++ packages/unstable/gir-repository/debian/control [utf-8] Tue Mar 22 00:39:03 2011
@@ -10,46 +10,31 @@
Uploaders: Andreas Henriksson <andreas at fatal.se>, Debian GNOME Maintainers <pkg-gnome-maintainers at lists.alioth.debian.org>, Emilio Pozuelo Monfort <pochu at debian.org>, Gustavo Noronha Silva <kov at debian.org>, Josselin Mouette <joss at debian.org>
Build-Depends: debhelper (>= 5),
cdbs,
- quilt,
+ dh-autoreconf,
gnome-pkg-tools (>= 0.10),
libgirepository1.0-dev (>= 0.6.5),
gobject-introspection (>= 0.6.5-3),
- gir1.0-glib-2.0 (>= 0.6.5),
- gir1.0-freedesktop,
+ gir1.2-glib-2.0 (>= 0.6.5),
+ gir1.2-freedesktop,
libtool,
libpango1.0-dev (>= 1.16.0),
libatk1.0-dev (>= 1.12.0),
libgtk2.0-dev (>= 2.12.0),
- libglade2-dev (>= 2.5.0),
python-cairo (>= 1.0.2),
python-gobject (>= 2.14.0),
- libsoup2.4-dev,
- libgnome-keyring-dev,
- libnotify-dev,
- libgoocanvas-dev,
- libgl1-mesa-dev,
- libxft-dev,
- libpoppler-glib-dev (>= 0.8),
- libbabl-0.0-0-dev,
- libgtksourceview2.0-dev,
- libavahi-gobject-dev (>= 0.6),
- libavahi-core-dev (>= 0.6),
- libdbus-glib-1-dev,
- libxml2-dev,
- libxfixes-dev,
- libnautilus-extension-dev
+ libsoup2.4-dev
Build-Conflicts: libgtk-directfb-2.0-dev
Standards-Version: 3.8.4
Homepage: http://live.gnome.org/GObjectIntrospection
-Package: gir1.0-gtk-2.0
+Package: gir1.2-gtk-2.0
Section: libs
Architecture: any
Depends: ${gir:Depends},
${shlibs:Depends},
${misc:Depends}
-Provides: gir1.0-atk-1.0,
- gir1.0-pango-1.0
+Provides: gir1.2-atk-1.0,
+ gir1.2-pango-1.0
Conflicts: gobject-introspection-repository
Description: GObject introspection data for the GTK+ library
This package contains introspection data for the GTK+ graphical
@@ -65,7 +50,7 @@
It can be used by packages using the GIRepository format to generate
dynamic bindings.
-Package: gir1.0-soup-2.4
+Package: gir1.2-soup-2.4
Section: libs
Architecture: any
Depends: ${gir:Depends},
@@ -102,5 +87,5 @@
* Gtk
* libsoup
.
- The actual introspection data is shipped in the relevant gir1.0-*
+ The actual introspection data is shipped in the relevant gir1.2-*
packages.
Modified: packages/unstable/gir-repository/debian/control.in
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gir-repository/debian/control.in?rev=27025&op=diff
==============================================================================
--- packages/unstable/gir-repository/debian/control.in [utf-8] (original)
+++ packages/unstable/gir-repository/debian/control.in [utf-8] Tue Mar 22 00:39:03 2011
@@ -5,46 +5,31 @@
Uploaders: @GNOME_TEAM@
Build-Depends: debhelper (>= 5),
cdbs,
- quilt,
+ dh-autoreconf,
gnome-pkg-tools (>= 0.10),
- libgirepository1.0-dev (>= 0.6.5),
- gobject-introspection (>= 0.6.5-3),
- gir1.0-glib-2.0 (>= 0.6.5),
- gir1.0-freedesktop,
+ libgirepository1.0-dev (>= 0.10.0),
+ gobject-introspection (>= 0.10.0),
+ gir1.2-glib-2.0 (>= 0.10.0),
+ gir1.2-freedesktop (>= 0.10.0),
libtool,
libpango1.0-dev (>= 1.16.0),
libatk1.0-dev (>= 1.12.0),
libgtk2.0-dev (>= 2.12.0),
- libglade2-dev (>= 2.5.0),
python-cairo (>= 1.0.2),
python-gobject (>= 2.14.0),
- libsoup2.4-dev,
- libgnome-keyring-dev,
- libnotify-dev,
- libgoocanvas-dev,
- libgl1-mesa-dev,
- libxft-dev,
- libpoppler-glib-dev (>= 0.8),
- libbabl-0.0-0-dev,
- libgtksourceview2.0-dev,
- libavahi-gobject-dev (>= 0.6),
- libavahi-core-dev (>= 0.6),
- libdbus-glib-1-dev,
- libxml2-dev,
- libxfixes-dev,
- libnautilus-extension-dev
+ libsoup2.4-dev
Build-Conflicts: libgtk-directfb-2.0-dev
Standards-Version: 3.8.4
Homepage: http://live.gnome.org/GObjectIntrospection
-Package: gir1.0-gtk-2.0
+Package: gir1.2-gtk-2.0
Section: libs
Architecture: any
Depends: ${gir:Depends},
${shlibs:Depends},
${misc:Depends}
-Provides: gir1.0-atk-1.0,
- gir1.0-pango-1.0
+Provides: gir1.2-atk-1.0,
+ gir1.2-pango-1.0
Conflicts: gobject-introspection-repository
Description: GObject introspection data for the GTK+ library
This package contains introspection data for the GTK+ graphical
@@ -60,7 +45,7 @@
It can be used by packages using the GIRepository format to generate
dynamic bindings.
-Package: gir1.0-soup-2.4
+Package: gir1.2-soup-2.4
Section: libs
Architecture: any
Depends: ${gir:Depends},
@@ -97,5 +82,5 @@
* Gtk
* libsoup
.
- The actual introspection data is shipped in the relevant gir1.0-*
+ The actual introspection data is shipped in the relevant gir1.2-*
packages.
Added: packages/unstable/gir-repository/debian/patches/02_fix_gtk_gir_build.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gir-repository/debian/patches/02_fix_gtk_gir_build.patch?rev=27025&op=file
==============================================================================
--- packages/unstable/gir-repository/debian/patches/02_fix_gtk_gir_build.patch (added)
+++ packages/unstable/gir-repository/debian/patches/02_fix_gtk_gir_build.patch [utf-8] Tue Mar 22 00:39:03 2011
@@ -1,0 +1,30 @@
+--- a/gir/Makefile.am
++++ b/gir/Makefile.am
+@@ -284,9 +284,8 @@
+ --pkg atk \
+ --pkg pango \
+ --pkg gdk-$(GDK_TARGET)-2.0 \
+- -DGDK_COMPILATION \
+ $(libgirepo_Gdk_custom_la_SOURCES) \
+- $(GDK_INCLUDEDIR)/gdk/*.h
++ $(GDK_INCLUDEDIR)/gdk/gdkx.h
+ BUILT_GIRSOURCES += Gdk-2.0.gir
+
+ lib_LTLIBRARIES += libgirepo-Gtk-custom.la
+@@ -311,7 +310,6 @@
+ --pkg gdk-$(GDK_TARGET)-2.0 \
+ --pkg gtk+-$(GDK_TARGET)-2.0 \
+ --output $@ \
+- -DGTK_COMPILATION \
+ -D__GTK_FILE_CHOOSER_UTILS_H__ \
+ -D__GTK_FILE_CHOOSER_PRIVATE_H__ \
+ -D__GTK_FILE_SYSTEM_H__ \
+@@ -321,7 +319,7 @@
+ -D__GTK_TEXT_LAYOUT_H__ \
+ -D__GTK_TEXT_DISPLAY_H__ \
+ $(libgirepo_Gtk_custom_la_SOURCES) \
+- $(GTK_INCLUDEDIR)/gtk/*.h
++ $(GTK_INCLUDEDIR)/gtk/gtk.h
+ BUILT_GIRSOURCES += Gtk-2.0.gir
+ XPATH_TESTS += Gtk-2.0.xpath
+ endif
Modified: packages/unstable/gir-repository/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gir-repository/debian/patches/series?rev=27025&op=diff
==============================================================================
--- packages/unstable/gir-repository/debian/patches/series [utf-8] (original)
+++ packages/unstable/gir-repository/debian/patches/series [utf-8] Tue Mar 22 00:39:03 2011
@@ -1,1 +1,2 @@
01_avoid-version.patch
+02_fix_gtk_gir_build.patch
Modified: packages/unstable/gir-repository/debian/rules
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gir-repository/debian/rules?rev=27025&op=diff
==============================================================================
--- packages/unstable/gir-repository/debian/rules [utf-8] (original)
+++ packages/unstable/gir-repository/debian/rules [utf-8] Tue Mar 22 00:39:03 2011
@@ -1,11 +1,11 @@
#!/usr/bin/make -f
+include /usr/share/cdbs/1/rules/autoreconf.mk
include /usr/share/cdbs/1/rules/debhelper.mk
-include /usr/share/cdbs/1/rules/patchsys-quilt.mk
include /usr/share/cdbs/1/class/autotools.mk
include /usr/share/cdbs/1/rules/utils.mk
include /usr/share/gnome-pkg-tools/1/rules/uploaders.mk
--include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
+include /usr/share/gnome-pkg-tools/1/rules/gnome-get-source.mk
DEB_MAKE_ENVVARS += HOME=$(CURDIR)
Added: packages/unstable/gir-repository/debian/source/format
URL: http://svn.debian.org/wsvn/pkg-gnome/packages/unstable/gir-repository/debian/source/format?rev=27025&op=file
==============================================================================
--- packages/unstable/gir-repository/debian/source/format (added)
+++ packages/unstable/gir-repository/debian/source/format [utf-8] Tue Mar 22 00:39:03 2011
@@ -1,0 +1,1 @@
+3.0 (quilt)
More information about the pkg-gnome-commits
mailing list