[libglib-perl] 04/05: Refresh Debian patches.

Wed Jan 8 16:21:28 UTC 2014

This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch master
in repository libglib-perl.

commit 16ef9f8c2a836af5e6ff0afc68a0ecd30294733e
Author: intrigeri <intrigeri at boum.org>
Date:   Wed Jan 8 14:48:25 2014 +0000

    Refresh Debian patches.
---
 debian/patches/fix-man-pages           | 55 ++++++++++++++--------------------
 debian/patches/remove-version-checking |  4 +--
 2 files changed, 25 insertions(+), 34 deletions(-)

diff --git a/debian/patches/fix-man-pages b/debian/patches/fix-man-pages
index 3833c7f..c69d1e5 100644
--- a/debian/patches/fix-man-pages
+++ b/debian/patches/fix-man-pages
@@ -5,16 +5,7 @@ Author: Ryan Niebur <ryan at debian.org>
 
 --- a/GParamSpec.xs
 +++ b/GParamSpec.xs
-@@ -25,7 +25,7 @@
- /*
-  * this isn't already done for us.  :-(
-  *
-- * interestingly, the obvious G_TYPE_PARAM_FLAGS is taken by the 
-+ * interestingly, the obvious G_TYPE_PARAM_FLAGS is taken by the
-  * GParamSpecFlags.
-  */
- 
-@@ -109,7 +109,7 @@
+@@ -83,7 +83,7 @@
  	if (g_str_equal ((const char *) value, fd->package)) {
  		fd->found_type = (GType) key;
  		return TRUE;
@@ -23,7 +14,7 @@ Author: Ryan Niebur <ryan at debian.org>
  		return FALSE;
  }
  #else
-@@ -211,6 +211,8 @@
+@@ -185,6 +185,8 @@
  
  MODULE = Glib::ParamSpec	PACKAGE = Glib::ParamSpec	PREFIX = g_param_spec_
  
@@ -32,7 +23,7 @@ Author: Ryan Niebur <ryan at debian.org>
  void
  DESTROY (GParamSpec * pspec)
      CODE:
-@@ -224,12 +226,12 @@
+@@ -198,12 +200,12 @@
  You will see these most often when creating new Glib::Object types; see
  C<< Glib::Type->register >> and L<Glib::Object::Subclass>.
  
@@ -47,7 +38,7 @@ Author: Ryan Niebur <ryan at debian.org>
  object parameters.
  
  It's worth noting that Glib offers various sizes of integer and floating
-@@ -307,9 +309,9 @@
+@@ -280,9 +282,9 @@
  ### the right sizes).
  ###
  
@@ -60,7 +51,7 @@ Author: Ryan Niebur <ryan at debian.org>
  GParamSpec*
  IV (class, name, nick, blurb, minimum, maximum, default_value, flags)
  	const gchar *name
-@@ -347,7 +349,7 @@
+@@ -320,7 +322,7 @@
      OUTPUT:
  	RETVAL
  
@@ -69,7 +60,7 @@ Author: Ryan Niebur <ryan at debian.org>
  GParamSpec*
  g_param_spec_int64 (class, name, nick, blurb, minimum, maximum, default_value, flags)
  	const gchar *name
-@@ -360,9 +362,9 @@
+@@ -333,9 +335,9 @@
       C_ARGS:
   	name, nick, blurb, minimum, maximum, default_value, flags
  
@@ -82,7 +73,7 @@ Author: Ryan Niebur <ryan at debian.org>
  GParamSpec*
  UV (class, name, nick, blurb, minimum, maximum, default_value, flags)
  	const gchar *name
-@@ -400,7 +402,7 @@
+@@ -373,7 +375,7 @@
      OUTPUT:
  	RETVAL
  
@@ -91,7 +82,7 @@ Author: Ryan Niebur <ryan at debian.org>
  GParamSpec*
  g_param_spec_uint64 (class, name, nick, blurb, minimum, maximum, default_value, flags)
  	const gchar *name
-@@ -413,7 +415,7 @@
+@@ -386,7 +388,7 @@
      C_ARGS:
  	name, nick, blurb, minimum, maximum, default_value, flags
  
@@ -100,7 +91,7 @@ Author: Ryan Niebur <ryan at debian.org>
  GParamSpec*
  g_param_spec_boolean (class, name, nick, blurb, default_value, flags)
  	const gchar *name
-@@ -425,13 +427,13 @@
+@@ -398,13 +400,13 @@
  	name, nick, blurb, default_value, flags
  
  
@@ -117,7 +108,7 @@ Author: Ryan Niebur <ryan at debian.org>
  GParamSpec*
  g_param_spec_enum (class, const gchar *name, const gchar *nick, const gchar *blurb, const char * enum_type, SV * default_value, GParamFlags flags)
      PREINIT:
-@@ -445,9 +447,9 @@
+@@ -418,9 +420,9 @@
  	                            gperl_convert_enum (gtype, default_value),
  	                            flags);
      OUTPUT:
@@ -129,7 +120,7 @@ Author: Ryan Niebur <ryan at debian.org>
  GParamSpec*
  g_param_spec_flags (class, const gchar *name, const gchar *nick, const gchar *blurb, const char * flags_type, SV * default_value, GParamFlags flags)
      PREINIT:
-@@ -461,11 +463,11 @@
+@@ -434,11 +436,11 @@
  	                             gperl_convert_flags (gtype, default_value),
  	                             flags);
      OUTPUT:
