r8680 - in /trunk/libopengl-perl/debian: changelog patches/ patches/no-display-build patches/series rules

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

Author: ntyni-guest
Date: Mon Oct 29 20:49:48 2007
New Revision: 8680

URL: http://svn.debian.org/wsvn/?sc=1&rev=8680
Log:
  + no-display-build: don't try to find out the GL version and features
    from the running X server.

Added:
    trunk/libopengl-perl/debian/patches/
    trunk/libopengl-perl/debian/patches/no-display-build
    trunk/libopengl-perl/debian/patches/series
Modified:
    trunk/libopengl-perl/debian/changelog
    trunk/libopengl-perl/debian/rules

Modified: trunk/libopengl-perl/debian/changelog
URL: http://svn.debian.org/wsvn/trunk/libopengl-perl/debian/changelog?rev=8680&op=diff
==============================================================================
--- trunk/libopengl-perl/debian/changelog (original)
+++ trunk/libopengl-perl/debian/changelog Mon Oct 29 20:49:48 2007
@@ -16,6 +16,8 @@
     should be fixed.
   * Wrap overlong Build-Depends line.
   * Manage debian/patches with quilt.
+    + no-display-build: don't try to find out the GL version and features
+      from the running X server.
 
  -- Niko Tyni <ntyni at iki.fi>  Mon, 29 Oct 2007 22:35:18 +0200
 

Added: trunk/libopengl-perl/debian/patches/no-display-build
URL: http://svn.debian.org/wsvn/trunk/libopengl-perl/debian/patches/no-display-build?rev=8680&op=file
==============================================================================
--- trunk/libopengl-perl/debian/patches/no-display-build (added)
+++ trunk/libopengl-perl/debian/patches/no-display-build Mon Oct 29 20:49:48 2007
@@ -1,0 +1,11 @@
+--- libopengl-perl.orig/Makefile.PL
++++ libopengl-perl/Makefile.PL
+@@ -36,7 +36,7 @@
+ unlink($exc_file) if (-e $exc_file);
+ 
+ # Only run this if GLUT is installed
+-if ($found_libs->{GLUT})
++if ($found_libs->{GLUT} && !grep /NO_DISPLAY/, @ARGV)
+ {
+   my $glv_file = 'utils/glversion.txt';
+ 

Added: trunk/libopengl-perl/debian/patches/series
URL: http://svn.debian.org/wsvn/trunk/libopengl-perl/debian/patches/series?rev=8680&op=file
==============================================================================
--- trunk/libopengl-perl/debian/patches/series (added)
+++ trunk/libopengl-perl/debian/patches/series Mon Oct 29 20:49:48 2007
@@ -1,0 +1,1 @@
+no-display-build

Modified: trunk/libopengl-perl/debian/rules
URL: http://svn.debian.org/wsvn/trunk/libopengl-perl/debian/rules?rev=8680&op=diff
==============================================================================
--- trunk/libopengl-perl/debian/rules (original)
+++ trunk/libopengl-perl/debian/rules Mon Oct 29 20:49:48 2007
@@ -23,13 +23,15 @@
 build:	patch build-stamp
 build-stamp:
 	dh_testdir
-	$(PERL) Makefile.PL INSTALLDIRS=vendor PERL=$(PERL) INC="" LIBS="-lGLU -lglut -lGL -lX11"
+	$(PERL) Makefile.PL INSTALLDIRS=vendor NO_DISPLAY PERL=$(PERL) INC="" LIBS="-lGLU -lglut -lGL -lX11"
 	$(MAKE) LD_RUN_PATH=
 	touch $@
 
 clean:	checkroot unpatch
 	rm -f build-stamp
-	[ ! -f Makefile ] || $(MAKE) distclean
+	# update the timestamp: 'unpatch' modifies Makefile.PL,
+	# which would cause a rebuild of the Makefile
+	if [ -f Makefile ]; then touch Makefile && $(MAKE) distclean; fi
 	dh_clean
 
 binary-indep:	checkroot build