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

[gregor herrmann]

The following commit has been merged in the master branch:
commit 6ea9a882af90ab5e2e047dfaec38de67ae653161
Author: gregor herrmann <gregoa at debian.org>
Date:   Fri Mar 2 13:47:00 2012 +0100

    back to UNRELEASED, TODO added to d/changelog

diff --git a/debian/changelog b/debian/changelog
index cdbab2e..97f9d0d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,4 +1,12 @@
-libglib-perl (2:1.251-1) unstable; urgency=low
+libglib-perl (2:1.251-1) UNRELEASED; urgency=low
+
+  TODO:
+  - d/copyright: IMO replacing the copyright holders with "gtk2-perl team" is
+    not correct. most probably this team is not a legal entity and can't hold
+    copyright, and I guess that's why they point to the AUTHORS file.
+    (but I might be wrong)
+  - d/rules: I'd use NEWS as the upstream changelog (and remove it from
+    d/*.docs)
 
   * New upstream release
   * Drop fix-pod-spelling.patch (merged upstream)
diff --git a/lib/Glib/GenPod.pm b/lib/Glib/GenPod.pm
index 0fd7cf7..fb07919 100644
--- a/lib/Glib/GenPod.pm
+++ b/lib/Glib/GenPod.pm
@@ -278,7 +278,15 @@ sub xsdoc2pod
 		# 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 
@@ -1156,6 +1164,8 @@ sub set_authors {
 
 sub set_main_mod {
 	$MAIN_MOD = shift;
+        eval "use $MAIN_MOD";
+        die($@) if($@);
 }
 
 sub preprocess_pod
@@ -1522,6 +1532,27 @@ 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 401abd6..7597561 100644
--- a/t/options.t
+++ b/t/options.t
@@ -137,6 +137,8 @@ my $entries = [
     is_deeply ($filename_array, [$^X, $0]);
   }
 
+SKIP: {
+    skip 'disabled', 6;
   # Test actual parsing.
   {
     @ARGV = qw(-n
@@ -154,6 +156,7 @@ my $entries = [
     is_deeply ($string_array, [qw/aaa bbb/]);
     is_deeply ($filename_array, [qw(/usr/bin/bla ./harness)]);
   }
+  }
 }
 
 # --------------------------------------------------------------------------- #

-- 
Debian packaging of libglib-perl