[libglib-perl] 21/25: Drop fix-gtks-whatis patch: applied upstream.

Intrigeri intrigeri at moszumanska.debian.org
Tue Dec 29 18:43:56 UTC 2015


This is an automated email from the git hooks/post-receive script.

intrigeri pushed a commit to branch experimental
in repository libglib-perl.

commit 11cf89a7bc5b2df01102b613f2c5a29fa304ce04
Author: intrigeri <intrigeri at boum.org>
Date:   Tue Dec 29 18:02:19 2015 +0000

    Drop fix-gtks-whatis patch: applied upstream.
---
 debian/patches/fix-gtks-whatis | 56 ------------------------------------------
 debian/patches/series          |  1 -
 2 files changed, 57 deletions(-)

diff --git a/debian/patches/fix-gtks-whatis b/debian/patches/fix-gtks-whatis
deleted file mode 100644
index c72d8fb..0000000
--- a/debian/patches/fix-gtks-whatis
+++ /dev/null
@@ -1,56 +0,0 @@
-Description: if a man page doesn't have a whatis, try to figure out
- which ctype corresponds to that (using regexps), check if they really
- do (using the Glib::Type register stuff), and if they do add a whatis
- that says "wrapper for $ctype"
-Forwarded: yes
-Bug: https://bugzilla.gnome.org/show_bug.cgi?id=753468
-Author: Ryan Niebur <ryan at debian.org>
-
---- a/lib/Glib/GenPod.pm
-+++ b/lib/Glib/GenPod.pm
-@@ -278,7 +278,16 @@ 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 
-@@ -1522,6 +1531,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/debian/patches/series b/debian/patches/series
index 60c379c..e54ec90 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,3 @@
-fix-gtks-whatis
 remove-version-checking
 sort_podify_signals
 Add-missing-information-to-POD.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-perl/packages/libglib-perl.git



More information about the Pkg-perl-cvs-commits mailing list