[SCM] Debian packaging of SDL_Perl CPAN distribution branch, master, updated. upstream/2.533-9-gf43a684

Dominique Dumont dod at debian.org
Sun Sep 18 17:57:21 UTC 2011


The following commit has been merged in the master branch:
commit 94356366e8d400d93d7f6a75072065fb20ac1cc3
Author: Dominique Dumont <dod at debian.org>
Date:   Sun Sep 18 19:51:06 2011 +0200

    added patches

diff --git a/debian/copyright b/debian/copyright
index cc7991a..8eb9bf3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,3 +1,3 @@
 Format: http://dep.debian.net/deps/dep5/
-Source:Copyright: (c) 2003 David J. Goehrig <dave at cthulhu-burger.org>
+Source: Copyright: (c) 2003 David J. Goehrig <dave at cthulhu-burger.org>
 
diff --git a/debian/dirs b/debian/dirs
deleted file mode 100644
index 5a5e3d4..0000000
--- a/debian/dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-/usr/share/doc/libsdl-perl/test/data
-/usr/share/doc/libsdl-perl
-/usr/share/perl5/SDL
diff --git a/debian/docs b/debian/docs
deleted file mode 100644
index d5aaf52..0000000
--- a/debian/docs
+++ /dev/null
@@ -1,3 +0,0 @@
-BUGS
-README
-TODO
diff --git a/debian/patches/010_fontpath.diff b/debian/patches/010_fontpath.diff
deleted file mode 100644
index 251b780..0000000
--- a/debian/patches/010_fontpath.diff
+++ /dev/null
@@ -1,48 +0,0 @@
-Index: sdlperl/test/testfonttool.pl
-===================================================================
---- sdlperl.orig/test/testfonttool.pl	2009-09-01 23:11:57.000000000 -0700
-+++ sdlperl/test/testfonttool.pl	2009-09-01 23:14:08.000000000 -0700
-@@ -34,24 +34,25 @@
- $app = new SDL::App  %options;
- 
- my %ttfonts = (
--	'aircut3.ttf' => 0,
--	'electrohar.ttf' => 0,
-+       '/usr/share/fonts/truetype/freefont/FreeSerif.ttf' => 0,
-+       '/usr/share/fonts/truetype/freefont/FreeSans.ttf' => 0,
-+       '/usr/share/fonts/truetype/freefont/FreeMono.ttf' => 0,
- );
- 
- my %sfonts = (
--	'24P_Arial_NeonYellow.png' => 0,
--	'24P_Copperplate_Blue.png' => 0,
-+       'data/24P_Arial_NeonYellow.png' => 0,
-+       'data/24P_Copperplate_Blue.png' => 0,
- );
- 
- my @fonts;
- 
- for ( reverse keys %ttfonts ) {
- 	for $mode ( qw/ -normal -bold -italic -underline / ) {
--		if (-e "data/$_") {
-+            if (-e "$_") {
- 			print STDERR "Loading $_\n";
- 			$ttfonts{"$_$mode"} = new SDL::Tool::Font 
- 						$mode => 1,
--						-ttfont => "data/$_", 
-+						-ttfont => "$_", 
- 						-size => 20, 
- 						-fg => $SDL::Color::black,
- 						-bg => $SDL::Color::black;
-@@ -63,9 +64,9 @@
- %ttfonts = reverse %ttfonts;
- 
- for ( reverse keys %sfonts) {
--	if (-e "data/$_") {
-+	if (-e "$_") {
- 		print STDERR "Loading $_\n";
--		$sfonts{$_} = new SDL::Tool::Font -sfont => "data/$_";
-+		$sfonts{$_} = new SDL::Tool::Font -sfont => "$_";
- 		push @fonts,  $sfonts{$_};
- 	}
- }
diff --git a/debian/patches/030_glu_nurbs.diff b/debian/patches/030_glu_nurbs.diff
deleted file mode 100644
index b04fc36..0000000
--- a/debian/patches/030_glu_nurbs.diff
+++ /dev/null
@@ -1,13 +0,0 @@
-Index: b/src/OpenGL.xs
-===================================================================
---- a/src/OpenGL.xs
-+++ b/src/OpenGL.xs
-@@ -69,6 +69,8 @@
- 
- #define GL_HAS_NURBS
- 
-+#define GL_HAS_NURBS
-+
- #include "../../src/defines.h"
- 
- SV* sdl_perl_nurbs_error_hook;
diff --git a/debian/patches/do_not_ship_ttf_font b/debian/patches/do_not_ship_ttf_font
new file mode 100644
index 0000000..0be4150
--- /dev/null
+++ b/debian/patches/do_not_ship_ttf_font
@@ -0,0 +1,11 @@
+--- a/Build.PL
++++ b/Build.PL
+@@ -592,7 +592,7 @@
+ 		'CPAN'           => '1.92',
+ 		'perl'           => '5.008000',
+ 	},
+-	share_dir => 'share',
++	# share_dir => 'share',
+ 
+ 	build_recommends => {
+ 		'Pod::ToDemo' => '0.20',
diff --git a/debian/patches/fix_spelling b/debian/patches/fix_spelling
new file mode 100644
index 0000000..401ba1c
--- /dev/null
+++ b/debian/patches/fix_spelling
@@ -0,0 +1,92 @@
+--- a/lib/pods/SDL/Events.pod
++++ b/lib/pods/SDL/Events.pod
+@@ -462,11 +462,11 @@
+      $previous_translation_mode = SDL::Events::enable_unicode( 0 ); #disables
+ 
+ To obtain the character codes corresponding to received keyboard events, Unicode translation must first be turned on using this function. The 
+-translation incurs a slight overhead for each keyboard event and is therefore disabled by default. For each subsequently recieved key down event, 
++translation incurs a slight overhead for each keyboard event and is therefore disabled by default. For each subsequently received key down event,
+ the unicode member of the L<SDL::Event::key_sym|SDL::Event/"key_sym"> provided structure will be then contain the corresponding character code, or 
+ otherwise zero.
+ 
+-A value of 1 for enabling, 0 for disabling and -1 for unchanged. -1 is usefull for querying the current translation mode.
++A value of 1 for enabling, 0 for disabling and -1 for unchanged. -1 is useful for querying the current translation mode.
+ 
+ Only key press events will be translated not release events.
+ 
+--- a/lib/pods/SDL/GFX/Framerate.pod
++++ b/lib/pods/SDL/GFX/Framerate.pod
+@@ -41,7 +41,7 @@
+ 
+  SDL::GFX::Framerate::delay($fps);
+ 
+-Generate a delay to accomodate currently set framerate. Call once in thegraphics/rendering loop. 
++Generate a delay to accommodate currently set framerate. Call once in thegraphics/rendering loop. 
+ If the computer cannot keep up with the rate (i.e.drawing too slow), the delay is zero and the delay interpolation is reset.
+ 
+ =head1 AUTHORS
+--- a/lib/pods/SDL/MPEG.pod
++++ b/lib/pods/SDL/MPEG.pod
+@@ -15,7 +15,7 @@
+ 
+ =head1 DESCRIPTION
+ 
+-C<SDL::MPEG> provides an interface to quering the status
++C<SDL::MPEG> provides an interface to query the status
+ of a SMPEG stream.  
+ 
+ =head2 METHODS 
+--- a/lib/pods/SDLx/App.pod
++++ b/lib/pods/SDLx/App.pod
+@@ -75,7 +75,7 @@
+ Any flags you want to pass to L<SDL::Video> upon initialization. Defaults to SDL_ANYFORMAT. Flags should be I<or'ed> together if you're passing more than one (flags => FOO|BAR). Shortcut: 'f'.
+ 
+ =item * resizeable
+-Set this to a true value to make the window resizeable by the user. Default is off.
++Set this to a true value to make the window resizable by the user. Default is off.
+ 
+ =item * exit_on_quit
+ Set this to a true value to make the app exit if a SDL_QUIT event is triggered. Shortcut: 'eoq'.
+@@ -139,9 +139,9 @@
+ 
+ =head2 sync
+ 
+-C<SDLx::App::sync> encapsulates the various methods of syncronizing the screen with the
++C<SDLx::App::sync> encapsulates the various methods of synchronizing the screen with the
+ current video buffer. C<SDLx::App::sync> will do a fullscreen update, using the double buffer
+-or OpenGL buffer if applicable. This is prefered to calling flip on the application window.
++or OpenGL buffer if applicable. This is preferred to calling flip on the application window.
+ 
+ =head2 attribute( $attr )
+ 
+--- a/lib/pods/SDLx/Controller.pod
++++ b/lib/pods/SDLx/Controller.pod
+@@ -97,7 +97,7 @@
+ =back
+ 
+ Please refer to each handler below for information on received arguments.
+-Note that the second argument every callback recieves is the C<SDLx::Controller> object.
++Note that the second argument received by every callback is the C<SDLx::Controller> object.
+ 
+ =head2 stop
+ 
+@@ -108,7 +108,7 @@
+ Attempts to pause the application with a call to C<SDL::Events::wait_event>. See L<SDL::Events>.
+ 
+ Takes 1 argument which is a callback. The application waits for the next event with C<wait_event>.
+-When one is recieved, it is passed to the callback as the first argument, along with the C<SDLx::Controller> object as the second argument.
++When one is received, it is passed to the callback as the first argument, along with the C<SDLx::Controller> object as the second argument.
+ If the callback then returns a true value, C<pause> will return.
+ If the callback returns a false value, C<pause> will repeat the process.
+ 
+--- a/lib/pods/SDLx/Controller/Interface.pod
++++ b/lib/pods/SDLx/Controller/Interface.pod
+@@ -60,7 +60,7 @@
+       }
+   );
+ 
+-These accelerations are arbitary and can be set to any frame of reference.
++These accelerations are arbitrary and can be set to any frame of reference.
+ Your render callback will handle how to interpret it.
+ 
+ The callback will receive the time and the current state as a
diff --git a/debian/patches/fix_whatis_entries b/debian/patches/fix_whatis_entries
new file mode 100644
index 0000000..97ad271
--- /dev/null
+++ b/debian/patches/fix_whatis_entries
@@ -0,0 +1,33 @@
+--- a/lib/pods/SDL/Tutorial/Animation.pod
++++ b/lib/pods/SDL/Tutorial/Animation.pod
+@@ -3,7 +3,7 @@
+ 
+ =head1 NAME
+ 
+-SDL::Tutorial::Animation
++SDL::Tutorial::Animation - Creating animations with SDL
+ 
+ =head2 CATEGORY
+ 
+--- a/lib/pods/SDLx/Sound.pod
++++ b/lib/pods/SDLx/Sound.pod
+@@ -1,7 +1,7 @@
+ 
+ =head1 NAME
+ 
+-SDLx::Sound
++SDLx::Sound - SDL sound extension
+ 
+ =head1 CATEGORY
+ 
+--- a/lib/pods/SDL/Cookbook.pod
++++ b/lib/pods/SDL/Cookbook.pod
+@@ -1,7 +1,7 @@
+ 
+ =head1 NAME
+ 
+-SDL::Cookbook
++SDL::Cookbook - SDL recipes
+ 
+ =head2 CATEGORY
+ 
diff --git a/debian/patches/install_man_pages_correctly b/debian/patches/install_man_pages_correctly
new file mode 100644
index 0000000..3f56248
--- /dev/null
+++ b/debian/patches/install_man_pages_correctly
@@ -0,0 +1,15 @@
+--- a/inc/My/Builder.pm
++++ b/inc/My/Builder.pm
+@@ -193,4 +193,12 @@
+ 	$self->SUPER::ACTION_test();
+ }
+ 
++sub man3page_name {
++  my $self = shift ;
++
++  my $name = $self->SUPER::man3page_name( @_ ) ;
++
++  $name =~ s!^pods::!!;
++  return $name ;
++}
+ 1;
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..712cad3
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1,4 @@
+do_not_ship_ttf_font
+install_man_pages_correctly
+fix_whatis_entries
+fix_spelling
diff --git a/debian/rules b/debian/rules
index e29de84..2d33f6a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,33 +1,4 @@
 #!/usr/bin/make -f
 
-ifeq (hppa,$(DEB_BUILD_ARCH))
-CC="gcc -ffunction-sections"
-else
-CC="gcc"
-endif
-
 %:
-	dh --with quilt $@
-
-CMD=$(subst override_,,$@)
-
-override_dh_auto_configure:
-	$(CMD) -- --config cc=$(CC) --config ld=g++
-
-override_dh_auto_clean:
-	$(CMD)
-	rm -f lib/SDL/Config.pm
-	rm -f build-stamp configure-stamp
-
-override_dh_auto_test:
-	-$(CMD)
-
-override_dh_installexamples:
-	# Install examples
-	cp test/*.pl `pwd`/debian/libsdl-perl/usr/share/doc/libsdl-perl/test/
-	cp -a test/data `pwd`/debian/libsdl-perl/usr/share/doc/libsdl-perl/test/
-	rm -f `pwd`/debian/libsdl-perl/usr/share/doc/libsdl-perl/test/data/*ttf
-	cp -a test/OpenGL `pwd`/debian/libsdl-perl/usr/share/doc/libsdl-perl/
-
-override_dh_installchangelogs:
-	$(CMD) CHANGELOG
+	dh $@
diff --git a/lib/SDL/Config.pm b/lib/SDL/Config.pm
new file mode 100644
index 0000000..7327cbd
--- /dev/null
+++ b/lib/SDL/Config.pm
@@ -0,0 +1,14 @@
+package SDL::Config;
+
+use strict;
+use warnings;
+use SDL::ConfigData;
+
+sub has {
+	my ( $class, $define ) = @_;
+	my $sdl_config = SDL::ConfigData->config('SDL_cfg');
+	my $n = scalar grep { $$sdl_config{$_}{'libs'}{$define} } keys %$sdl_config;
+	return ( $n > 0 ) ? 1 : 0;
+}
+
+1;

-- 
Debian packaging of SDL_Perl CPAN distribution



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