[SCM] Packaging the irrlicht game engine branch, master, updated. upstream/1.5-48-g18d283f

[Christoph Egger]

The following commit has been merged in the master branch:
commit 18d283f90e3c47141e02c0f2d902a7c7673918ce
Author: Christoph Egger <Christoph.Egger at gmx.de>
Date:   Sun Aug 2 22:46:31 2009 +0200

    Remove unneeded *dirs* files
    Make debian/clean independent of the library soname
    Clean debian/rules: make -C
    use dh_link commandline as there are some variables available we don't have in debian/link

diff --git a/debian/clean b/debian/clean
index 2e91946..0a6df9a 100644
--- a/debian/clean
+++ b/debian/clean
@@ -1,5 +1,5 @@
 lib/Linux/libIrrlicht.a
-lib/Linux/libIrrlicht.so.1.5
-source/Irrlicht/libIrrlicht.so.1.5
+lib/Linux/libIrrlicht.so.*
+source/Irrlicht/libIrrlicht.so.*
 build-lib-sharedlib
 build-lib-staticlib
diff --git a/debian/irrlicht-dev.dirs b/debian/irrlicht-dev.dirs
deleted file mode 100644
index 431206a..0000000
--- a/debian/irrlicht-dev.dirs
+++ /dev/null
@@ -1,3 +0,0 @@
-usr/lib
-usr/include
-usr/include/irrlicht
diff --git a/debian/libirrlicht1.dirs b/debian/libirrlicht1.dirs
deleted file mode 100644
index 07c2980..0000000
--- a/debian/libirrlicht1.dirs
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/
-usr/lib
diff --git a/debian/rules b/debian/rules
index 9e864e8..8a70cc5 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,20 +18,13 @@ include /usr/share/quilt/quilt.make
 # shared library versions, option 1
 version=1.5
 major=1
-# option 2, assuming the library is created as src/.libs/libfoo.so.2.0.5 or so
-#version=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'`
-#major=`ls src/.libs/lib*.so.* | \
-# awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
 build-lib-%: $(QUILT_STAMPFN) #move-away
 	dh_testdir
 
 	[ -d lib/Linux ] || mkdir -p lib/Linux
 
-	(cd source/Irrlicht; \
-		CFLAGS="$(CFLAGS)" LFLAGS="$(LFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) $*; \
-	);
+	CFLAGS="$(CFLAGS)" LFLAGS="$(LFLAGS)" CXXFLAGS="$(CXXFLAGS)" $(MAKE) -C source/Irrlicht $*
 
 	touch $@
 
@@ -63,10 +56,7 @@ clean: unpatch
 	dh_testroot
 	rm -f build-stamp configure-stamp
 
-	# Add here commands to clean up after the build process.
-	(cd source/Irrlicht; \
-		$(MAKE) clean; \
-	)
+	$(MAKE) -C source/Irrlicht clean
 
 	dh_clean 
 
@@ -79,11 +69,11 @@ install: build
 	mkdir -p $(CURDIR)/debian/tmp/usr/lib
 	mkdir -p $(CURDIR)/debian/tmp/usr/include/irrlicht
 
-	# Add here commands to install the package into debian/tmp
-	( cd source/Irrlicht; \
-		$(MAKE) DESTDIR=$(CURDIR)/debian/tmp INSTALL_DIR=$(CURDIR)/debian/tmp/usr/lib install; \
-	)
-	cp include/* $(CURDIR)/debian/tmp/usr/include/irrlicht
+#	dh_installdirs -Pdebian/tmp usr/include/irrlicht usr/lib
+
+	$(MAKE) -C source/Irrlicht DESTDIR=$(CURDIR)/debian/irrlicht-dev INSTALL_DIR=$(CURDIR)/debian/irrlicht-dev/usr/lib install
+
+#	cp include/* $(CURDIR)/debian/irrlicht-dev/usr/include/irrlicht
 
 
 # Build architecture-independent files here.
@@ -99,7 +89,7 @@ binary-arch: install
 	dh_installexamples
 	dh_install --sourcedir=debian/tmp
 	dh_installman
-	dh_link
+	dh_link -plibirrlicht1 usr/lib/libIrrlicht.so.${version} usr/lib/libIrrlicht.so.${major}
 	dh_strip --dbg-package=libirrlicht1-dbg
 	dh_compress
 	dh_fixperms

-- 
Packaging the irrlicht game engine