[SCM] FreeCAD packaging branch, master, updated. debian/0.11.3729.dfsg-1-28-g7989aa6

[Anton Gladky]

The following commit has been merged in the master branch:
commit b580a7d1c0c7905707d11c0f9698d11925c8d8d0
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Jun 9 20:05:42 2011 +0200

    Update debian/rules

diff --git a/debian/rules b/debian/rules
index 607341e..b8963ce 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,8 +1,6 @@
 #!/usr/bin/make -f
-# -*- makefile -*-
-
-# Uncomment this to turn on verbose mode.
-#export DH_VERBOSE=1
+%:
+	dh $@
 
 MODULES = Part Mesh MeshPart PartDesign Sketcher Points Raytracing Image Drawing ReverseEngineering Complete Fem Robot Import Inspection
 
@@ -12,27 +10,15 @@ DEB_HOST_GNU_TYPE   ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
 DEB_BUILD_GNU_TYPE  ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
 
 
-config.status: configure
-	dh_testdir
-	./configure --with-occ-include=/usr/include/opencascade \
+override_dh_auto_configure:
+	dh_auto_configure -- --with-occ-include=/usr/include/opencascade \
 --with-occ-lib=/usr/lib \
 --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
 --prefix=/usr/lib/freecad --mandir=/usr/share/man \
 --infodir=/usr/share/info --datadir=/usr/share/freecad \
 --includedir=/usr/include/freecad --docdir=/usr/share/doc/freecad
 
-build: build-stamp
-
-build-stamp: config.status
-	dh_testdir
-	$(MAKE)
-	touch $@
-
-clean:
-	mv src/Build/Version.h src/Build/Version.h.old
-	dh clean
-	mv src/Build/Version.h.old src/Build/Version.h
-	rm -f build-stamp
+override_dh_auto_clean:
 	find -name '*.pyc' | xargs rm -f
 	find -name 'moc_*.cpp' | xargs rm -f
 	find -name '*.lo' | xargs rm -f
@@ -45,17 +31,9 @@ clean:
 	    m4/ltversion.m4 m4/lt~obsolete.m4; do \
 	  mv -f $$autotools_mod_file.setaside $$autotools_mod_file; \
 	done; fi
-	dh clean
-	rm -f patch-stamp
-	#quilt pop -a
-	#rm -rf .pc/
+	dh_clean
 
-install: build install-stamp
-install-stamp:
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
+override_dh_auto_install:
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp/freecad
 	# Remove testing modules we don't want to have in the deb
 	rm -rf debian/tmp/freecad/usr/lib/freecad/Mod/_TEMPLATE_
@@ -67,8 +45,6 @@ install-stamp:
 	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/FreeCAD.so usr/lib/freecad/lib
 	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/lib/lib*.so.* usr/lib/freecad/lib
 	dh_install debian/freecad.desktop usr/share/applications
-	dh_installman debian/freecad.1
-	dh_installchangelogs ChangeLog.txt
 	# install the modules
 	$(foreach MODULE,$(MODULES), \
 	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/$(MODULE)*.so usr/lib/freecad/Mod/$(MODULE); \
@@ -83,28 +59,22 @@ install-stamp:
 	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/lib*.so.* usr/lib/freecad/Mod/Test
 	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/*.py usr/lib/freecad/Mod/Test
 	dh_install -pfreecad debian/tmp/freecad/usr/lib/freecad/Mod/Test/QtUnitGui.so usr/lib/freecad/Mod/Test
-
 	dh_install -pfreecad-dev debian/tmp/freecad/usr/include/* usr/include
 	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/lib/lib*.so usr/lib/freecad/lib
 	$(foreach MODULE,$(MODULES), \
 	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.la usr/lib/freecad/Mod/$(MODULE); \
 	dh_install -pfreecad-dev debian/tmp/freecad/usr/lib/freecad/Mod/$(MODULE)/lib*.so usr/lib/freecad/Mod/$(MODULE);)
-
 	# install the help system
 	dh_install -pfreecad-doc debian/tmp/freecad/usr/share/doc/* usr/share/doc/
-	touch install-stamp
 
 override_dh_compress:
 	dh_compress -X.qch -X.qhc
 
-override_dh_makeshlibs:
-
+override_dh_installman:
+	dh_installman debian/freecad.1
 
-binary-indep: build install
-	dh binary-indep
+overide_dh_installchangelogs:
+	dh_installchangelogs ChangeLog.txt
 
-binary-arch: build install
-	dh binary-arch
+override_dh_makeshlibs:
 
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install

-- 
FreeCAD packaging