[glfw] 12/18: Refactor the build system rules and remove libglfw.so.2.6

[James Cowgill]

This is an automated email from the git hooks/post-receive script.

jcowgill-guest pushed a commit to branch master
in repository glfw.

commit c6c79bf19986a77d6f342daecd479d0d207048f7
Author: James Cowgill <james410 at cowgill.org.uk>
Date:   Sat Jun 20 21:47:33 2015 +0100

    Refactor the build system rules and remove libglfw.so.2.6
    
    The libglfw.so.2.6 is not needed and (looking at the version) is not
    auto updated so just drop it.
    
    Move the actual building from the binary target to the build target.
    After this, debhelper should provide the correct CFLAGS automatically.
    
    Use glfw's build system to build the pkgconfig and so files. After this
    we need to use dh-exec to rename the so file.
---
 debian/control             |  2 +-
 debian/libglfw-dev.install |  6 +++---
 debian/libglfw-dev.links   |  2 +-
 debian/libglfw2.install    |  3 ++-
 debian/libglfw2.links      |  1 -
 debian/rules               | 15 ++++++---------
 6 files changed, 13 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index 62c3b80..dd68beb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
 Uploaders: Mahyuddin Susanto <udienz at ubuntu.com>,
            James Cowgill <james410 at cowgill.org.uk>
-Build-Depends: debhelper (>= 9),
+Build-Depends: debhelper (>= 9), dh-exec,
                libgl1-mesa-dev | libgl-dev,
                libglu1-mesa-dev | libglu-dev,
                libxrandr-dev
diff --git a/debian/libglfw-dev.install b/debian/libglfw-dev.install
index a158e49..a861cb9 100644
--- a/debian/libglfw-dev.install
+++ b/debian/libglfw-dev.install
@@ -1,3 +1,3 @@
-debian/tmp/usr/include/*
-debian/tmp/usr/lib/lib*.a
-debian/tmp/usr/lib/pkgconfig/libglfw.pc
+usr/include/*
+usr/lib/lib*.a
+usr/lib/pkgconfig/libglfw.pc
diff --git a/debian/libglfw-dev.links b/debian/libglfw-dev.links
index fc53980..1cc2f1c 100644
--- a/debian/libglfw-dev.links
+++ b/debian/libglfw-dev.links
@@ -1 +1 @@
-usr/lib/libglfw.so.2.6 usr/lib/libglfw.so 
+usr/lib/libglfw.so.2 usr/lib/libglfw.so
diff --git a/debian/libglfw2.install b/debian/libglfw2.install
old mode 100644
new mode 100755
index c45ebcf..6dd9832
--- a/debian/libglfw2.install
+++ b/debian/libglfw2.install
@@ -1 +1,2 @@
-debian/tmp/usr/lib/lib*.so.*
+#!/usr/bin/dh-exec
+usr/lib/libglfw.so => usr/lib/libglfw.so.2
diff --git a/debian/libglfw2.links b/debian/libglfw2.links
deleted file mode 100644
index b230f9a..0000000
--- a/debian/libglfw2.links
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/libglfw.so.2.6 usr/lib/libglfw.so.2
diff --git a/debian/rules b/debian/rules
index 051edb4..cecd865 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,17 +1,14 @@
 #!/usr/bin/make -f
 # -*- makefile -*-
 %:
-	dh ${@}
+	dh $@
 
-override_dh_auto_install:
-	PREFIX=/usr sh compile.sh
-	dh_auto_install
-	
-override_dh_installdirs:
+override_dh_auto_build:
 	$(MAKE) x11
-	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
+	$(MAKE) -C lib/x11 -f Makefile.x11 PREFIX=/usr libglfw.pc
+
+override_dh_auto_install:
+	$(MAKE) PREFIX=$(CURDIR)/debian/tmp/usr x11-dist-install
 
 override_dh_auto_clean:
 	[ ! -f config.log ] || $(MAKE) x11-dist-clean

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/glfw.git