[SCM] 3depict branch, master, updated. debian/0.0.12-1-9-g4b12893

[Anton Gladky]

The following commit has been merged in the master branch:
commit 4b1289383fb3ff3949729ddfc2bce0dacf1542cf
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Sat Apr 27 17:13:29 2013 +0200

    Simplify debian/rules. Use --parallel for faster building.

diff --git a/debian/rules b/debian/rules
index 9537c07..54641da 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,24 +1,9 @@
 #!/usr/bin/make -f
 
-# These are used for cross-compiling and for saving the configure script
-# from having to guess our platform (since we know it already)
-DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
-DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
-ifneq ($(DEB_HOST_GNU_TYPE),$(DEB_BUILD_GNU_TYPE))
-CROSS= --build $(DEB_BUILD_GNU_TYPE) --host $(DEB_HOST_GNU_TYPE)
-else
-CROSS= --build $(DEB_BUILD_GNU_TYPE)
-endif
-
-#Hardening
-DPKG_EXPORT_BUILDFLAGS = 1
-include /usr/share/dpkg/buildflags.mk
-
 %:
-	dh $@
+	dh $@ --parallel
 
 override_dh_auto_configure: 
-	#Compile package, disabling internal debug checking and enabling parallelism
 	dh_auto_configure -- --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info --enable-openmp-parallel --disable-debug-checks --with-libpng-link="-lpng" --with-libpng-flags="-L/lib" --with-ftgl-prefix="/usr"
 
 
@@ -36,44 +21,30 @@ override_dh_clean:
 	dh_clean 
 
 
-override_dh_install: 
-	dh_testdir
-	dh_testroot
-	dh_prep  
-	dh_installdirs
-
-	# Add here commands to install the package into debian/3depict.
-	$(MAKE) DESTDIR=$(CURDIR)/debian/3depict install
-
+override_dh_auto_install: 
+	dh_auto_install
 	#Install the textures
 	mkdir -p $(CURDIR)/debian/3depict/usr/share/3depict/textures/
 	cp -p data/textures/*png $(CURDIR)/debian/3depict/usr/share/3depict/textures/
-
 	#rename 3Depict (real program name) to debian-friendly 3depict
 	mv $(CURDIR)/debian/3depict/usr/bin/3Depict $(CURDIR)/debian/3depict/usr/bin/3depict
-
 	mkdir -p $(CURDIR)/debian/3depict/usr/share/doc/3depict/
 	echo "Copyright 2011 D Haley <mycae at yahoo.com>" > $(CURDIR)/debian/3depict/usr/share/doc/3depict/copyright
 	echo "See /usr/share/common-licenses/GPL-1 for copyright info" >> $(CURDIR)/debian/3depict/usr/share/doc/3depict/copyright
-
 	#Install .desktop file (for XFCE)
 	install -Dp -m 644 $(CURDIR)/packaging/3Depict.desktop $(CURDIR)/debian/3depict/usr/share/applications/3depict.desktop
 	#install icon (both SVG and XPM) into pixmaps
 	install -Dp -m 644 $(CURDIR)/data/3Depict.xpm $(CURDIR)/debian/3depict/usr/share/pixmaps/3depict.xpm
 	install -Dp -m 644 $(CURDIR)/data/textures/tex-source/3Depict-icon.svg $(CURDIR)/debian/3depict/usr/share/pixmaps/3depict.svg
-	
 	#Install the pre-built locale files that are shipped with the tarball.
 	#translation sources (.po) files are in the translations/ folder.
-	
 	#remap a few locale names
 	sh -c "mv locales/de_DE/ locales/de/"
 	mkdir -p $(CURDIR)/debian/3depict/usr/share/locale/
 	cp -R locales/* $(CURDIR)/debian/3depict/usr/share/locale/
 	#undo locale renaming
 	sh -c "mv locales/de/ locales/de_DE/"
-	
 	# convert installed 3Depict.mo files to lowercase	
 	find $(CURDIR)/debian/3depict/usr/share/locale/ -name 3Depict.mo | xargs rename 's/3Depict.mo/3depict.mo/'
-
 	#Install manual to 3depict dir
 	cp $(CURDIR)/docs/manual-latex/manual.pdf $(CURDIR)/debian/3depict/usr/share/3depict/

-- 
3depict