r60729 - in /trunk/libglib-perl: GBookmarkFile.xs GKeyFile.xs GObject.xs GOption.xs GParamSpec.xs GType.xs GUtils.xs GenPod.pm Glib.xs MakeHelper.pm t/options.t

ra28145-guest at users.alioth.debian.org ra28145-guest at users.alioth.debian.org
Wed Jul 28 13:06:49 UTC 2010


Author: ra28145-guest
Date: Wed Jul 28 13:06:30 2010
New Revision: 60729

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=60729
Log:
Unapplied 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/t/options.t

Modified: trunk/libglib-perl/GBookmarkFile.xs
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/GBookmarkFile.xs?rev=60729&op=diff
==============================================================================
--- trunk/libglib-perl/GBookmarkFile.xs (original)
+++ trunk/libglib-perl/GBookmarkFile.xs Wed Jul 28 13:06:30 2010
@@ -565,8 +565,8 @@
 
 =for apidoc __gerror__
 =signature ($exec, $count, $stamp) = $bookmark_file->get_app_info ($uri, $name)
-Gets the registration information of $name for the bookmark for
-$uri.  See Glib::BookmarkFile::set_app_info() for more information about
+Gets the registration informations of $name for the bookmark for
+$uri.  See Glib::BookmarkFile::set_app_info() for more informations 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=60729&op=diff
==============================================================================
--- trunk/libglib-perl/GKeyFile.xs (original)
+++ trunk/libglib-perl/GKeyFile.xs Wed Jul 28 13:06:30 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 contains special characters.
+it containes 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=60729&op=diff
==============================================================================
--- trunk/libglib-perl/GObject.xs (original)
+++ trunk/libglib-perl/GObject.xs Wed Jul 28 13:06:30 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 available to Glib::Object derivatives, it uses perl's tie
+A special method avaiable 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=60729&op=diff
==============================================================================
--- trunk/libglib-perl/GOption.xs (original)
+++ trunk/libglib-perl/GOption.xs Wed Jul 28 13:06:30 2010
@@ -652,14 +652,6 @@
 	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=60729&op=diff
==============================================================================
--- trunk/libglib-perl/GParamSpec.xs (original)
+++ trunk/libglib-perl/GParamSpec.xs Wed Jul 28 13:06:30 2010
@@ -209,8 +209,6 @@
 
 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:
@@ -786,7 +784,7 @@
  ## similarly, all unsigned integer types
 
 
-=for object Glib::Param::UInt Wrapper for uint parameters in GLib
+=for object Glib::Param::UInt
 
 =head1 DESCRIPTION
 
@@ -880,7 +878,7 @@
 
 MODULE = Glib::ParamSpec	PACKAGE = Glib::Param::Int64
 
-=for object Glib::Param::Int64 Wrapper for int64 parameters in GLib
+=for object Glib::Param::Int64
 
 =head1 DESCRIPTION
 
@@ -919,7 +917,7 @@
 
 MODULE = Glib::ParamSpec	PACKAGE = Glib::Param::UInt64
 
-=for object Glib::Param::UInt64 Wrapper for uint64 parameters in GLib
+=for object Glib::Param::UInt64
 
 =head1 DESCRIPTION
 
@@ -960,7 +958,7 @@
 
  ## and again for the floating-point types
 
-=for object Glib::Param::Double Wrapper for double parameters in GLib
+=for object Glib::Param::Double
 
 =head1 DESCRIPTION
 
@@ -1062,9 +1060,6 @@
 
 =cut
 
-=for object Glib::Param::Boolean Wrapper for boolean parameters in GLib
-=cut
-
 =for see_also Glib::ParamSpec
 =cut
 
@@ -1084,9 +1079,6 @@
   Glib::ParamSpec
   +----Glib::Param::Enum
 
-=cut
-
-=for object Glib::Param::Enum Wrapper for enum parameters in GLib
 =cut
 
 =for see_also Glib::ParamSpec
@@ -1123,9 +1115,6 @@
 
 =cut
 
-=for object Glib::Param::Flags Wrapper for flag parameters in GLib
-=cut
-
 =for see_also Glib::ParamSpec
 =cut
 
@@ -1159,9 +1148,6 @@
   Glib::ParamSpec
   +----Glib::Param::String
 
-=cut
-
-=for object Glib::Param::String Wrapper for string parameters in GLib
 =cut
 
 =for see_also Glib::ParamSpec
@@ -1192,9 +1178,6 @@
 
 =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=60729&op=diff
==============================================================================
--- trunk/libglib-perl/GType.xs (original)
+++ trunk/libglib-perl/GType.xs Wed Jul 28 13:06:30 2010
@@ -2741,8 +2741,6 @@
 
 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=60729&op=diff
==============================================================================
--- trunk/libglib-perl/GUtils.xs (original)
+++ trunk/libglib-perl/GUtils.xs Wed Jul 28 13:06:30 2010
@@ -489,9 +489,6 @@
 
 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=60729&op=diff
==============================================================================
--- trunk/libglib-perl/GenPod.pm (original)
+++ trunk/libglib-perl/GenPod.pm Wed Jul 28 13:06:30 2010
@@ -276,15 +276,7 @@
 		# end.  But all the other =head1 below need a closing =cut.
 
 		print "=head1 NAME\n\n$package";
-                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 ' - '.$pkgdata->{blurb} if (exists ($pkgdata->{blurb}));
 		print "\n\n=cut\n\n";
 
 		#                   pods            , position 
@@ -1007,8 +999,6 @@
 
 sub set_main_mod {
 	$MAIN_MOD = shift;
-        eval "use $MAIN_MOD";
-        die($@) if($@);
 }
 
 sub preprocess_pod
@@ -1375,27 +1365,6 @@
 	} 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=60729&op=diff
==============================================================================
--- trunk/libglib-perl/Glib.xs (original)
+++ trunk/libglib-perl/Glib.xs Wed Jul 28 13:06:30 2010
@@ -393,7 +393,6 @@
 #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 && 
@@ -407,7 +406,6 @@
 		      " 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=60729&op=diff
==============================================================================
--- trunk/libglib-perl/MakeHelper.pm (original)
+++ trunk/libglib-perl/MakeHelper.pm Wed Jul 28 13:06:30 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 dependency
+There is also a variable BLIB_DONE which should be used as a dependancy
 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/t/options.t
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/t/options.t?rev=60729&op=diff
==============================================================================
--- trunk/libglib-perl/t/options.t (original)
+++ trunk/libglib-perl/t/options.t Wed Jul 28 13:06:30 2010
@@ -137,8 +137,6 @@
     is_deeply ($filename_array, [$^X, $0]);
   }
 
-SKIP: {
-    skip 'disabled', 6;
   # Test actual parsing.
   {
     @ARGV = qw(-n
@@ -156,7 +154,6 @@
     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