[SCM] Debian packaging of libglib-perl branch, master, updated. debian/1.242-1-20-gf8ce645

[Alessandro Ghedini]

The following commit has been merged in the master branch:
commit d00704d96727a05f6d98c61ea66942064db1ff8b
Author: Alessandro Ghedini <al3xbio at gmail.com>
Date:   Fri Mar 2 15:33:58 2012 +0100

    Unapply patches
    
    Git-Dch: Ignore

diff --git a/lib/Glib/GenPod.pm b/lib/Glib/GenPod.pm
index fb07919..0fd7cf7 100644
--- a/lib/Glib/GenPod.pm
+++ b/lib/Glib/GenPod.pm
@@ -278,15 +278,7 @@ sub xsdoc2pod
 		# 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 
@@ -1164,8 +1156,6 @@ sub set_authors {
 
 sub set_main_mod {
 	$MAIN_MOD = shift;
-        eval "use $MAIN_MOD";
-        die($@) if($@);
 }
 
 sub preprocess_pod
@@ -1532,27 +1522,6 @@ sub mkdir_p {
 	} 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__
 
diff --git a/t/options.t b/t/options.t
index 7597561..401abd6 100644
--- a/t/options.t
+++ b/t/options.t
@@ -137,8 +137,6 @@ my $entries = [
     is_deeply ($filename_array, [$^X, $0]);
   }
 
-SKIP: {
-    skip 'disabled', 6;
   # Test actual parsing.
   {
     @ARGV = qw(-n
@@ -156,7 +154,6 @@ SKIP: {
     is_deeply ($string_array, [qw/aaa bbb/]);
     is_deeply ($filename_array, [qw(/usr/bin/bla ./harness)]);
   }
-  }
 }
 
 # --------------------------------------------------------------------------- #

-- 
Debian packaging of libglib-perl