[SCM] Packaging for libqglviewer. OpenGL 3D viewer library branch, master, updated. 934a9b8b6360d70add79aa53e1c613c08e13260b

Anton Gladky gladky.anton at gmail.com
Mon Sep 24 17:48:05 UTC 2012


The following commit has been merged in the master branch:
commit 51c83860a16d44b8def0d5265374d9707dfbf3f5
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Sep 24 19:37:05 2012 +0200

    Use override_dh commands.

diff --git a/debian/rules b/debian/rules
index 884c734..4e2b490 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,5 +1,8 @@
 #!/usr/bin/make -f
 
+%:
+	dh $@ --parallel
+
 #export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/buildflags.mk
@@ -14,19 +17,11 @@ major:=$(shell echo $(version) | cut -d. -f1)
 minor:=$(shell echo $(version) | cut -d. -f3)
 nextminor:=$(shell echo $$(( $(minor) + 1 )))
 
-clean: clean1
-clean1: 
-	dh_testdir
-	dh_testroot
-	rm -f build-stamp
+override_dh_auto_clean:
+	dh_auto_clean
 	rm -rf qglviewer-qt4 designerPlugin-qt4
-	dh_clean 
 
-build: build-arch build-indep
-build-arch: build-stamp
-build-indep: build-stamp
-build-stamp: 
-	dh_testdir
+override_dh_auto_build:
 	cp -a QGLViewer qglviewer-qt4
 	cd qglviewer-qt4 && qmake-qt4 LIB_DIR=/usr/lib/$(DEB_HOST_MULTIARCH) QMAKE_CXXFLAGS_RELEASE="$(CXXFLAGS) $(CPPFLAGS)" QMAKE_CFLAGS_RELEASE="$(CFLAGS) $(CPPFLAGS)" QMAKE_LFLAGS_RELEASE="$(LDFLAGS)"
 	cd qglviewer-qt4 && $(MAKE) all staticlib
@@ -35,70 +30,27 @@ build-stamp:
 	cd designerPlugin-qt4 && qmake-qt4 LIB_DIR=../qglviewer-qt4 QMAKE_CXXFLAGS_RELEASE="$(CXXFLAGS) $(CPPFLAGS)" QMAKE_CFLAGS_RELEASE="$(CFLAGS) $(CPPFLAGS)" QMAKE_LFLAGS_RELEASE="$(LDFLAGS)"
 	cd designerPlugin-qt4 && $(MAKE)
 	#
-	touch build-stamp
 
-install: build
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-	#
+override_dh_auto_install:
 	cd qglviewer-qt4 && $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/tmp
-	#
 	mkdir -p $(CURDIR)/debian/libqglviewer-dev/usr/lib/$(DEB_HOST_MULTIARCH) 
 	cd designerPlugin-qt4 && $(MAKE) install INSTALL_ROOT=$(CURDIR)/debian/libqglviewer-dev
 	cp qglviewer-qt4/libQGLViewer.a $(CURDIR)/debian/libqglviewer-dev/usr/lib/$(DEB_HOST_MULTIARCH)
 
-
-
-# Build architecture-independent files here.
-binary-indep: build-indep install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -i CHANGELOG doc/changeLog.html
-	dh_installdocs -i
-	dh_installexamples -i
-	dh_install -i
-	# remove jquery.js - provided by libjs-jquery package
+override_dh_fixperms-indep: 
 	rm $(CURDIR)/debian/libqglviewer-doc/usr/share/doc/libqglviewer-doc/doc/refManual/jquery.js
-	# remove changeLog* files - they are already provided in other place
-	#rm $(CURDIR)/debian/libqglviewer-doc/usr/share/doc/libqglviewer-doc/QGLViewer/changeLog*.html
-	# remove macos resources
 	find $(CURDIR)/debian/libqglviewer-doc/usr/share/doc/libqglviewer-doc/doc -name "._*" | xargs rm -v
-	dh_lintian -i
-	dh_link -i
-	dh_compress -i -Xlibqglviewer-doc/examples
-	dh_fixperms -i
-	# manually fix permissions for examples
 	find $(CURDIR)/debian/libqglviewer-doc/usr/share/doc/libqglviewer-doc/examples -type f -name "*.vcproj" | xargs chmod a-x
-	dh_installdeb -i
-	dh_gencontrol -i
-	dh_md5sums -i
-	dh_builddeb -i
+	dh_fixperms -i
 
-# Build architecture-dependent files here.
-binary-arch: build-arch install
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs -a CHANGELOG doc/changeLog.html
-	dh_installdocs -a
-	dh_installexamples -a
-	dh_install -a
-	dh_installman -a
-	dh_lintian -a
-	dh_link -a
-	dh_strip -a
-	dh_compress -a
-	dh_fixperms -a
-	dh_makeshlibs -V 'libqglviewer2 (>= $(version)), libqglviewer2 (<< $(ver2).$(nextminor)~)' -a
-	dh_installdeb -a
-	dh_shlibdeps -ldebian/libqglviewer2/usr/lib/$(DEB_HOST_MULTIARCH) -a
-	dh_gencontrol -a
-	dh_md5sums -a
-	dh_builddeb -a
+override_dh_installchangelogs-indep: 
+	dh_installchangelogs -i CHANGELOG doc/changeLog.html
 
-poka:
-	echo $(nextminor)
+override_dh_compress-indep:
+	dh_compress -i -Xlibqglviewer-doc/examples
+
+override_dh_makeshlibs-arch:
+	dh_makeshlibs -V 'libqglviewer2 (>= $(version)), libqglviewer2 (<< $(ver2).$(nextminor)~)' -a
 
-binary: binary-indep binary-arch
-.PHONY: build build-arch build-indep clean binary-indep binary-arch binary install configure
+override_dh_shlibdeps-arch:
+	dh_shlibdeps -ldebian/libqglviewer2/usr/lib/$(DEB_HOST_MULTIARCH) -a

-- 
Packaging for libqglviewer. OpenGL 3D viewer library



More information about the debian-science-commits mailing list