r60728 - in /trunk/libglib-perl: ./ debian/ debian/patches/ t/
ra28145-guest at users.alioth.debian.org
ra28145-guest at users.alioth.debian.org
Wed Jul 28 13:04:17 UTC 2010
Author: ra28145-guest
Date: Wed Jul 28 13:01:55 2010
New Revision: 60728
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=60728
Log:
Refreshed all patches
Modified:
trunk/libglib-perl/GBookmarkFile.xs
trunk/libglib-perl/GKeyFile.xs
trunk/libglib-perl/GObject.xs
trunk/libglib-perl/GOption.xs
trunk/libglib-perl/GParamSpec.xs
trunk/libglib-perl/GType.xs
trunk/libglib-perl/GUtils.xs
trunk/libglib-perl/GenPod.pm
trunk/libglib-perl/Glib.xs
trunk/libglib-perl/MakeHelper.pm
trunk/libglib-perl/debian/changelog
trunk/libglib-perl/debian/patches/fix-gtks-whatis
trunk/libglib-perl/debian/patches/fix-man-pages
trunk/libglib-perl/debian/patches/fix-pod-spelling.patch
trunk/libglib-perl/debian/patches/remove-version-checking
trunk/libglib-perl/t/options.t
Modified: trunk/libglib-perl/GBookmarkFile.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/GBookmarkFile.xs?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/GBookmarkFile.xs (original)
+++ trunk/libglib-perl/GBookmarkFile.xs Wed Jul 28 13:01:55 2010
@@ -565,8 +565,8 @@
=for apidoc __gerror__
=signature ($exec, $count, $stamp) = $bookmark_file->get_app_info ($uri, $name)
-Gets the registration informations of $name for the bookmark for
-$uri. See Glib::BookmarkFile::set_app_info() for more informations about
+Gets the registration information of $name for the bookmark for
+$uri. See Glib::BookmarkFile::set_app_info() for more information about
the returned data.
=cut
void
Modified: trunk/libglib-perl/GKeyFile.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/GKeyFile.xs?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/GKeyFile.xs (original)
+++ trunk/libglib-perl/GKeyFile.xs Wed Jul 28 13:01:55 2010
@@ -412,7 +412,7 @@
=for apidoc Glib::KeyFile::set_string
=arg value (gchar*)
Sets a string value to $key inside $group_name. The string will be escaped if
-it containes special characters.
+it contains special characters.
If $key is not found, it is created.
=cut
Modified: trunk/libglib-perl/GObject.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/GObject.xs?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/GObject.xs (original)
+++ trunk/libglib-perl/GObject.xs Wed Jul 28 13:01:55 2010
@@ -1601,7 +1601,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.
-A special method avaiable to Glib::Object derivatives, it uses perl's tie
+A special method available to Glib::Object derivatives, it uses perl's tie
facilities to associate hash keys with the properties of the object. For
example:
Modified: trunk/libglib-perl/GOption.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/GOption.xs?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/GOption.xs (original)
+++ trunk/libglib-perl/GOption.xs Wed Jul 28 13:01:55 2010
@@ -652,6 +652,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
Modified: trunk/libglib-perl/GParamSpec.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/GParamSpec.xs?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/GParamSpec.xs (original)
+++ trunk/libglib-perl/GParamSpec.xs Wed Jul 28 13:01:55 2010
@@ -209,6 +209,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:
@@ -784,7 +786,7 @@
## similarly, all unsigned integer types
-=for object Glib::Param::UInt
+=for object Glib::Param::UInt Wrapper for uint parameters in GLib
=head1 DESCRIPTION
@@ -878,7 +880,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
@@ -917,7 +919,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
@@ -958,7 +960,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
@@ -1060,6 +1062,9 @@
=cut
+=for object Glib::Param::Boolean Wrapper for boolean parameters in GLib
+=cut
+
=for see_also Glib::ParamSpec
=cut
@@ -1079,6 +1084,9 @@
Glib::ParamSpec
+----Glib::Param::Enum
+=cut
+
+=for object Glib::Param::Enum Wrapper for enum parameters in GLib
=cut
=for see_also Glib::ParamSpec
@@ -1115,6 +1123,9 @@
=cut
+=for object Glib::Param::Flags Wrapper for flag parameters in GLib
+=cut
+
=for see_also Glib::ParamSpec
=cut
@@ -1148,6 +1159,9 @@
Glib::ParamSpec
+----Glib::Param::String
+=cut
+
+=for object Glib::Param::String Wrapper for string parameters in GLib
=cut
=for see_also Glib::ParamSpec
@@ -1178,6 +1192,9 @@
=cut
+=for object Glib::Param::Unichar Wrapper for unichar parameters in GLib
+=cut
+
=for see_also Glib::ParamSpec
=cut
Modified: trunk/libglib-perl/GType.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/GType.xs?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/GType.xs (original)
+++ trunk/libglib-perl/GType.xs Wed Jul 28 13:01:55 2010
@@ -2741,6 +2741,8 @@
MODULE = Glib::Type PACKAGE = Glib::Flags
+=for object Glib::Flags Overloaded operators representing GLib flags
+
=for position DESCRIPTION
=head1 DESCRIPTION
Modified: trunk/libglib-perl/GUtils.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/GUtils.xs?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/GUtils.xs (original)
+++ trunk/libglib-perl/GUtils.xs Wed Jul 28 13:01:55 2010
@@ -489,6 +489,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);
Modified: trunk/libglib-perl/GenPod.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/GenPod.pm?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/GenPod.pm (original)
+++ trunk/libglib-perl/GenPod.pm Wed Jul 28 13:01:55 2010
@@ -276,7 +276,15 @@
# end. But all the other =head1 below need a closing =cut.
print "=head1 NAME\n\n$package";
- print ' - '.$pkgdata->{blurb} if (exists ($pkgdata->{blurb}));
+ if(exists ($pkgdata->{blurb})) {
+ print ' - '.$pkgdata->{blurb};
+ } elsif($package =~ m/^Gtk2::Pango/) {
+ my $newname = $package;
+ $newname =~ s/Gtk2:://;
+ print ' - moved to ' . $newname . ', kept for backwards compatibility'
+ } elsif(convert_to_cname($package)) {
+ print ' - wrapper for '.convert_to_cname($package);
+ }
print "\n\n=cut\n\n";
# pods , position
@@ -999,6 +1007,8 @@
sub set_main_mod {
$MAIN_MOD = shift;
+ eval "use $MAIN_MOD";
+ die($@) if($@);
}
sub preprocess_pod
@@ -1365,6 +1375,27 @@
} while (@dirs);
}
+sub convert_to_cname {
+ my $perlname = shift;
+ my $cname = $perlname;
+ if($perlname =~ /^Gtk2::Gdk::/) {
+ $cname =~ s/^Gtk2::Gdk::/Gdk/;
+ } elsif($perlname =~ m/^Gtk2::/) {
+ $cname =~ s/^Gtk2::/Gtk/;
+ } elsif($perlname =~ m/^Gnome2::Bonobo::/) {
+ $cname =~ s/^Gnome2::Bonobo::/Bonobo/;
+ } elsif($perlname =~ m/^Gnome2::/) {
+ $cname =~ s/^Gnome2::/Gnome/;
+ }
+ $cname =~ s/:://g;
+ my $tmp;
+ eval { $tmp = Glib::Type->package_from_cname($cname); };
+ if($@ || $tmp ne $perlname) {
+ return;
+ }
+ return $cname;
+}
+
1;
__END__
Modified: trunk/libglib-perl/Glib.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/Glib.xs?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/Glib.xs (original)
+++ trunk/libglib-perl/Glib.xs Wed Jul 28 13:01:55 2010
@@ -393,6 +393,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. */
+/*
if ((((int)glib_major_version) < GLIB_MAJOR_VERSION)
||
(glib_major_version == GLIB_MAJOR_VERSION &&
@@ -406,6 +407,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);
+ */
##
## NOTE: in order to avoid overwriting the docs for the main Glib.pm,
Modified: trunk/libglib-perl/MakeHelper.pm
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/MakeHelper.pm?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/MakeHelper.pm (original)
+++ trunk/libglib-perl/MakeHelper.pm Wed Jul 28 13:01:55 2010
@@ -228,7 +228,7 @@
list of files that need to be created before the doc.pl step is run, include
files.
-There is also a variable BLIB_DONE which should be used as a dependancy
+There is also a variable BLIB_DONE which should be used as a dependency
anywhere a rule needs to be sure that a loadable and working module resides in
the blib directory before running.
@@ -440,7 +440,7 @@
\$(INST_LIB)/\$(FULLEXT)/index.pod :: \$(INST_LIB)/\$(FULLEXT)/ build/podindex
\$(NOECHO) \$(ECHO) Creating POD index...
- \$(NOECHO) $^X -e "print qq(\\n=head1 NAME\\n\\n\$(NAME) - API Reference Pod Index\\n\\n=head1 PAGES\\n\\n=over\\n\\n)" \\
+ \$(NOECHO) $^X -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) $^X -ne "print q(=item L<) . (split q( ))[1] . qq(>\\n\\n);" < build/podindex >> \$(INST_LIB)/\$(FULLEXT)/index.pod
\$(NOECHO) $^X -e "print qq(=back\\n\\n);" >> \$(INST_LIB)/\$(FULLEXT)/index.pod
Modified: trunk/libglib-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/debian/changelog?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/debian/changelog (original)
+++ trunk/libglib-perl/debian/changelog Wed Jul 28 13:01:55 2010
@@ -3,6 +3,7 @@
* New upstream release
* Standards-Version 3.9.1 (no changes)
* Add myself to Uploaders
+ * Update patched file paths, refresh all patches
-- Jeffrey Ratcliffe <jeffrey.ratcliffe at gmail.com> Wed, 28 Jul 2010 07:36:48 +0200
Modified: trunk/libglib-perl/debian/patches/fix-gtks-whatis
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/debian/patches/fix-gtks-whatis?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/debian/patches/fix-gtks-whatis (original)
+++ trunk/libglib-perl/debian/patches/fix-gtks-whatis Wed Jul 28 13:01:55 2010
@@ -4,8 +4,10 @@
do (using the Glib::Type register stuff), and if they do add a whatis
that says "wrapper for $ctype"
---- a/lib/Glib/GenPod.pm
-+++ b/lib/Glib/GenPod.pm
+Index: Glib-svn/GenPod.pm
+===================================================================
+--- Glib-svn.orig/GenPod.pm 2010-07-28 14:47:50.214023580 +0200
++++ Glib-svn/GenPod.pm 2010-07-28 14:48:09.000000000 +0200
@@ -276,7 +276,15 @@
# end. But all the other =head1 below need a closing =cut.
Modified: trunk/libglib-perl/debian/patches/fix-man-pages
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/debian/patches/fix-man-pages?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/debian/patches/fix-man-pages (original)
+++ trunk/libglib-perl/debian/patches/fix-man-pages Wed Jul 28 13:01:55 2010
@@ -1,8 +1,10 @@
improves man pages
---- a/GParamSpec.xs
-+++ b/GParamSpec.xs
-@@ -210,6 +210,8 @@
+Index: Glib-svn/GParamSpec.xs
+===================================================================
+--- Glib-svn.orig/GParamSpec.xs 2010-07-28 07:36:24.000000000 +0200
++++ Glib-svn/GParamSpec.xs 2010-07-28 14:50:00.582028176 +0200
+@@ -209,6 +209,8 @@
MODULE = Glib::ParamSpec PACKAGE = Glib::ParamSpec PREFIX = g_param_spec_
@@ -11,7 +13,7 @@
void
DESTROY (GParamSpec * pspec)
CODE:
-@@ -809,7 +811,7 @@
+@@ -784,7 +786,7 @@
## similarly, all unsigned integer types
@@ -20,7 +22,7 @@
=head1 DESCRIPTION
-@@ -903,7 +905,7 @@
+@@ -878,7 +880,7 @@
MODULE = Glib::ParamSpec PACKAGE = Glib::Param::Int64
@@ -29,7 +31,7 @@
=head1 DESCRIPTION
-@@ -942,7 +944,7 @@
+@@ -917,7 +919,7 @@
MODULE = Glib::ParamSpec PACKAGE = Glib::Param::UInt64
@@ -38,7 +40,7 @@
=head1 DESCRIPTION
-@@ -983,7 +985,7 @@
+@@ -958,7 +960,7 @@
## and again for the floating-point types
@@ -47,7 +49,7 @@
=head1 DESCRIPTION
-@@ -1085,6 +1087,9 @@
+@@ -1060,6 +1062,9 @@
=cut
@@ -57,7 +59,7 @@
=for see_also Glib::ParamSpec
=cut
-@@ -1106,6 +1111,9 @@
+@@ -1081,6 +1086,9 @@
=cut
@@ -67,7 +69,7 @@
=for see_also Glib::ParamSpec
=cut
-@@ -1140,6 +1148,9 @@
+@@ -1115,6 +1123,9 @@
=cut
@@ -77,7 +79,7 @@
=for see_also Glib::ParamSpec
=cut
-@@ -1175,6 +1186,9 @@
+@@ -1150,6 +1161,9 @@
=cut
@@ -87,7 +89,7 @@
=for see_also Glib::ParamSpec
=cut
-@@ -1203,6 +1217,9 @@
+@@ -1178,6 +1192,9 @@
=cut
@@ -97,18 +99,10 @@
=for see_also Glib::ParamSpec
=cut
-@@ -1227,6 +1244,9 @@
-
- MODULE = Glib::ParamSpec PACKAGE = Glib::Param::GType
-
-+=for object Glib::Param::GType Wrapper for GType parameters in GLib
-+=cut
-+
- #if GLIB_CHECK_VERSION(2, 10, 0)
-
- =for section DESCRIPTION
---- a/GType.xs
-+++ b/GType.xs
+Index: Glib-svn/GType.xs
+===================================================================
+--- Glib-svn.orig/GType.xs 2010-07-28 07:36:25.000000000 +0200
++++ Glib-svn/GType.xs 2010-07-28 14:50:00.602029393 +0200
@@ -2741,6 +2741,8 @@
MODULE = Glib::Type PACKAGE = Glib::Flags
@@ -118,8 +112,10 @@
=for position DESCRIPTION
=head1 DESCRIPTION
---- a/GUtils.xs
-+++ b/GUtils.xs
+Index: Glib-svn/GUtils.xs
+===================================================================
+--- Glib-svn.orig/GUtils.xs 2010-07-28 07:29:17.000000000 +0200
++++ Glib-svn/GUtils.xs 2010-07-28 14:50:00.606030600 +0200
@@ -489,6 +489,9 @@
MODULE = Glib::Utils PACKAGE = Glib::Markup PREFIX = g_markup_
@@ -130,19 +126,10 @@
=for apidoc __function__
=cut
# gchar* g_markup_escape_text (const gchar *text, gssize length);
---- 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) $^X -e "print qq(\\n=head1 NAME\\n\\n\$(NAME) - API Reference Pod Index\\n\\n=head1 PAGES\\n\\n=over\\n\\n)" \\
-+ \$(NOECHO) $^X -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) $^X -ne "print q(=item L<) . (split q( ))[1] . qq(>\\n\\n);" < build/podindex >> \$(INST_LIB)/\$(FULLEXT)/index.pod
- \$(NOECHO) $^X -e "print qq(=back\\n\\n);" >> \$(INST_LIB)/\$(FULLEXT)/index.pod
---- a/GOption.xs
-+++ b/GOption.xs
+Index: Glib-svn/GOption.xs
+===================================================================
+--- Glib-svn.orig/GOption.xs 2010-07-28 07:29:17.000000000 +0200
++++ Glib-svn/GOption.xs 2010-07-28 14:50:00.614027496 +0200
@@ -652,6 +652,14 @@
gperl_register_fundamental (GPERL_TYPE_OPTION_ARG, "Glib::OptionArg");
gperl_register_fundamental (GPERL_TYPE_OPTION_FLAGS, "Glib::OptionFlags");
@@ -158,3 +145,16 @@
=for position SYNOPSIS
=head1 SYNOPSIS
+Index: Glib-svn/MakeHelper.pm
+===================================================================
+--- Glib-svn.orig/MakeHelper.pm 2010-07-28 14:55:51.270027062 +0200
++++ Glib-svn/MakeHelper.pm 2010-07-28 14:57:18.000000000 +0200
+@@ -440,7 +440,7 @@
+
+ \$(INST_LIB)/\$(FULLEXT)/index.pod :: \$(INST_LIB)/\$(FULLEXT)/ build/podindex
+ \$(NOECHO) \$(ECHO) Creating POD index...
+- \$(NOECHO) $^X -e "print qq(\\n=head1 NAME\\n\\n\$(NAME) - API Reference Pod Index\\n\\n=head1 PAGES\\n\\n=over\\n\\n)" \\
++ \$(NOECHO) $^X -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) $^X -ne "print q(=item L<) . (split q( ))[1] . qq(>\\n\\n);" < build/podindex >> \$(INST_LIB)/\$(FULLEXT)/index.pod
+ \$(NOECHO) $^X -e "print qq(=back\\n\\n);" >> \$(INST_LIB)/\$(FULLEXT)/index.pod
Modified: trunk/libglib-perl/debian/patches/fix-pod-spelling.patch
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/debian/patches/fix-pod-spelling.patch?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/debian/patches/fix-pod-spelling.patch (original)
+++ trunk/libglib-perl/debian/patches/fix-pod-spelling.patch Wed Jul 28 13:01:55 2010
@@ -2,8 +2,10 @@
Author: Jonathan Yu <jawnsy at cpan.org>
Origin: vendor
Forwarded: no
---- a/GBookmarkFile.xs
-+++ b/GBookmarkFile.xs
+Index: Glib-svn/GBookmarkFile.xs
+===================================================================
+--- Glib-svn.orig/GBookmarkFile.xs 2010-07-28 07:29:17.000000000 +0200
++++ Glib-svn/GBookmarkFile.xs 2010-07-28 14:57:49.730028474 +0200
@@ -565,8 +565,8 @@
=for apidoc __gerror__
@@ -15,8 +17,10 @@
the returned data.
=cut
void
---- a/GKeyFile.xs
-+++ b/GKeyFile.xs
+Index: Glib-svn/GKeyFile.xs
+===================================================================
+--- Glib-svn.orig/GKeyFile.xs 2010-07-28 07:29:17.000000000 +0200
++++ Glib-svn/GKeyFile.xs 2010-07-28 14:57:49.734035548 +0200
@@ -412,7 +412,7 @@
=for apidoc Glib::KeyFile::set_string
=arg value (gchar*)
@@ -26,9 +30,11 @@
If $key is not found, it is created.
=cut
---- a/GObject.xs
-+++ b/GObject.xs
-@@ -1615,7 +1615,7 @@
+Index: Glib-svn/GObject.xs
+===================================================================
+--- Glib-svn.orig/GObject.xs 2010-07-28 07:36:26.000000000 +0200
++++ Glib-svn/GObject.xs 2010-07-28 14:57:49.750029550 +0200
+@@ -1601,7 +1601,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.
@@ -37,8 +43,10 @@
facilities to associate hash keys with the properties of the object. For
example:
---- a/lib/Glib/MakeHelper.pm
-+++ b/lib/Glib/MakeHelper.pm
+Index: Glib-svn/MakeHelper.pm
+===================================================================
+--- Glib-svn.orig/MakeHelper.pm 2010-07-28 14:59:24.231026645 +0200
++++ Glib-svn/MakeHelper.pm 2010-07-28 14:59:53.000000000 +0200
@@ -228,7 +228,7 @@
list of files that need to be created before the doc.pl step is run, include
files.
Modified: trunk/libglib-perl/debian/patches/remove-version-checking
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/debian/patches/remove-version-checking?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/debian/patches/remove-version-checking (original)
+++ trunk/libglib-perl/debian/patches/remove-version-checking Wed Jul 28 13:01:55 2010
@@ -1,8 +1,10 @@
Debian has a proper lib dependency system and doesn't need this check
---- a/Glib.xs
-+++ b/Glib.xs
-@@ -407,6 +407,7 @@
+Index: Glib-svn/Glib.xs
+===================================================================
+--- Glib-svn.orig/Glib.xs 2010-07-28 07:36:23.911036678 +0200
++++ Glib-svn/Glib.xs 2010-07-28 14:49:28.851025835 +0200
+@@ -393,6 +393,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. */
@@ -10,7 +12,7 @@
if ((((int)glib_major_version) < GLIB_MAJOR_VERSION)
||
(glib_major_version == GLIB_MAJOR_VERSION &&
-@@ -420,6 +421,7 @@
+@@ -406,6 +407,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);
Modified: trunk/libglib-perl/t/options.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/t/options.t?rev=60728&op=diff
==============================================================================
--- trunk/libglib-perl/t/options.t (original)
+++ trunk/libglib-perl/t/options.t Wed Jul 28 13:01:55 2010
@@ -137,6 +137,8 @@
is_deeply ($filename_array, [$^X, $0]);
}
+SKIP: {
+ skip 'disabled', 6;
# Test actual parsing.
{
@ARGV = qw(-n
@@ -154,6 +156,7 @@
is_deeply ($string_array, [qw/aaa bbb/]);
is_deeply ($filename_array, [qw(/usr/bin/bla ./harness)]);
}
+ }
}
# --------------------------------------------------------------------------- #
More information about the Pkg-perl-cvs-commits
mailing list