r8987 - in packages/trunk/glfw/debian: . patches

[Gonéri Le Bouder]

Author: goneri
Date: 2009-02-28 23:25:18 +0000 (Sat, 28 Feb 2009)
New Revision: 8987

Removed:
   packages/trunk/glfw/debian/patches/pkg-config.diff
Modified:
   packages/trunk/glfw/debian/changelog
   packages/trunk/glfw/debian/patches/series
   packages/trunk/glfw/debian/rules
Log:
avoid a patch to fix the pkg-config file

Modified: packages/trunk/glfw/debian/changelog
===================================================================
--- packages/trunk/glfw/debian/changelog	2009-02-28 23:17:28 UTC (rev 8986)
+++ packages/trunk/glfw/debian/changelog	2009-02-28 23:25:18 UTC (rev 8987)
@@ -1,7 +1,7 @@
 glfw (2.6-2) unstable; urgency=low
 
   * Fix /usr/lib/libglfw.so symlink (Closes: #516988)
-  * add pkg-config.diff (Closes: #516989)
+  * Fix the pkg-config file (Closes: #516989)
   * Calls dh_makeshlibs before dh_shlibdeps
   * Standard Version bumped to 3.8.0
    - add a README.source

Deleted: packages/trunk/glfw/debian/patches/pkg-config.diff
===================================================================
--- packages/trunk/glfw/debian/patches/pkg-config.diff	2009-02-28 23:17:28 UTC (rev 8986)
+++ packages/trunk/glfw/debian/patches/pkg-config.diff	2009-02-28 23:25:18 UTC (rev 8987)
@@ -1,17 +0,0 @@
---- glfw-2.6.orig/compile.sh
-+++ glfw-2.6/compile.sh
-@@ -592,10 +592,10 @@
- echo " " 1>&6
- echo "$config_script: Creating ""$MKNAME""..." >&5
- cat > "$MKNAME" <<EOF
--prefix=@PREFIX@
--exec_prefix=@PREFIX@
--libdir=@PREFIX@/lib
--includedir=@PREFIX@/include
-+prefix=/usr
-+exec_prefix=/usr
-+libdir=/usr/lib
-+includedir=/usr/include
- 
- Name: GLFW
- Description: A portable framework for OpenGL development

Modified: packages/trunk/glfw/debian/patches/series
===================================================================
--- packages/trunk/glfw/debian/patches/series	2009-02-28 23:17:28 UTC (rev 8986)
+++ packages/trunk/glfw/debian/patches/series	2009-02-28 23:25:18 UTC (rev 8987)
@@ -1,2 +1 @@
 fix-soname.diff
-pkg-config.diff

Modified: packages/trunk/glfw/debian/rules
===================================================================
--- packages/trunk/glfw/debian/rules	2009-02-28 23:17:28 UTC (rev 8986)
+++ packages/trunk/glfw/debian/rules	2009-02-28 23:25:18 UTC (rev 8987)
@@ -32,6 +32,7 @@
 	dh_testroot
 	dh_prep
 	dh_installdirs
+	sed -e 's,\@PREFIX\@,/usr,' ./lib/x11/libglfw.pc.in > ./lib/x11/libglfw.pc
 	make x11-install PREFIX=$(CURDIR)/debian/tmp/usr
 	cp lib/x11/libglfw.so debian/tmp/usr/lib/libglfw.so.2.6