[SCM] Debian packaging of libopengl-perl branch, master, updated. upstream/0.66+dfsg-128-g427c70b

[Maximilian Gass]

The following commit has been merged in the master branch:
commit 427c70b053004273142d28d46e81f1567d9a5d93
Author: Maximilian Gass <mxey at cloudconnected.org>
Date:   Sat Aug 20 06:06:59 2011 +0200

    Fix conflict markers in Makefile.PL

diff --git a/Makefile.PL b/Makefile.PL
index 6aecc3c..2811382 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -426,11 +426,7 @@ if ($IS_W32API || (($^O eq 'MSWin32') && !$IS_CYGWIN))		# Win32
   # clear that this step is even needed since the freeglut.dll is installed
   # by this Makefile.PL if no FreeGLUT is found.
   #
-<<<<<<< HEAD
-  ## $EXES = ['FreeGLUT/freeglut.dll']; 
-=======
   ## $EXES = ['FreeGLUT/freeglut.dll'];
->>>>>>> upstream/0.66+dfsg
   {
      system $^X , qw[-MExtUtils::Command -e mkpath --], qw[blib/bin];
      system $^X , qw[-MExtUtils::Command -e cp --], qw[FreeGLUT/freeglut.dll blib/bin/freeglut.dll];
@@ -483,11 +479,7 @@ else # Everyone else
 
   # Test for obfuscated Freeglut
   # quite often Freeglut is in -lglut...  Test for GL/freeglut.h instead...
-<<<<<<< HEAD
-  my $out = cfile_text('GL/freeglut.h');
-=======
   $out = cfile_text('GL/freeglut.h');
->>>>>>> upstream/0.66+dfsg
 
   # The cpp would not let this macro through. Check for something else
   # that still exists after the cpp pass. a typedef, or type would work
@@ -570,11 +562,7 @@ my $build_config =
     'Config.pm' => '$(INST_LIBDIR)/OpenGL/Config.pm'
   },
   'PREREQ_PM' => { 'Test::More' => 0 },
-<<<<<<< HEAD
-  'AUTHOR'	=> "Bob 'grafman' Free ".'<grafman at graphcomp.com>',
-=======
   'AUTHOR'	=> "Chris Marshall ".'<chm at cpan dot org>',
->>>>>>> upstream/0.66+dfsg
   'OBJECT' 	=> '$(BASEEXT)$(OBJ_EXT) gl_util$(OBJ_EXT) pogl_const$(OBJ_EXT) pogl_gl_top$(OBJ_EXT) pogl_glu$(OBJ_EXT) pogl_rpn$(OBJ_EXT) pogl_glut$(OBJ_EXT) pogl_gl_Accu_GetM$(OBJ_EXT) pogl_gl_GetP_Pass$(OBJ_EXT) pogl_gl_Mult_Prog$(OBJ_EXT) pogl_gl_Pixe_Ver2$(OBJ_EXT) pogl_gl_Prog_Clam$(OBJ_EXT) pogl_gl_Tex2_Draw$(OBJ_EXT) pogl_gl_Ver3_Tex1$(OBJ_EXT) pogl_gl_Vert_Multi$(OBJ_EXT)',
   'XSPROTOARG'	=> '-noprototypes',
   'DEFINE'	=> $DEFS,

-- 
Debian packaging of libopengl-perl