[SCM] Debian packaging of libglib-perl branch, master, updated. debian/2%1.224-1-5-gb4049b8
Alessandro Ghedini
al3xbio at gmail.com
Fri Oct 14 11:26:19 UTC 2011
The following commit has been merged in the master branch:
commit b55c1cfe171e46fdd05f7f55683848496f85a062
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date: Fri Oct 14 13:09:37 2011 +0200
Refresh and update patches
diff --git a/debian/patches/fix-gtks-whatis b/debian/patches/fix-gtks-whatis
index fb63349..9eadcad 100644
--- a/debian/patches/fix-gtks-whatis
+++ b/debian/patches/fix-gtks-whatis
@@ -5,9 +5,9 @@ Description: if a man page doesn't have a whatis, try to figure out
Forwarded: no
Author: Ryan Niebur <ryan at debian.org>
---- a/GenPod.pm
-+++ b/GenPod.pm
-@@ -276,7 +276,15 @@
+--- a/lib/Glib/GenPod.pm
++++ b/lib/Glib/GenPod.pm
+@@ -278,7 +278,15 @@
# end. But all the other =head1 below need a closing =cut.
print "=head1 NAME\n\n$package";
@@ -24,7 +24,7 @@ Author: Ryan Niebur <ryan at debian.org>
print "\n\n=cut\n\n";
# pods , position
-@@ -999,6 +1007,8 @@
+@@ -1157,6 +1165,8 @@
sub set_main_mod {
$MAIN_MOD = shift;
@@ -33,7 +33,7 @@ Author: Ryan Niebur <ryan at debian.org>
}
sub preprocess_pod
-@@ -1365,6 +1375,27 @@
+@@ -1523,6 +1533,27 @@
} while (@dirs);
}
diff --git a/debian/patches/fix-man-pages b/debian/patches/fix-man-pages
index f0e937f..3833c7f 100644
--- a/debian/patches/fix-man-pages
+++ b/debian/patches/fix-man-pages
@@ -5,7 +5,25 @@ Author: Ryan Niebur <ryan at debian.org>
--- a/GParamSpec.xs
+++ b/GParamSpec.xs
-@@ -210,6 +210,8 @@
+@@ -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 @@
+ if (g_str_equal ((const char *) value, fd->package)) {
+ fd->found_type = (GType) key;
+ return TRUE;
+- } else
++ } else
+ return FALSE;
+ }
+ #else
+@@ -211,6 +211,8 @@
MODULE = Glib::ParamSpec PACKAGE = Glib::ParamSpec PREFIX = g_param_spec_
@@ -14,16 +32,165 @@ Author: Ryan Niebur <ryan at debian.org>
void
DESTROY (GParamSpec * pspec)
CODE:
-@@ -805,7 +807,7 @@
+@@ -224,12 +226,12 @@
+ You will see these most often when creating new Glib::Object types; see
+ C<< Glib::Type->register >> and L<Glib::Object::Subclass>.
+
+-Parameter specifications allow you to provide limits for validation as
++Parameter specifications allow you to provide limits for validation as
+ well as nicknames and blurbs to document the parameters. Blurbs show up
+ in reference documentation such as this page or the gtk+ C API reference;
+ i'm not really sure where the nicknames get used. The Perl bindings for
+ the most part ignore the difference between dashes and underscores in
+-the paramspec names, which typically find use as the actual keys for
++the paramspec names, which typically find use as the actual keys for
+ object parameters.
+
+ It's worth noting that Glib offers various sizes of integer and floating
+@@ -307,9 +309,9 @@
+ ### the right sizes).
+ ###
+
+-## GParamSpec* g_param_spec_char (const gchar *name, const gchar *nick, const gchar *blurb, gint8 minimum, gint8 maximum, gint8 default_value, GParamFlags flags)
+-## GParamSpec* g_param_spec_int (const gchar *name, const gchar *nick, const gchar *blurb, gint minimum, gint maximum, gint default_value, GParamFlags flags)
+-## GParamSpec* g_param_spec_long (const gchar *name, const gchar *nick, const gchar *blurb, glong minimum, glong maximum, glong default_value, GParamFlags flags)
++## GParamSpec* g_param_spec_char (const gchar *name, const gchar *nick, const gchar *blurb, gint8 minimum, gint8 maximum, gint8 default_value, GParamFlags flags)
++## GParamSpec* g_param_spec_int (const gchar *name, const gchar *nick, const gchar *blurb, gint minimum, gint maximum, gint default_value, GParamFlags flags)
++## GParamSpec* g_param_spec_long (const gchar *name, const gchar *nick, const gchar *blurb, glong minimum, glong maximum, glong default_value, GParamFlags flags)
+ GParamSpec*
+ IV (class, name, nick, blurb, minimum, maximum, default_value, flags)
+ const gchar *name
+@@ -347,7 +349,7 @@
+ OUTPUT:
+ RETVAL
+
+-## GParamSpec* g_param_spec_int64 (const gchar *name, const gchar *nick, const gchar *blurb, gint64 minimum, gint64 maximum, gint64 default_value, GParamFlags flags)
++## GParamSpec* g_param_spec_int64 (const gchar *name, const gchar *nick, const gchar *blurb, gint64 minimum, gint64 maximum, gint64 default_value, GParamFlags flags)
+ GParamSpec*
+ g_param_spec_int64 (class, name, nick, blurb, minimum, maximum, default_value, flags)
+ const gchar *name
+@@ -360,9 +362,9 @@
+ C_ARGS:
+ name, nick, blurb, minimum, maximum, default_value, flags
+
+-## GParamSpec* g_param_spec_uchar (const gchar *name, const gchar *nick, const gchar *blurb, guint8 minimum, guint8 maximum, guint8 default_value, GParamFlags flags)
+-## GParamSpec* g_param_spec_uint (const gchar *name, const gchar *nick, const gchar *blurb, guint minimum, guint maximum, guint default_value, GParamFlags flags)
+-## GParamSpec* g_param_spec_ulong (const gchar *name, const gchar *nick, const gchar *blurb, gulong minimum, gulong maximum, gulong default_value, GParamFlags flags)
++## GParamSpec* g_param_spec_uchar (const gchar *name, const gchar *nick, const gchar *blurb, guint8 minimum, guint8 maximum, guint8 default_value, GParamFlags flags)
++## GParamSpec* g_param_spec_uint (const gchar *name, const gchar *nick, const gchar *blurb, guint minimum, guint maximum, guint default_value, GParamFlags flags)
++## GParamSpec* g_param_spec_ulong (const gchar *name, const gchar *nick, const gchar *blurb, gulong minimum, gulong maximum, gulong default_value, GParamFlags flags)
+ GParamSpec*
+ UV (class, name, nick, blurb, minimum, maximum, default_value, flags)
+ const gchar *name
+@@ -400,7 +402,7 @@
+ OUTPUT:
+ RETVAL
+
+-## GParamSpec* g_param_spec_uint64 (const gchar *name, const gchar *nick, const gchar *blurb, guint64 minimum, guint64 maximum, guint64 default_value, GParamFlags flags)
++## GParamSpec* g_param_spec_uint64 (const gchar *name, const gchar *nick, const gchar *blurb, guint64 minimum, guint64 maximum, guint64 default_value, GParamFlags flags)
+ GParamSpec*
+ g_param_spec_uint64 (class, name, nick, blurb, minimum, maximum, default_value, flags)
+ const gchar *name
+@@ -413,7 +415,7 @@
+ C_ARGS:
+ name, nick, blurb, minimum, maximum, default_value, flags
+
+-## GParamSpec* g_param_spec_boolean (const gchar *name, const gchar *nick, const gchar *blurb, gboolean default_value, GParamFlags flags)
++## GParamSpec* g_param_spec_boolean (const gchar *name, const gchar *nick, const gchar *blurb, gboolean default_value, GParamFlags flags)
+ GParamSpec*
+ g_param_spec_boolean (class, name, nick, blurb, default_value, flags)
+ const gchar *name
+@@ -425,13 +427,13 @@
+ name, nick, blurb, default_value, flags
+
+
+-### GParamSpec* g_param_spec_unichar (const gchar *name, const gchar *nick, const gchar *blurb, gunichar default_value, GParamFlags flags)
++### GParamSpec* g_param_spec_unichar (const gchar *name, const gchar *nick, const gchar *blurb, gunichar default_value, GParamFlags flags)
+ GParamSpec*
+-g_param_spec_unichar (class, const gchar *name, const gchar *nick, const gchar *blurb, gunichar default_value, GParamFlags flags)
++g_param_spec_unichar (class, const gchar *name, const gchar *nick, const gchar *blurb, gunichar default_value, GParamFlags flags)
+ C_ARGS:
+ name, nick, blurb, default_value, flags
+
+-### GParamSpec* g_param_spec_enum (const gchar *name, const gchar *nick, const gchar *blurb, GType enum_type, gint default_value, GParamFlags flags)
++### GParamSpec* g_param_spec_enum (const gchar *name, const gchar *nick, const gchar *blurb, GType enum_type, gint default_value, GParamFlags flags)
+ 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 @@
+ gperl_convert_enum (gtype, default_value),
+ flags);
+ OUTPUT:
+- RETVAL
++ RETVAL
+
+-### GParamSpec* g_param_spec_flags (const gchar *name, const gchar *nick, const gchar *blurb, GType flags_type, guint default_value, GParamFlags flags)
++### GParamSpec* g_param_spec_flags (const gchar *name, const gchar *nick, const gchar *blurb, GType flags_type, guint default_value, GParamFlags flags)
+ 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 @@
+ gperl_convert_flags (gtype, default_value),
+ flags);
+ OUTPUT:
+- RETVAL
++ RETVAL
+
+
+-## GParamSpec* g_param_spec_float (const gchar *name, const gchar *nick, const gchar *blurb, gfloat minimum, gfloat maximum, gfloat default_value, GParamFlags flags)
+-## GParamSpec* g_param_spec_double (const gchar *name, const gchar *nick, const gchar *blurb, gdouble minimum, gdouble maximum, gdouble default_value, GParamFlags flags)
++## GParamSpec* g_param_spec_float (const gchar *name, const gchar *nick, const gchar *blurb, gfloat minimum, gfloat maximum, gfloat default_value, GParamFlags flags)
++## GParamSpec* g_param_spec_double (const gchar *name, const gchar *nick, const gchar *blurb, gdouble minimum, gdouble maximum, gdouble default_value, GParamFlags flags)
+ GParamSpec*
+ g_param_spec_double (class, name, nick, blurb, minimum, maximum, default_value, flags)
+ const gchar *name
+@@ -489,7 +491,7 @@
+ OUTPUT:
+ RETVAL
+
+-## GParamSpec* g_param_spec_string (const gchar *name, const gchar *nick, const gchar *blurb, const gchar *default_value, GParamFlags flags)
++## GParamSpec* g_param_spec_string (const gchar *name, const gchar *nick, const gchar *blurb, const gchar *default_value, GParamFlags flags)
+ ##
+ ## "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 @@
+ C_ARGS:
+ name, nick, blurb, default_value, flags
+
+-### GParamSpec* g_param_spec_param (const gchar *name, const gchar *nick, const gchar *blurb, GType param_type, GParamFlags flags)
+-## GParamSpec* g_param_spec_boxed (const gchar *name, const gchar *nick, const gchar *blurb, GType boxed_type, GParamFlags flags)
+-## GParamSpec* g_param_spec_object (const gchar *name, const gchar *nick, const gchar *blurb, GType object_type, GParamFlags flags)
++### GParamSpec* g_param_spec_param (const gchar *name, const gchar *nick, const gchar *blurb, GType param_type, GParamFlags flags)
++## GParamSpec* g_param_spec_boxed (const gchar *name, const gchar *nick, const gchar *blurb, GType boxed_type, GParamFlags flags)
++## GParamSpec* g_param_spec_object (const gchar *name, const gchar *nick, const gchar *blurb, GType object_type, GParamFlags flags)
+
+ =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 @@
+
+ ### 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)
+-## GParamSpec* g_param_spec_pointer (const gchar *name, const gchar *nick, const gchar *blurb, GParamFlags flags)
++## GParamSpec* g_param_spec_pointer (const gchar *name, const gchar *nick, const gchar *blurb, GParamFlags flags)
+
+-#### we don't have full pspec support, and probably don't really need
++#### we don't have full pspec support, and probably don't really need
+ #### value arrays.
+-### GParamSpec* g_param_spec_value_array (const gchar *name, const gchar *nick, const gchar *blurb, GParamSpec *element_spec, GParamFlags flags)
++### GParamSpec* g_param_spec_value_array (const gchar *name, const gchar *nick, const gchar *blurb, GParamSpec *element_spec, GParamFlags flags)
+
+
+ #if GLIB_CHECK_VERSION(2, 4, 0)
+@@ -916,7 +918,7 @@
## similarly, all unsigned integer types
-=for object Glib::Param::UInt
+=for object Glib::Param::UInt Wrapper for uint parameters in GLib
- =head1 DESCRIPTION
+ =for position post_hierarchy
-@@ -899,7 +901,7 @@
+@@ -987,7 +989,7 @@
MODULE = Glib::ParamSpec PACKAGE = Glib::Param::Int64
@@ -32,7 +199,7 @@ Author: Ryan Niebur <ryan at debian.org>
=head1 DESCRIPTION
-@@ -938,7 +940,7 @@
+@@ -1014,7 +1016,7 @@
MODULE = Glib::ParamSpec PACKAGE = Glib::Param::UInt64
@@ -41,68 +208,49 @@ Author: Ryan Niebur <ryan at debian.org>
=head1 DESCRIPTION
-@@ -979,7 +981,7 @@
+@@ -1043,7 +1045,7 @@
## and again for the floating-point types
-=for object Glib::Param::Double
+=for object Glib::Param::Double Wrapper for double parameters in GLib
- =head1 DESCRIPTION
+ =for position post_hierarchy
-@@ -1081,6 +1083,9 @@
+@@ -1062,6 +1064,21 @@
=cut
+=for object Glib::Param::Boolean Wrapper for boolean parameters in GLib
+=cut
+
- =for see_also Glib::ParamSpec
- =cut
-
-@@ -1102,6 +1107,9 @@
-
- =cut
-
+=for object Glib::Param::Enum Wrapper for enum parameters in GLib
+=cut
+
- =for see_also Glib::ParamSpec
- =cut
-
-@@ -1136,6 +1144,9 @@
-
- =cut
-
+=for object Glib::Param::Flags Wrapper for flag parameters in GLib
+=cut
+
- =for see_also Glib::ParamSpec
- =cut
-
-@@ -1171,6 +1182,9 @@
-
- =cut
-
+=for object Glib::Param::String Wrapper for string parameters in GLib
+=cut
+
++=for object Glib::Param::Unichar Wrapper for unichar parameters in GLib
++=cut
++
=for see_also Glib::ParamSpec
=cut
-@@ -1199,6 +1213,9 @@
+@@ -1147,6 +1164,8 @@
- =cut
+ #if GLIB_CHECK_VERSION(2, 10, 0)
-+=for object Glib::Param::Unichar Wrapper for unichar parameters in GLib
-+=cut
++=for object Glib::Param::GType - Paramspecs for glib types
+
- =for see_also Glib::ParamSpec
- =cut
+ =for section DESCRIPTION
+ =head1 DESCRIPTION
--- a/GType.xs
+++ b/GType.xs
-@@ -2741,6 +2741,8 @@
+@@ -2662,6 +2662,8 @@
MODULE = Glib::Type PACKAGE = Glib::Flags
@@ -125,7 +273,7 @@ Author: Ryan Niebur <ryan at debian.org>
# gchar* g_markup_escape_text (const gchar *text, gssize length);
--- a/GOption.xs
+++ b/GOption.xs
-@@ -652,6 +652,14 @@
+@@ -660,6 +660,14 @@
gperl_register_fundamental (GPERL_TYPE_OPTION_ARG, "Glib::OptionArg");
gperl_register_fundamental (GPERL_TYPE_OPTION_FLAGS, "Glib::OptionFlags");
@@ -140,8 +288,8 @@ Author: Ryan Niebur <ryan at debian.org>
=for position SYNOPSIS
=head1 SYNOPSIS
---- a/MakeHelper.pm
-+++ b/MakeHelper.pm
+--- a/lib/Glib/MakeHelper.pm
++++ b/lib/Glib/MakeHelper.pm
@@ -440,7 +440,7 @@
\$(INST_LIB)/\$(FULLEXT)/index.pod :: \$(INST_LIB)/\$(FULLEXT)/ build/podindex
diff --git a/debian/patches/fix-pod-spelling.patch b/debian/patches/fix-pod-spelling.patch
index b334cc3..6557aa6 100644
--- a/debian/patches/fix-pod-spelling.patch
+++ b/debian/patches/fix-pod-spelling.patch
@@ -29,7 +29,7 @@ Author: Jonathan Yu <jawnsy at cpan.org>
--- a/GObject.xs
+++ b/GObject.xs
-@@ -1601,7 +1601,7 @@
+@@ -1699,7 +1699,7 @@
=for apidoc
=for arg all if FALSE (or omitted) tie only properties for this object's class, if TRUE tie the properties of this and all parent classes.
@@ -38,8 +38,8 @@ Author: Jonathan Yu <jawnsy at cpan.org>
facilities to associate hash keys with the properties of the object. For
example:
---- a/MakeHelper.pm
-+++ b/MakeHelper.pm
+--- a/lib/Glib/MakeHelper.pm
++++ b/lib/Glib/MakeHelper.pm
@@ -228,7 +228,7 @@
list of files that need to be created before the doc.pl step is run, include
files.
diff --git a/debian/patches/remove-version-checking b/debian/patches/remove-version-checking
index 02b4f36..217b41a 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
-@@ -393,6 +393,7 @@
+@@ -407,6 +407,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 &&
-@@ -406,6 +407,7 @@
+@@ -420,6 +421,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);
--
Debian packaging of libglib-perl
More information about the Pkg-perl-cvs-commits
mailing list