Merge lp:~ari-tczew/gnome-python-extras/ubuntu into lp:~ubuntu-desktop/gnome-python-extras/ubuntu

[Artur Rona]

[Chris Coulson (chrisccoulson)]

Looks good. One minor comment though:

--- debian/patches/04_use_PYTHON-config_check.patch 2009-05-12 08:42:44 +0000
+++ debian/patches/04_use_PYTHON-config_check.patch 2011-01-26 22:42:32 +0000
@@ -1,3 +1,7 @@
+From: Chris Coulson <email address hidden>
+Description: Use python-config.
+Author: Daniel Holbach <email address hidden>
+

This change originally came from Matthias Klose (https://launchpad.net/ubuntu/+source/gnome-python-extras/2.14.2-1ubuntu2), so I've fixed that.

Also, as with g-p-m, it would be good to try using dh-autoreconf rather than the old CDBS rules for updating the build system.

I'll merge it anyway though.

Thanks!

review: Approve

=== modified file 'debian/changelog'
--- debian/changelog	2011-01-07 14:59:45 +0000
+++ debian/changelog	2011-01-26 22:51:58 +0000
@@ -1,3 +1,37 @@
+gnome-python-extras (2.25.3-7ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: (LP: #708357)
+    - debian/control:
+      + Build-Depends on gnome-common, needed for autotools in rules.
+      + Bump build-depends on python-gnome2-dev.
+      + Remove stray comma from python-gtk2 depends.
+    - debian/patches/01_xul19.patch:
+      + Replaced with 01_xulrunner_ubuntu.patch, support xulrunner 2.0.
+    - debian/patches/04_use_PYTHON-config_check.patch:
+      + Use python-config.
+    - debian/patches/70_autotools.patch:
+      + Dropped, autotools now runs on build.
+    - debian/rules:
+      + Run autotools on build.
+      + Support xulrunner 2.0.
+  * 01_xulrunner_ubuntu.patch: Updated to get it more professionally.
+
+ -- Artur Rona <[e-mail]>  Wed, 26 Jan 2011 21:40:16 +0100
+
+gnome-python-extras (2.25.3-7) unstable; urgency=low
+
+  * Patch from Micah Gersten to add missing dependency on xulrunner.
+    Closes: #609189.
+
+ -- Josselin Mouette <[e-mail]>  Fri, 14 Jan 2011 19:38:45 +0100
+
+gnome-python-extras (2.25.3-6) unstable; urgency=low
+
+  * 06_gda_libpython.patch: don’t link the gda module with libpython.
+  * 70_autotools.patch: updated accordingly.
+
+ -- Josselin Mouette <[e-mail]>  Mon, 27 Sep 2010 09:24:41 +0200
+
 gnome-python-extras (2.25.3-5ubuntu4) natty; urgency=low
 
   * Have dh_xulrunner install a dependency on xulrunner for python-gtkmozembed

=== modified file 'debian/patches/01_xulrunner_ubuntu.patch'
--- debian/patches/01_xulrunner_ubuntu.patch	2010-11-25 15:08:54 +0000
+++ debian/patches/01_xulrunner_ubuntu.patch	2011-01-26 22:51:58 +0000
@@ -1,5 +1,9 @@
---- a/configure.ac
-+++ b/configure.ac
+Description: Update for xulrunner 2.0. Change the GREVersion boundaries and tidy up the configure.ac changes a bit too.
+Author: Chris Coulson <[e-mail]>
+
+diff -pruN -x '*~' gnome-python-extras-2.25.3.orig/configure.ac gnome-python-extras-2.25.3/configure.ac
+--- gnome-python-extras-2.25.3.orig/configure.ac	2009-02-15 23:20:23.000000000 +0100
++++ gnome-python-extras-2.25.3/configure.ac	2011-01-26 21:56:35.000000000 +0100
 @@ -19,6 +19,7 @@ m4_define(gtkhtml2_required_version,
  m4_define(mozilla_required_version,           1.2b)
  m4_define(firefox_required_version,           1.0)
@@ -123,28 +127,42 @@
  if test -n "$export_dynamic"; then
    GTKMOZEMBED_LIBS=`echo $GTKMOZEMBED_LIBS | sed -e "s/$export_dynamic//"`
  fi
---- a/gtkmozembed/Makefile.am
-+++ b/gtkmozembed/Makefile.am
-@@ -13,9 +13,15 @@ pkgpyexecdir = $(pyexecdir)/gtk-2.0
- pkgpyexec_LTLIBRARIES = gtkmozembed.la
- gtkmozembed_la_LDFLAGS = -module -avoid-version	\
- 	-export-symbols-regex initgtkmozembed	\
--	-R$(MOZILLA_HOME) -L$(MOZILLA_HOME)
-+	$(NULL)
-+
-+# only use rpath for non-glue builds
-+if !HAVE_XPCOM_GLUE
-+       gtkmozembed_la_LDFLAGS + = -R$(MOZILLA_HOME) -L$(MOZILLA_HOME)
-+endif
-+
- gtkmozembed_la_LIBADD = $(GTKMOZEMBED_LIBS)
--gtkmozembed_la_SOURCES = gtkmozembedmodule.c
-+gtkmozembed_la_SOURCES = gtkmozembedmodule.cpp
- nodist_gtkmozembed_la_SOURCES = gtkmozembed.c
- gtkmozembed.c: gtkmozembed.defs gtkmozembed.override
- CLEANFILES = gtkmozembed.c
---- /dev/null
-+++ b/gtkmozembed/gtkmozembedmodule.cpp
+diff -pruN -x '*~' gnome-python-extras-2.25.3.orig/gtkmozembed/gtkmozembedmodule.c gnome-python-extras-2.25.3/gtkmozembed/gtkmozembedmodule.c
+--- gnome-python-extras-2.25.3.orig/gtkmozembed/gtkmozembedmodule.c	2008-12-12 02:06:29.000000000 +0100
++++ gnome-python-extras-2.25.3/gtkmozembed/gtkmozembedmodule.c	1970-01-01 01:00:00.000000000 +0100
+@@ -1,29 +0,0 @@
+-#ifdef HAVE_CONFIG_H
+-#include "config.h"
+-#endif
+-
+-/* include this first, before NO_IMPORT_PYGOBJECT is defined */
+-#include <pygobject.h>
+-
+-void pygtkmozembed_register_classes (PyObject *d);
+-void pygtkmozembed_add_constants(PyObject *module, const gchar *strip_prefix);
+-
+-extern PyMethodDef pygtkmozembed_functions[];
+-
+-DL_EXPORT(void)
+-initgtkmozembed(void)
+-{
+-    PyObject *m, *d;
+-
+-    init_pygobject ();
+-
+-    m = Py_InitModule ("gtkmozembed", pygtkmozembed_functions);
+-    d = PyModule_GetDict (m);
+-
+-    pygtkmozembed_register_classes (d);
+-    pygtkmozembed_add_constants(m, "GTK_MOZ_EMBED_");
+-
+-    if (PyErr_Occurred ()) {
+-        Py_FatalError ("can't initialise module gtkmozembed");
+-    }
+-}
+diff -pruN -x '*~' gnome-python-extras-2.25.3.orig/gtkmozembed/gtkmozembedmodule.cpp gnome-python-extras-2.25.3/gtkmozembed/gtkmozembedmodule.cpp
+--- gnome-python-extras-2.25.3.orig/gtkmozembed/gtkmozembedmodule.cpp	1970-01-01 01:00:00.000000000 +0100
++++ gnome-python-extras-2.25.3/gtkmozembed/gtkmozembedmodule.cpp	2011-01-26 21:56:35.000000000 +0100
 @@ -0,0 +1,78 @@
 +#ifdef HAVE_CONFIG_H
 +#include "config.h"
@@ -224,35 +242,24 @@
 +        Py_FatalError ("can't initialise module gtkmozembed");
 +    }
 +}
---- a/gtkmozembed/gtkmozembedmodule.c
-+++ /dev/null
-@@ -1,29 +0,0 @@
--#ifdef HAVE_CONFIG_H
--#include "config.h"
--#endif
--
--/* include this first, before NO_IMPORT_PYGOBJECT is defined */
--#include <pygobject.h>
--
--void pygtkmozembed_register_classes (PyObject *d);
--void pygtkmozembed_add_constants(PyObject *module, const gchar *strip_prefix);
--
--extern PyMethodDef pygtkmozembed_functions[];
--
--DL_EXPORT(void)
--initgtkmozembed(void)
--{
--    PyObject *m, *d;
--
--    init_pygobject ();
--
--    m = Py_InitModule ("gtkmozembed", pygtkmozembed_functions);
--    d = PyModule_GetDict (m);
--
--    pygtkmozembed_register_classes (d);
--    pygtkmozembed_add_constants(m, "GTK_MOZ_EMBED_");
--
--    if (PyErr_Occurred ()) {
--        Py_FatalError ("can't initialise module gtkmozembed");
--    }
--}
+diff -pruN -x '*~' gnome-python-extras-2.25.3.orig/gtkmozembed/Makefile.am gnome-python-extras-2.25.3/gtkmozembed/Makefile.am
+--- gnome-python-extras-2.25.3.orig/gtkmozembed/Makefile.am	2008-12-12 02:06:29.000000000 +0100
++++ gnome-python-extras-2.25.3/gtkmozembed/Makefile.am	2011-01-26 21:56:35.000000000 +0100
+@@ -13,9 +13,15 @@ pkgpyexecdir = $(pyexecdir)/gtk-2.0
+ pkgpyexec_LTLIBRARIES = gtkmozembed.la
+ gtkmozembed_la_LDFLAGS = -module -avoid-version	\
+ 	-export-symbols-regex initgtkmozembed	\
+-	-R$(MOZILLA_HOME) -L$(MOZILLA_HOME)
++	$(NULL)
++
++# only use rpath for non-glue builds
++if !HAVE_XPCOM_GLUE
++       gtkmozembed_la_LDFLAGS + = -R$(MOZILLA_HOME) -L$(MOZILLA_HOME)
++endif
++
+ gtkmozembed_la_LIBADD = $(GTKMOZEMBED_LIBS)
+-gtkmozembed_la_SOURCES = gtkmozembedmodule.c
++gtkmozembed_la_SOURCES = gtkmozembedmodule.cpp
+ nodist_gtkmozembed_la_SOURCES = gtkmozembed.c
+ gtkmozembed.c: gtkmozembed.defs gtkmozembed.override
+ CLEANFILES = gtkmozembed.c

=== modified file 'debian/patches/04_use_PYTHON-config_check.patch'
--- debian/patches/04_use_PYTHON-config_check.patch	2009-05-12 08:42:44 +0000
+++ debian/patches/04_use_PYTHON-config_check.patch	2011-01-26 22:51:58 +0000
@@ -1,3 +1,7 @@
+From: Chris Coulson <[e-mail]>
+Description: Use python-config.
+Author: Daniel Holbach <[e-mail]>
+
 Index: gnome-python-extras-2.25.3-2ubuntu1/acinclude.m4
 ===================================================================
 --- gnome-python-extras-2.25.3-2ubuntu1.orig/acinclude.m4	2009-05-10 13:44:58.000000000 +0200

=== added file 'debian/patches/06_gda_libpython.patch'
--- debian/patches/06_gda_libpython.patch	1970-01-01 00:00:00 +0000
+++ debian/patches/06_gda_libpython.patch	2011-01-26 22:51:58 +0000
@@ -0,0 +1,13 @@
+Index: gnome-python-extras-2.25.3/gda/Makefile.am
+===================================================================
+--- gnome-python-extras-2.25.3.orig/gda/Makefile.am	2010-09-27 09:21:09.079973023 +0200
++++ gnome-python-extras-2.25.3/gda/Makefile.am	2010-09-27 09:22:06.295974778 +0200
+@@ -34,7 +34,7 @@ gda_la_CFLAGS = $(GDA_CFLAGS)
+ gda_la_LDFLAGS = $(common_ldflags)
+ # gda_la_LDFLAGS = $(common_ldflags) -export-symbols-regex initgda
+ 
+-gda_la_LIBADD = $(GDA_LIBS) $(PYTHON_LDFLAGS)
++gda_la_LIBADD = $(GDA_LIBS)
+ gda_la_SOURCES = gdamodule.c pygdavalue_conversions.c pygdavalue_conversions.h gdaglue.h
+ 
+ argtypesdir = $(datadir)/pygtk/2.0/argtypes

=== modified file 'debian/patches/series'
--- debian/patches/series	2010-11-25 15:08:54 +0000
+++ debian/patches/series	2011-01-26 22:51:58 +0000
@@ -4,4 +4,5 @@
 04_use_PYTHON-config_check.patch
 04_gdl_2.28.patch
 05_gdl_2.28_more.patch
+06_gda_libpython.patch
 10_python_m4.patch