r10248 - in packages/trunk/zaz/debian: . pkg-config

[Miriam Ruiz]

Author: miriam
Date: 2009-08-30 13:03:50 +0000 (Sun, 30 Aug 2009)
New Revision: 10248

Modified:
   packages/trunk/zaz/debian/changelog
   packages/trunk/zaz/debian/pkg-config/gl.pc
   packages/trunk/zaz/debian/pkg-config/glu.pc
   packages/trunk/zaz/debian/rules
Log:
Build for versions of libgl1-mesa-dev < 7.5



Modified: packages/trunk/zaz/debian/changelog
===================================================================
--- packages/trunk/zaz/debian/changelog	2009-08-30 12:46:30 UTC (rev 10247)
+++ packages/trunk/zaz/debian/changelog	2009-08-30 13:03:50 UTC (rev 10248)
@@ -1,6 +1,8 @@
 zaz (0.2.9+dfsg1-1) UNRELEASED; urgency=low
 
   * New Upstream Release
+  * Added local pkg-config files for GL and GLU (libgl1-mesa-dev < 7.5 does
+    not ship a pkg-config file for them)
 
  -- Miriam Ruiz <little_miry at yahoo.es>  Sun, 30 Aug 2009 14:34:56 +0200
 

Modified: packages/trunk/zaz/debian/pkg-config/gl.pc
===================================================================
--- packages/trunk/zaz/debian/pkg-config/gl.pc	2009-08-30 12:46:30 UTC (rev 10247)
+++ packages/trunk/zaz/debian/pkg-config/gl.pc	2009-08-30 13:03:50 UTC (rev 10248)
@@ -5,6 +5,7 @@
 
 Name: gl
 Description: OpenGL Library
+Version: 0.7
 Requires.private: x11 xext
 Libs: -L${libdir} -lGL
 Libs.private: -lm -lpthread

Modified: packages/trunk/zaz/debian/pkg-config/glu.pc
===================================================================
--- packages/trunk/zaz/debian/pkg-config/glu.pc	2009-08-30 12:46:30 UTC (rev 10247)
+++ packages/trunk/zaz/debian/pkg-config/glu.pc	2009-08-30 13:03:50 UTC (rev 10248)
@@ -5,6 +5,7 @@
 
 Name: glu
 Description: OpenGL Utility Library
+Version: 0.7
 Requires: gl
 Requires.private: 
 Libs: -L${libdir} -lGLU

Modified: packages/trunk/zaz/debian/rules
===================================================================
--- packages/trunk/zaz/debian/rules	2009-08-30 12:46:30 UTC (rev 10247)
+++ packages/trunk/zaz/debian/rules	2009-08-30 13:03:50 UTC (rev 10248)
@@ -13,6 +13,14 @@
 CROSS= --build $(DEB_BUILD_GNU_TYPE)
 endif
 
+PKG_CONFIG_PATH=""
+ifeq "$(wildcard /usr/lib/pkgconfig/gl.pc)" ""
+	PKG_CONFIG_PATH=$(CURDIR)/debian/pkg-config/
+endif
+ifeq "$(wildcard /usr/lib/pkgconfig/glu.pc)" ""
+	PKG_CONFIG_PATH=$(CURDIR)/debian/pkg-config/
+endif
+
 config: config-stamp
 config-stamp: 
 	dh_testdir
@@ -23,7 +31,7 @@
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-	export PKG_CONFIG_PATH="$(CURDIR)/debian/pkg-config/" \
+	export PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" && \
 	./configure $(CROSS) \
 		--prefix=/usr \
 		--bindir=\$${prefix}/games \
@@ -37,7 +45,7 @@
 build: build-stamp
 build-stamp: config
 	dh_testdir
-	export PKG_CONFIG_PATH="$(CURDIR)/debian/pkg-config/" \
+	export PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" && \
 		$(MAKE)
 	touch $@
 
@@ -55,7 +63,7 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
-	export PKG_CONFIG_PATH="$(CURDIR)/debian/pkg-config/" \
+	export PKG_CONFIG_PATH="$(PKG_CONFIG_PATH)" && \
 		$(MAKE) DESTDIR=$(CURDIR)/debian/zaz install
 	rm debian/zaz/usr/share/games/zaz/FreeMonoBold.ttf
 	ln -s /usr/share/fonts/truetype/freefont/FreeMonoBold.ttf debian/zaz/usr/share/games/zaz/FreeMonoBold.ttf