tag 761211 + patch quit On Sun, Oct 12, 2014 at 09:51:12PM -0500, Rob Browning wrote: > Luca Falavigna <dktrkr...@debian.org> writes: > > guile-gnome-platform [1] > > No response wrt 2.0: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=761211 ---end quoted text---
The attached patch (which is just a sync from Ubuntu), migrates guile-gnome-platform to guile 2.0. -- أحمد المحمودي (Ahmed El-Mahmoudy) Digital design engineer GPG KeyID: 0xEDDDA1B7 GPG Fingerprint: 8206 A196 2084 7E6D 0DF8 B176 BC19 6A94 EDDD A1B7
diff -Nru guile-gnome-platform-2.16.2/debian/changelog guile-gnome-platform-2.16.2/debian/changelog --- guile-gnome-platform-2.16.2/debian/changelog 2014-02-11 10:59:12.000000000 +0200 +++ guile-gnome-platform-2.16.2/debian/changelog 2014-10-29 19:09:14.000000000 +0200 @@ -1,3 +1,20 @@ +guile-gnome-platform (2.16.2-1.2) unstable; urgency=medium + + * Non-maintainer upload. + * Sync changes from Ubuntu. (Closes: #761211) + + -- أحمد المحمودي (Ahmed El-Mahmoudy) <aelmahmo...@users.sourceforge.net> Wed, 29 Oct 2014 19:08:36 +0200 + +guile-gnome-platform (2.16.2-1.1ubuntu1) trusty; urgency=medium + + * Switch to guile-2.0-dev. + * Backport build fix from upstream to use absolute paths and handle + GUILE_LOAD_PATH being unset. + * Handle the Automake parallel test harness. + * Use dh-autoreconf to help apply these changes. + + -- Colin Watson <cjwat...@ubuntu.com> Tue, 25 Mar 2014 11:51:05 +0000 + guile-gnome-platform (2.16.2-1.1) unstable; urgency=medium * Non-maintainer upload. diff -Nru guile-gnome-platform-2.16.2/debian/control guile-gnome-platform-2.16.2/debian/control --- guile-gnome-platform-2.16.2/debian/control 2012-06-02 16:32:20.000000000 +0200 +++ guile-gnome-platform-2.16.2/debian/control 2014-03-25 13:51:04.000000000 +0200 @@ -1,12 +1,13 @@ Source: guile-gnome-platform Section: lisp Priority: extra -Maintainer: Andreas Rottmann <ro...@debian.org> +Maintainer: Ubuntu Developers <ubuntu-devel-disc...@lists.ubuntu.com> +XSBC-Original-Maintainer: Andreas Rottmann <ro...@debian.org> Standards-Version: 3.9.3 Homepage: http://www.gnu.org/software/guile-gnome/ Build-Depends: cdbs (>= 0.4.49), debhelper (>> 7), - automake, libtool, xvfb, xauth, xfonts-base, stx2any, - guile-1.8-dev, guile-library (>= 0.1.6), + dh-autoreconf, xvfb, xauth, xfonts-base, stx2any, + guile-2.0-dev, guile-library (>= 0.1.6), g-wrap (>= 1.9.14-1), guile-g-wrap (>= 1.9.14-1), libgwrap-runtime-dev (>= 1.9.11), guile-cairo-dev (>= 1.4.0), libglib2.0-dev (>= 2.12.13), libgtk2.0-dev (>= 2.10.13), libgconf2-dev (>= 2.18.0), diff -Nru guile-gnome-platform-2.16.2/debian/patches/fixes/automake-parallel-tests.patch guile-gnome-platform-2.16.2/debian/patches/fixes/automake-parallel-tests.patch --- guile-gnome-platform-2.16.2/debian/patches/fixes/automake-parallel-tests.patch 1970-01-01 02:00:00.000000000 +0200 +++ guile-gnome-platform-2.16.2/debian/patches/fixes/automake-parallel-tests.patch 2014-03-25 13:49:55.000000000 +0200 @@ -0,0 +1,47 @@ +Description: Handle Automake parallel test harness +Author: Colin Watson <cjwat...@ubuntu.com> +Forwarded: no +Last-Update: 2014-03-25 + +Index: b/glib/test-suite/Makefile.am +=================================================================== +--- a/glib/test-suite/Makefile.am ++++ b/glib/test-suite/Makefile.am +@@ -36,7 +36,8 @@ + gw_module_name = (gnome gw $(wrapset_stem)) + extra_module_names = + wrapset_modules = ($(top_module_name) $(gw_module_name) $(extra_module_names)) +-TESTS_ENVIRONMENT=\ ++LOG_COMPILER=\ ++ env \ + API_FILE=$(srcdir)/gobject.api \ + DOC_SCM=$(srcdir)/../doc/gobject/guile-gnome-gobject.scm \ + WRAPSET_MODULES="$(wrapset_modules)" \ +@@ -64,7 +65,7 @@ + $(top_builddir)/dev-environ $(GUILE) --debug -e update-api -s $(srcdir)/wrapset.scm + + %.check: % +- $(TESTS_ENVIRONMENT) $(srcdir)/$* ++ $(LOG_COMPILER) $(srcdir)/$* + + EXTRA_DIST+=gobject.api api.scm wrapset.api wrapset.scm + +Index: b/tests.mk +=================================================================== +--- a/tests.mk ++++ b/tests.mk +@@ -33,12 +33,12 @@ + WRAPSET_TESTS_ENV = WRAPSET_MODULES="$(wrapset_modules)" WRAPSET_API_FILE=$(srcdir)/wrapset.api + DEV_ENV = $(top_builddir)/dev-environ + +-TESTS_ENVIRONMENT=$(WRAPSET_TESTS_ENV) $(DEV_ENV) $(GUILE) $(GUILE_FLAGS) -e main -s ++LOG_COMPILER=env $(WRAPSET_TESTS_ENV) $(DEV_ENV) $(GUILE) $(GUILE_FLAGS) -e main -s + + wrapset.api.update: + $(WRAPSET_TESTS_ENV) $(DEV_ENV) $(GUILE) -e update-api -s $(srcdir)/wrapset.scm + + %.check: % +- $(TESTS_ENVIRONMENT) $(srcdir)/$* ++ $(LOG_COMPILER) $(srcdir)/$* + + TESTS = wrapset.scm diff -Nru guile-gnome-platform-2.16.2/debian/patches/fixes/build-absolute-paths.patch guile-gnome-platform-2.16.2/debian/patches/fixes/build-absolute-paths.patch --- guile-gnome-platform-2.16.2/debian/patches/fixes/build-absolute-paths.patch 1970-01-01 02:00:00.000000000 +0200 +++ guile-gnome-platform-2.16.2/debian/patches/fixes/build-absolute-paths.patch 2014-03-25 13:48:26.000000000 +0200 @@ -0,0 +1,23 @@ +Description: Use absolute paths; handle GUILE_LOAD_PATH being unset +Author: Andy Wingo <wi...@igalia.com> +Origin: backport, http://git.savannah.gnu.org/cgit/guile-gnome.git/commit/?id=f37f03bb957701d80a1c3977b3f0f3995b6ec655 +Forwarded: not-needed +Last-Update: 2014-03-25 + +Index: b/common.mk +=================================================================== +--- a/common.mk ++++ b/common.mk +@@ -39,9 +39,9 @@ + GUILE_SNARF_CFLAGS = $(DEFS) $(AM_CFLAGS) $(GUILE_CFLAGS) $(G_WRAP_CFLAGS) + + PACKAGES = atk cairo corba defs gconf glib gnome-vfs gtk libglade libgnome libgnomecanvas libgnomeui pango +-SOURCE_GUILE_PATH=$(shell echo $(addprefix $(top_srcdir)/,$(PACKAGES)) | sed -e 's/ /:/g'):$(srcdir) +-BUILD_GUILE_PATH=$(if $(filter-out $(top_srcdir),$(top_builddir)),$(shell echo -n $(addprefix $(top_builddir)/,$(PACKAGES)): | sed -e 's/ /:/g'),) +-GUILE_LOAD_PATH:=$(BUILD_GUILE_PATH)$(SOURCE_GUILE_PATH):${G_WRAP_MODULE_DIR}:${GUILE_LOAD_PATH} ++SOURCE_GUILE_PATH=$(shell echo $(addprefix $(abs_top_srcdir)/,$(PACKAGES)) | sed -e 's/ /:/g'):$(srcdir) ++BUILD_GUILE_PATH=$(if $(filter-out $(abs_top_srcdir),$(abs_top_builddir)),$(shell echo -n $(addprefix $(abs_top_builddir)/,$(PACKAGES)): | sed -e 's/ /:/g'),) ++GUILE_LOAD_PATH:=$(BUILD_GUILE_PATH)$(SOURCE_GUILE_PATH):${G_WRAP_MODULE_DIR}$(if ${GUILE_LOAD_PATH},:${GUILE_LOAD_PATH}) + export GUILE_LOAD_PATH + + .c.x: diff -Nru guile-gnome-platform-2.16.2/debian/patches/series guile-gnome-platform-2.16.2/debian/patches/series --- guile-gnome-platform-2.16.2/debian/patches/series 2012-06-02 16:32:20.000000000 +0200 +++ guile-gnome-platform-2.16.2/debian/patches/series 2014-03-25 13:48:40.000000000 +0200 @@ -4,3 +4,5 @@ fixes/0004-Allow-configuring-guile-and-guile-snarf-executables.patch fixes/0005-Fix-configure-s-interpretation-of-disable-Werror.patch fixes/0006-Fix-deprecated-includes-of-glib-sub-headers.patch +fixes/build-absolute-paths.patch +fixes/automake-parallel-tests.patch diff -Nru guile-gnome-platform-2.16.2/debian/rules guile-gnome-platform-2.16.2/debian/rules --- guile-gnome-platform-2.16.2/debian/rules 2014-02-11 10:58:28.000000000 +0200 +++ guile-gnome-platform-2.16.2/debian/rules 2014-03-25 13:45:23.000000000 +0200 @@ -5,8 +5,9 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/autotools.mk include /usr/share/cdbs/1/class/autotools-vars.mk +include /usr/share/cdbs/1/rules/autoreconf.mk -DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror GUILE=guile-1.8 +DEB_CONFIGURE_EXTRA_FLAGS := --disable-Werror GUILE=guile-2.0 DEB_DH_INSTALL_ARGS := --sourcedir=$(DEB_DESTDIR) DEB_MAKE_CHECK_TARGET = check
signature.asc
Description: Digital signature
