r30864 - in /trunk/libglib-perl/debian: changelog patches/fix-pod-generation-for-copyright

[ryan52-guest at users.alioth.debian.org]

Author: ryan52-guest
Date: Thu Feb 19 02:31:13 2009
New Revision: 30864

URL: http://svn.debian.org/wsvn/pkg-perl/?sc=1&rev=30864
Log:
new version of fix-pod-generation-for-copyright patch from Torsten
Schoenfeld

Modified:
    trunk/libglib-perl/debian/changelog
    trunk/libglib-perl/debian/patches/fix-pod-generation-for-copyright

Modified: trunk/libglib-perl/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/debian/changelog?rev=30864&op=diff
==============================================================================
--- trunk/libglib-perl/debian/changelog (original)
+++ trunk/libglib-perl/debian/changelog Thu Feb 19 02:31:13 2009
@@ -2,8 +2,10 @@
 
   * New upstream release
     - refresh patches
-
- -- Ryan Niebur <ryanryan52 at gmail.com>  Fri, 13 Feb 2009 16:44:37 -0800
+  * new version of fix-pod-generation-for-copyright patch from Torsten
+    Schoenfeld
+
+ -- Ryan Niebur <ryanryan52 at gmail.com>  Wed, 18 Feb 2009 18:30:53 -0800
 
 libglib-perl (1:1.212-1) unstable; urgency=low
 

Modified: trunk/libglib-perl/debian/patches/fix-pod-generation-for-copyright
URL: http://svn.debian.org/wsvn/pkg-perl/trunk/libglib-perl/debian/patches/fix-pod-generation-for-copyright?rev=30864&op=diff
==============================================================================
--- trunk/libglib-perl/debian/patches/fix-pod-generation-for-copyright (original)
+++ trunk/libglib-perl/debian/patches/fix-pod-generation-for-copyright Thu Feb 19 02:31:13 2009
@@ -1,13 +1,89 @@
-do not add an aditional =cut if the COPYRIGHT section came from the
-source (as opposed to being generated), as it will already have a =cut
+Author: Torsten Schoenfeld <kaffeetisch gmx de>
+Forwarded: http://mail.gnome.org/archives/gtk-perl-list/2009-February/msg00061.html
+Description: fixes pod generation in packages that have a COPYRIGHT
+ section in the pod. (like Gnome2::Cavas)
 
 --- a/GenPod.pm
 +++ b/GenPod.pm
-@@ -356,10 +356,9 @@
+@@ -272,9 +272,12 @@
+ 			blurb => $pkgdata->{blurb},
+ 		};
+ 
++		# podify_pods() always returns proper POD with a =cut at the
++		# end.  But all the other =head1 below need a closing =cut.
++
+ 		print "=head1 NAME\n\n$package";
+ 		print ' - '.$pkgdata->{blurb} if (exists ($pkgdata->{blurb}));
+-		print "\n\n";
++		print "\n\n=cut\n\n";
+ 
+ 		#                   pods            , position 
+ 		$ret = podify_pods ($pkgdata->{pods}, 'SYNOPSIS');
+@@ -285,13 +288,13 @@
+ 		
+ 		my $parents;
+ 		($ret, $parents) = podify_ancestors ($package);
+-		print "=head1 HIERARCHY\n\n$ret" if ($ret);
++		print "=head1 HIERARCHY\n\n$ret\n\n=cut\n\n" if ($ret);
+ 		
+ 		$ret = podify_pods ($pkgdata->{pods}, 'post_hierarchy');
+ 		print "$ret\n\n" if ($ret);
+ 		
+ 		$ret = podify_interfaces ($package);
+-		print "=head1 INTERFACES\n\n$ret" if ($ret);
++		print "=head1 INTERFACES\n\n$ret\n\n=cut\n\n" if ($ret);
+ 		
+ 		$ret = podify_pods ($pkgdata->{pods}, 'post_interfaces');
+ 		print "$ret\n\n" if ($ret);
+@@ -300,28 +303,28 @@
+ 		print "$ret\n\n" if ($ret);
+ 
+ 		$ret = podify_deprecated_by ($package, @{ $pkgdata->{deprecated_bys} });
+-		print "\n=head1 DEPRECATION WARNING\n\n$ret" if ($ret);
++		print "\n=head1 DEPRECATION WARNING\n\n$ret\n\n=cut\n\n" if ($ret);
+ 
+ 		$ret = podify_methods ($package, $pkgdata->{xsubs});
+-		print "\n=head1 METHODS\n\n$ret" if ($ret);
++		print "\n=head1 METHODS\n\n$ret\n\n=cut\n\n" if ($ret);
+ 		
+ 		$ret = podify_pods ($pkgdata->{pods}, 'post_methods');
+ 		print "$ret\n\n" if ($ret);
+ 
+ 		$ret = podify_properties ($package);	
+-		print "\n=head1 PROPERTIES\n\n$ret" if ($ret);
++		print "\n=head1 PROPERTIES\n\n$ret\n\n=cut\n\n" if ($ret);
+ 
+ 		$ret = podify_pods ($pkgdata->{pods}, 'post_properties');
+ 		print "$ret\n\n" if ($ret);
+ 
+ 		$ret = podify_signals ($package);	
+-		print "\n=head1 SIGNALS\n\n$ret" if ($ret);
++		print "\n=head1 SIGNALS\n\n$ret\n\n=cut\n\n" if ($ret);
+ 
+ 		$ret = podify_pods ($pkgdata->{pods}, 'post_signals');
+ 		print "$ret\n\n" if ($ret);
+ 
+ 		$ret = podify_enums_and_flags ($pkgdata, $package);	
+-		print "\n=head1 ENUMS AND FLAGS\n\n$ret" if ($ret);
++		print "\n=head1 ENUMS AND FLAGS\n\n$ret\n\n=cut\n\n" if ($ret);
+ 
+ 		$ret = podify_pods ($pkgdata->{pods}, 'post_enums');
+ 		print "$ret\n\n" if ($ret);
+@@ -342,7 +345,7 @@
+ 			                         $pkgdata->{see_alsos}
+ 						 ? @{ $pkgdata->{see_alsos} }
+ 			                         : ());
+-			print "\n=head1 SEE ALSO\n\n$ret" if ($ret);
++			print "\n=head1 SEE ALSO\n\n$ret\n\n=cut\n\n" if ($ret);
+ 		}
+ 
+ 		$ret = podify_pods ($pkgdata->{pods}, 'COPYRIGHT');
+@@ -355,11 +358,9 @@
+ 		{
  			# use normal copyright system
  			$ret = get_copyright ();
- 			print "\n=head1 COPYRIGHT\n\n$ret" if ($ret);
-+		        print "\n=cut\n\n";
+-			print "\n=head1 COPYRIGHT\n\n$ret" if ($ret);
++			print "\n=head1 COPYRIGHT\n\n$ret\n\n=cut\n\n" if ($ret);
  		}
  
 -		print "\n=cut\n\n";