This is an automated email from the git hooks/post-receive script. intrigeri pushed a commit to branch master in repository libglib-perl.
commit ffab8060417e075bf2aa133317e160afb9b49d49 Author: intrigeri <[email protected]> Date: Mon Aug 10 13:01:48 2015 +0000 debian/patches: split fix-man-pages into Add-missing-information-to-POD.patch and Properly-escape-dash-in-generated-POD.patch, and drop white-space unrelated changes. --- .../patches/Add-missing-information-to-POD.patch | 137 ++++++++++ .../Properly-escape-dash-in-generated-POD.patch | 21 ++ debian/patches/fix-man-pages | 292 --------------------- debian/patches/series | 3 +- 4 files changed, 160 insertions(+), 293 deletions(-) diff --git a/debian/patches/Add-missing-information-to-POD.patch b/debian/patches/Add-missing-information-to-POD.patch new file mode 100644 index 0000000..a04b04e --- /dev/null +++ b/debian/patches/Add-missing-information-to-POD.patch @@ -0,0 +1,137 @@ +From: intrigeri <[email protected]> +Date: Mon, 10 Aug 2015 12:56:44 +0000 +Subject: Add missing information to POD. + +--- + GOption.xs | 8 ++++++++ + GParamSpec.xs | 27 +++++++++++++++++++++++---- + GType.xs | 2 ++ + GUtils.xs | 3 +++ + 4 files changed, 36 insertions(+), 4 deletions(-) + +diff --git a/GOption.xs b/GOption.xs +index cae3b6b..4c19e62 100644 +--- a/GOption.xs ++++ b/GOption.xs +@@ -610,6 +610,14 @@ BOOT: + gperl_register_fundamental (GPERL_TYPE_OPTION_ARG, "Glib::OptionArg"); + gperl_register_fundamental (GPERL_TYPE_OPTION_FLAGS, "Glib::OptionFlags"); + ++=for object Glib::OptionContext defines options accepted by the commandline option parser ++ ++=cut ++ ++=for object Glib::OptionGroup group of options for command line option parsing ++ ++=cut ++ + =for position SYNOPSIS + + =head1 SYNOPSIS +diff --git a/GParamSpec.xs b/GParamSpec.xs +index 909deb5..4f94891 100644 +--- a/GParamSpec.xs ++++ b/GParamSpec.xs +@@ -185,6 +185,8 @@ SvGParamSpec (SV * sv) + + MODULE = Glib::ParamSpec PACKAGE = Glib::ParamSpec PREFIX = g_param_spec_ + ++=for object Glib::ParamSpec Wrapper to encapsulate metadate needed to specify parameters ++ + void + DESTROY (GParamSpec * pspec) + CODE: +@@ -891,7 +893,7 @@ MODULE = Glib::ParamSpec PACKAGE = Glib::Param::UChar + ## similarly, all unsigned integer types + + +-=for object Glib::Param::UInt ++=for object Glib::Param::UInt Wrapper for uint parameters in GLib + + =for position post_hierarchy + +@@ -962,7 +964,7 @@ get_maximum (GParamSpec * pspec) + + MODULE = Glib::ParamSpec PACKAGE = Glib::Param::Int64 + +-=for object Glib::Param::Int64 ++=for object Glib::Param::Int64 Wrapper for int64 parameters in GLib + + =head1 DESCRIPTION + +@@ -989,7 +991,7 @@ get_maximum (GParamSpec * pspec) + + MODULE = Glib::ParamSpec PACKAGE = Glib::Param::UInt64 + +-=for object Glib::Param::UInt64 ++=for object Glib::Param::UInt64 Wrapper for uint64 parameters in GLib + + =head1 DESCRIPTION + +@@ -1018,7 +1020,7 @@ MODULE = Glib::ParamSpec PACKAGE = Glib::Param::Float + + ## and again for the floating-point types + +-=for object Glib::Param::Double ++=for object Glib::Param::Double Wrapper for double parameters in GLib + + =for position post_hierarchy + +@@ -1037,6 +1039,21 @@ determines the data value range. + + =cut + ++=for object Glib::Param::Boolean Wrapper for boolean parameters in GLib ++=cut ++ ++=for object Glib::Param::Enum Wrapper for enum parameters in GLib ++=cut ++ ++=for object Glib::Param::Flags Wrapper for flag parameters in GLib ++=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 + +@@ -1122,6 +1139,8 @@ MODULE = Glib::ParamSpec PACKAGE = Glib::Param::GType + + #if GLIB_CHECK_VERSION(2, 10, 0) + ++=for object Glib::Param::GType - Paramspecs for glib types ++ + =for section DESCRIPTION + + =head1 DESCRIPTION +diff --git a/GType.xs b/GType.xs +index 142eb55..a957431 100644 +--- a/GType.xs ++++ b/GType.xs +@@ -2746,6 +2746,8 @@ package_from_cname (class, const char * cname) + + MODULE = Glib::Type PACKAGE = Glib::Flags + ++=for object Glib::Flags Overloaded operators representing GLib flags ++ + =for position DESCRIPTION + + =head1 DESCRIPTION +diff --git a/GUtils.xs b/GUtils.xs +index c59f704..b5c669b 100644 +--- a/GUtils.xs ++++ b/GUtils.xs +@@ -469,6 +469,9 @@ CHECK_VERSION (class, guint required_major, guint required_minor, guint required + + MODULE = Glib::Utils PACKAGE = Glib::Markup PREFIX = g_markup_ + ++=for object Glib::Markup Wrapper for markup handling functions in GLib ++=cut ++ + =for apidoc __function__ + =cut + # gchar* g_markup_escape_text (const gchar *text, gssize length); diff --git a/debian/patches/Properly-escape-dash-in-generated-POD.patch b/debian/patches/Properly-escape-dash-in-generated-POD.patch new file mode 100644 index 0000000..f441264 --- /dev/null +++ b/debian/patches/Properly-escape-dash-in-generated-POD.patch @@ -0,0 +1,21 @@ +From: intrigeri <[email protected]> +Date: Mon, 10 Aug 2015 12:59:29 +0000 +Subject: Properly escape dash in generated POD. + +--- + lib/Glib/MakeHelper.pm | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) + +diff --git a/lib/Glib/MakeHelper.pm b/lib/Glib/MakeHelper.pm +index 51e2c4a..30f7041 100644 +--- a/lib/Glib/MakeHelper.pm ++++ b/lib/Glib/MakeHelper.pm +@@ -440,7 +440,7 @@ build/podindex :: \$(BLIB_DONE) Makefile build/doc.pl \$(POD_DEPENDS) + + \$(INST_LIB)/\$(FULLEXT)/index.pod :: \$(INST_LIB)/\$(FULLEXT)/ build/podindex + \$(NOECHO) \$(ECHO) Creating POD index... +- \$(NOECHO) \$(FULLPERLRUN) -e "print qq(\\n=head1 NAME\\n\\n\$(NAME) - API Reference Pod Index\\n\\n=head1 PAGES\\n\\n=over\\n\\n)" \\ ++ \$(NOECHO) \$(FULLPERLRUN) -e "print qq(\\n=head1 NAME\\n\\n\$(NAME) \\\\- API Reference Pod Index\\n\\n=head1 PAGES\\n\\n=over\\n\\n)" \\ + > \$(INST_LIB)/\$(FULLEXT)/index.pod + \$(NOECHO) \$(FULLPERLRUN) -ne "print q(=item L<) . (split q( ))[1] . qq(>\\n\\n);" < build/podindex >> \$(INST_LIB)/\$(FULLEXT)/index.pod + \$(NOECHO) \$(FULLPERLRUN) -e "print qq(=back\\n\\n);" >> \$(INST_LIB)/\$(FULLEXT)/index.pod diff --git a/debian/patches/fix-man-pages b/debian/patches/fix-man-pages deleted file mode 100644 index d7f1fc2..0000000 --- a/debian/patches/fix-man-pages +++ /dev/null @@ -1,292 +0,0 @@ -Description: improves man pages -Origin: vendor -Forwarded: no -Author: Ryan Niebur <[email protected]> - ---- a/GParamSpec.xs -+++ b/GParamSpec.xs -@@ -83,7 +83,7 @@ - if (g_str_equal ((const char *) value, fd->package)) { - fd->found_type = (GType) key; - return TRUE; -- } else -+ } else - return FALSE; - } - #else -@@ -185,6 +185,8 @@ - - MODULE = Glib::ParamSpec PACKAGE = Glib::ParamSpec PREFIX = g_param_spec_ - -+=for object Glib::ParamSpec Wrapper to encapsulate metadate needed to specify parameters -+ - void - DESTROY (GParamSpec * pspec) - CODE: -@@ -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>. - --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 -@@ -280,9 +282,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 -@@ -320,7 +322,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 -@@ -333,9 +335,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 -@@ -373,7 +375,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 -@@ -386,7 +388,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 -@@ -398,13 +400,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: -@@ -418,9 +420,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: -@@ -434,11 +436,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 -@@ -462,7 +464,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 -@@ -477,9 +479,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. -@@ -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) --## 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) -@@ -891,7 +893,7 @@ - ## similarly, all unsigned integer types - - --=for object Glib::Param::UInt -+=for object Glib::Param::UInt Wrapper for uint parameters in GLib - - =for position post_hierarchy - -@@ -962,7 +964,7 @@ - - MODULE = Glib::ParamSpec PACKAGE = Glib::Param::Int64 - --=for object Glib::Param::Int64 -+=for object Glib::Param::Int64 Wrapper for int64 parameters in GLib - - =head1 DESCRIPTION - -@@ -989,7 +991,7 @@ - - MODULE = Glib::ParamSpec PACKAGE = Glib::Param::UInt64 - --=for object Glib::Param::UInt64 -+=for object Glib::Param::UInt64 Wrapper for uint64 parameters in GLib - - =head1 DESCRIPTION - -@@ -1018,7 +1020,7 @@ - - ## and again for the floating-point types - --=for object Glib::Param::Double -+=for object Glib::Param::Double Wrapper for double parameters in GLib - - =for position post_hierarchy - -@@ -1037,6 +1039,21 @@ - - =cut - -+=for object Glib::Param::Boolean Wrapper for boolean parameters in GLib -+=cut -+ -+=for object Glib::Param::Enum Wrapper for enum parameters in GLib -+=cut -+ -+=for object Glib::Param::Flags Wrapper for flag parameters in GLib -+=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 - -@@ -1122,6 +1139,8 @@ - - #if GLIB_CHECK_VERSION(2, 10, 0) - -+=for object Glib::Param::GType - Paramspecs for glib types -+ - =for section DESCRIPTION - - =head1 DESCRIPTION ---- a/GType.xs -+++ b/GType.xs -@@ -2746,6 +2746,8 @@ - - MODULE = Glib::Type PACKAGE = Glib::Flags - -+=for object Glib::Flags Overloaded operators representing GLib flags -+ - =for position DESCRIPTION - - =head1 DESCRIPTION ---- a/GUtils.xs -+++ b/GUtils.xs -@@ -469,6 +469,9 @@ - - MODULE = Glib::Utils PACKAGE = Glib::Markup PREFIX = g_markup_ - -+=for object Glib::Markup Wrapper for markup handling functions in GLib -+=cut -+ - =for apidoc __function__ - =cut - # gchar* g_markup_escape_text (const gchar *text, gssize length); ---- a/GOption.xs -+++ b/GOption.xs -@@ -610,6 +610,14 @@ - gperl_register_fundamental (GPERL_TYPE_OPTION_ARG, "Glib::OptionArg"); - gperl_register_fundamental (GPERL_TYPE_OPTION_FLAGS, "Glib::OptionFlags"); - -+=for object Glib::OptionContext defines options accepted by the commandline option parser -+ -+=cut -+ -+=for object Glib::OptionGroup group of options for command line option parsing -+ -+=cut -+ - =for position SYNOPSIS - - =head1 SYNOPSIS ---- a/lib/Glib/MakeHelper.pm -+++ b/lib/Glib/MakeHelper.pm -@@ -440,7 +440,7 @@ - - \$(INST_LIB)/\$(FULLEXT)/index.pod :: \$(INST_LIB)/\$(FULLEXT)/ build/podindex - \$(NOECHO) \$(ECHO) Creating POD index... -- \$(NOECHO) \$(FULLPERLRUN) -e "print qq(\\n=head1 NAME\\n\\n\$(NAME) - API Reference Pod Index\\n\\n=head1 PAGES\\n\\n=over\\n\\n)" \\ -+ \$(NOECHO) \$(FULLPERLRUN) -e "print qq(\\n=head1 NAME\\n\\n\$(NAME) \\\\- API Reference Pod Index\\n\\n=head1 PAGES\\n\\n=over\\n\\n)" \\ - > \$(INST_LIB)/\$(FULLEXT)/index.pod - \$(NOECHO) \$(FULLPERLRUN) -ne "print q(=item L<) . (split q( ))[1] . qq(>\\n\\n);" < build/podindex >> \$(INST_LIB)/\$(FULLEXT)/index.pod - \$(NOECHO) \$(FULLPERLRUN) -e "print qq(=back\\n\\n);" >> \$(INST_LIB)/\$(FULLEXT)/index.pod diff --git a/debian/patches/series b/debian/patches/series index 8c2c9ac..60c379c 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,4 +1,5 @@ fix-gtks-whatis remove-version-checking -fix-man-pages sort_podify_signals +Add-missing-information-to-POD.patch +Properly-escape-dash-in-generated-POD.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libglib-perl.git _______________________________________________ Pkg-perl-cvs-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-perl-cvs-commits
