r32015 - /trunk/libglib-perl/debian/patches/fix-gtks-whatis
ryan52-guest at users.alioth.debian.org
ryan52-guest at users.alioth.debian.org
Fri Mar 13 07:56:12 UTC 2009
Author: ryan52-guest
Date: Fri Mar 13 07:56:08 2009
New Revision: 32015
URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=32015
Log:
make the whatis generation patch more general, no longer requires environment variable, applies to everything built against it
Modified:
trunk/libglib-perl/debian/patches/fix-gtks-whatis
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=32015&op=diff
==============================================================================
--- trunk/libglib-perl/debian/patches/fix-gtks-whatis (original)
+++ trunk/libglib-perl/debian/patches/fix-gtks-whatis Fri Mar 13 07:56:08 2009
@@ -6,49 +6,33 @@
--- a/GenPod.pm
+++ b/GenPod.pm
-@@ -18,8 +18,22 @@
- use Data::Dumper;
- use POSIX qw(strftime);
-
-+my $ryan52_hack;
-+
- use Glib;
-
-+if(exists($ENV{'RYAN52_HACK_FOR_GTK2_WHATIS'})) {
-+ eval "use Gtk2";
-+ die($@) if($@);
-+ $ryan52_hack = 1;
-+} elsif(exists($ENV{'RYAN52_HACK_FOR_GNOME2_WHATIS'})) {
-+ eval "use Gnome2";
-+ die($@) if($@);
-+ $ryan52_hack = 1;
-+} else {
-+ $ryan52_hack = 0;
-+}
-+
- use base 'Exporter';
-
- our @EXPORT = qw(
-@@ -276,7 +290,17 @@
+@@ -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 ($ryan52_hack) {
-+ if($package =~ m/^Gtk2::Pango/) {
++ } 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
-@@ -1365,6 +1389,37 @@
+@@ -999,6 +1007,8 @@
+
+ sub set_main_mod {
+ $MAIN_MOD = shift;
++ eval "use $MAIN_MOD";
++ die($@) if($@);
+ }
+
+ sub preprocess_pod
+@@ -1365,6 +1375,37 @@
} while (@dirs);
}
More information about the Pkg-perl-cvs-commits
mailing list