@@ -144,7 +135,7 @@ Author: Ryan Niebur <ryan at debian.org>
  GParamSpec*
  g_param_spec_double (class, name, nick, blurb, minimum, maximum, default_value, flags)
  	const gchar *name
-@@ -489,7 +491,7 @@
+@@ -462,7 +464,7 @@
      OUTPUT:
  	RETVAL
  
@@ -153,7 +144,7 @@ Author: Ryan Niebur <ryan at debian.org>
  ##
  ## "default_value" can be NULL.  Not actually described in the docs as
  ## of 2.18, but used that way in lots of the builtin classes
-@@ -504,9 +506,9 @@
+@@ -477,9 +479,9 @@
      C_ARGS:
  	name, nick, blurb, default_value, flags
  
@@ -166,7 +157,7 @@ Author: Ryan Niebur <ryan at debian.org>
  
  =for apidoc object
  =for arg package name of the class, derived from Glib::Object, of the objects this property will hold.
-@@ -577,11 +579,11 @@
+@@ -550,11 +552,11 @@
  
  ### plain pointers are dangerous, and i don't even know how you'd create
  ### them from perl since there are no pointers in perl (references are SVs)
@@ -181,7 +172,7 @@ Author: Ryan Niebur <ryan at debian.org>
  
  
  #if GLIB_CHECK_VERSION(2, 4, 0)
-@@ -916,7 +918,7 @@
+@@ -891,7 +893,7 @@
   ## similarly, all unsigned integer types
  
  
@@ -190,7 +181,7 @@ Author: Ryan Niebur <ryan at debian.org>
  
  =for position post_hierarchy
  
-@@ -987,7 +989,7 @@
+@@ -962,7 +964,7 @@
  
  MODULE = Glib::ParamSpec	PACKAGE = Glib::Param::Int64
  
@@ -199,7 +190,7 @@ Author: Ryan Niebur <ryan at debian.org>
  
  =head1 DESCRIPTION
  
-@@ -1014,7 +1016,7 @@
+@@ -989,7 +991,7 @@
  
  MODULE = Glib::ParamSpec	PACKAGE = Glib::Param::UInt64
  
@@ -208,7 +199,7 @@ Author: Ryan Niebur <ryan at debian.org>
  
  =head1 DESCRIPTION
  
-@@ -1043,7 +1045,7 @@
+@@ -1018,7 +1020,7 @@
  
   ## and again for the floating-point types
  
@@ -217,7 +208,7 @@ Author: Ryan Niebur <ryan at debian.org>
  
  =for position post_hierarchy
  
-@@ -1062,6 +1064,21 @@
+@@ -1037,6 +1039,21 @@
  
  =cut
  
@@ -239,7 +230,7 @@ Author: Ryan Niebur <ryan at debian.org>
  =for see_also Glib::ParamSpec
  =cut
  
-@@ -1147,6 +1164,8 @@
+@@ -1122,6 +1139,8 @@
  
  #if GLIB_CHECK_VERSION(2, 10, 0)
  
@@ -250,7 +241,7 @@ Author: Ryan Niebur <ryan at debian.org>
  =head1 DESCRIPTION
 --- a/GType.xs
 +++ b/GType.xs
-@@ -2662,6 +2662,8 @@
+@@ -2746,6 +2746,8 @@
  
  MODULE = Glib::Type	PACKAGE = Glib::Flags
  
@@ -261,7 +252,7 @@ Author: Ryan Niebur <ryan at debian.org>
  =head1 DESCRIPTION
 --- a/GUtils.xs
 +++ b/GUtils.xs
-@@ -489,6 +489,9 @@
+@@ -469,6 +469,9 @@
  
  MODULE = Glib::Utils	PACKAGE = Glib::Markup	PREFIX = g_markup_
  
@@ -273,7 +264,7 @@ Author: Ryan Niebur <ryan at debian.org>
  # gchar* g_markup_escape_text (const gchar *text, gssize length);
 --- a/GOption.xs
 +++ b/GOption.xs
-@@ -660,6 +660,14 @@
+@@ -610,6 +610,14 @@
  	gperl_register_fundamental (GPERL_TYPE_OPTION_ARG, "Glib::OptionArg");
  	gperl_register_fundamental (GPERL_TYPE_OPTION_FLAGS, "Glib::OptionFlags");
  
diff --git a/debian/patches/remove-version-checking b/debian/patches/remove-version-checking
index 76257b1..0d04623 100644
--- a/debian/patches/remove-version-checking
+++ b/debian/patches/remove-version-checking
@@ -5,7 +5,7 @@ Author: Ryan Niebur <ryan at debian.org>
 
 --- a/Glib.xs
 +++ b/Glib.xs
-@@ -429,6 +429,7 @@
+@@ -472,6 +472,7 @@
  #endif /* GLIB_CHECK_VERSION (2, 12, 0) */
  	/* make sure that we're running/linked against a version at least as 
  	 * new as we built against, otherwise bad things will happen. */
@@ -13,7 +13,7 @@ Author: Ryan Niebur <ryan at debian.org>
  	if ((((int)glib_major_version) < GLIB_MAJOR_VERSION)
  	    ||
  	    (glib_major_version == GLIB_MAJOR_VERSION && 
-@@ -442,6 +443,7 @@
+@@ -485,6 +486,7 @@
  		      " old.  We'll continue, but expect problems!\n",
  		    GLIB_MAJOR_VERSION, GLIB_MINOR_VERSION, GLIB_MICRO_VERSION,
  		    glib_major_version, glib_minor_version, glib_micro_version);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libglib-perl.git

