r43006 - in /desktop/unstable/pygobject/debian: changelog patches/01_cairo_region.patch patches/Add-protection-against-attempts-at-importing-static-.patch patches/series

[mpitt at users.alioth.debian.org]

Author: mpitt
Date: Tue Sep 23 05:20:37 2014
New Revision: 43006

URL: http://svn.debian.org/wsvn/pkg-gnome/?sc=1&rev=43006
Log:
new upstream release 3.14.0, adjust patches

Removed:
    desktop/unstable/pygobject/debian/patches/Add-protection-against-attempts-at-importing-static-.patch
Modified:
    desktop/unstable/pygobject/debian/changelog
    desktop/unstable/pygobject/debian/patches/01_cairo_region.patch
    desktop/unstable/pygobject/debian/patches/series

Modified: desktop/unstable/pygobject/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/changelog?rev=43006&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/changelog	[utf-8] (original)
+++ desktop/unstable/pygobject/debian/changelog	[utf-8] Tue Sep 23 05:20:37 2014
@@ -1,3 +1,12 @@
+pygobject (3.14.0-1) UNRELEASED; urgency=medium
+
+  * New upstream release.
+  * Drop Add-protection-against-attempts-at-importing-static-.patch, included
+    in this version.
+  * Refresh 01_cairo_region.patch to apply to this version.
+
+ -- Martin Pitt <mpitt at debian.org>  Tue, 23 Sep 2014 07:18:31 +0200
+
 pygobject (3.12.2-1) unstable; urgency=medium
 
   * New upstream release

Modified: desktop/unstable/pygobject/debian/patches/01_cairo_region.patch
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/01_cairo_region.patch?rev=43006&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/01_cairo_region.patch	[utf-8] (original)
+++ desktop/unstable/pygobject/debian/patches/01_cairo_region.patch	[utf-8] Tue Sep 23 05:20:37 2014
@@ -12,13 +12,13 @@
  gi/pygi-foreign-cairo.c |   44 ++++++++++++++++++++++++++++++++++++++++++++
  1 file changed, 44 insertions(+)
 
-Index: pygobject-3.7.5.1/gi/pygi-foreign-cairo.c
+Index: pygobject/gi/pygi-foreign-cairo.c
 ===================================================================
---- pygobject-3.7.5.1.orig/gi/pygi-foreign-cairo.c	2013-02-11 08:57:38.694078604 +0100
-+++ pygobject-3.7.5.1/gi/pygi-foreign-cairo.c	2013-02-11 09:08:43.154048264 +0100
-@@ -185,6 +185,46 @@
-     Py_RETURN_NONE;
+--- pygobject.orig/gi/pygi-foreign-cairo.c
++++ pygobject/gi/pygi-foreign-cairo.c
+@@ -368,6 +368,46 @@ cairo_pattern_from_gvalue (const GValue
  }
+ 
  
 +#if PY_VERSION_HEX >= 0x03000000
 +static PyObject *
@@ -63,11 +63,10 @@
  static PyMethodDef _gi_cairo_functions[] = { {0,} };
  PYGLIB_MODULE_START(_gi_cairo, "_gi_cairo")
  {
-@@ -220,5 +260,13 @@
-                                   cairo_font_options_to_arg,
+@@ -406,6 +446,14 @@ PYGLIB_MODULE_START(_gi_cairo, "_gi_cair
                                    cairo_font_options_from_arg,
                                    cairo_font_options_release);
-+
+ 
 +#if PY_VERSION_HEX >= 0x03000000
 +    pygi_register_foreign_struct ("cairo",
 +                                  "Region",
@@ -75,5 +74,7 @@
 +                                  cairo_region_from_arg,
 +                                  cairo_region_release);
 +#endif
- }
- PYGLIB_MODULE_END;
++
+     pyg_register_gtype_custom (CAIRO_GOBJECT_TYPE_CONTEXT,
+                                cairo_context_from_gvalue,
+                                cairo_context_to_gvalue);

Modified: desktop/unstable/pygobject/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-gnome/desktop/unstable/pygobject/debian/patches/series?rev=43006&op=diff
==============================================================================
--- desktop/unstable/pygobject/debian/patches/series	[utf-8] (original)
+++ desktop/unstable/pygobject/debian/patches/series	[utf-8] Tue Sep 23 05:20:37 2014
@@ -1,2 +1 @@
 01_cairo_region.patch
-Add-protection-against-attempts-at-importing-static-.patch