[soqt] 01/09: Use dh 9. Simplify debian/rules.

Anton Gladky gladk at alioth.debian.org
Tue Sep 17 19:21:55 UTC 2013 

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

gladk pushed a commit to branch master
in repository soqt.

commit 2efcc04d803ab5ef9dfe9a449ea6457d12115c8d
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Sep 17 20:42:45 2013 +0200

    Use dh 9. Simplify debian/rules.
---
 debian/compat                      |    2 +-
 debian/control                     |    2 +-
 debian/libsoqt-dev-common.doc-base |   11 ---
 debian/libsoqt-dev-common.install  |    3 +
 debian/libsoqt-dev-common.manpages |    2 +
 debian/libsoqt4-20.install         |    1 +
 debian/libsoqt4-dev.install        |    2 +
 debian/libsoqt4-dev.postinst       |   14 ----
 debian/libsoqt4-dev.prerm          |   10 ---
 debian/rules                       |  134 +++---------------------------------
 10 files changed, 21 insertions(+), 160 deletions(-)

diff --git a/debian/compat b/debian/compat
index 45a4fb7..ec63514 100644
--- a/debian/compat
+++ b/debian/compat
@@ -1 +1 @@
-8
+9
diff --git a/debian/control b/debian/control
index fec1bc0..138f368 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: graphics
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
 Uploaders: Anton Gladky <gladk at debian.org>,
 Priority: optional
-Build-Depends: debhelper (>= 8), doxygen, libcoin80-dev, libqt4-dev, libqt4-opengl-dev, qt4-dev-tools
+Build-Depends: debhelper (>= 9), doxygen, libcoin80-dev, libqt4-dev, libqt4-opengl-dev, qt4-dev-tools
 Vcs-Git: git://git.debian.org/git/debian-science/packages/soqt.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/soqt.git
 Standards-Version: 3.9.2
diff --git a/debian/libsoqt-dev-common.doc-base b/debian/libsoqt-dev-common.doc-base
deleted file mode 100644
index 8d54895..0000000
--- a/debian/libsoqt-dev-common.doc-base
+++ /dev/null
@@ -1,11 +0,0 @@
-Document: libsoqt-dev-common
-Title: SoQt Library
-Author: The SoQt Developer Team at Systems in Motion
-Abstract: SoQt is a Qt GUI component toolkit library for Coin,
- based on the API of the InventorXt GUI component toolkit.
- SoQt is also compatible with SGI and TGS Open Inventor implementations.
-Section: Graphics
-
-Format: HTML
-Index: /usr/share/doc/libsoqt-dev-common/html/index.html
-Files: /usr/share/doc/libsoqt-dev-common/html/*
diff --git a/debian/libsoqt-dev-common.install b/debian/libsoqt-dev-common.install
new file mode 100644
index 0000000..fdcd188
--- /dev/null
+++ b/debian/libsoqt-dev-common.install
@@ -0,0 +1,3 @@
+usr/bin/soqt-config
+usr/include
+usr/share/aclocal
diff --git a/debian/libsoqt-dev-common.manpages b/debian/libsoqt-dev-common.manpages
new file mode 100644
index 0000000..5a60be5
--- /dev/null
+++ b/debian/libsoqt-dev-common.manpages
@@ -0,0 +1,2 @@
+debian/tmp/usr/share/man/man1/*.1
+debian/tmp/usr/share/man/man3/*.3
diff --git a/debian/libsoqt4-20.install b/debian/libsoqt4-20.install
new file mode 100644
index 0000000..3de3b10
--- /dev/null
+++ b/debian/libsoqt4-20.install
@@ -0,0 +1 @@
+usr/lib/*/*.so.*
diff --git a/debian/libsoqt4-dev.install b/debian/libsoqt4-dev.install
new file mode 100644
index 0000000..1804f5e
--- /dev/null
+++ b/debian/libsoqt4-dev.install
@@ -0,0 +1,2 @@
+usr/lib/*/libSoQt.so
+usr/share/Coin/conf/soqt-default.cfg
diff --git a/debian/libsoqt4-dev.postinst b/debian/libsoqt4-dev.postinst
deleted file mode 100644
index e5687c3..0000000
--- a/debian/libsoqt4-dev.postinst
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh
-
-set -e
-
-if [ "$1" = "configure" ]; then
-    update-alternatives \
-	--install /usr/share/Coin/conf/soqt-default.cfg \
-                                       soqt-dev    /usr/share/Coin/conf/soqt-qt4.cfg 4 \
-	--slave   /usr/lib/libSoQt.so  libSoQt.so  /usr/lib/libSoQt4.so \
-	--slave   /usr/lib/libSoQt.la  libSoQt.la  /usr/lib/libSoQt4.la \
-	--slave   /usr/lib/libSoQt.a   libSoQt.a   /usr/lib/libSoQt4.a 
-fi
-
-#DEBHELPER#
diff --git a/debian/libsoqt4-dev.prerm b/debian/libsoqt4-dev.prerm
deleted file mode 100644
index 598c307..0000000
--- a/debian/libsoqt4-dev.prerm
+++ /dev/null
@@ -1,10 +0,0 @@
-#! /bin/sh
-
-set -e
-
-if [ "$1" = "remove" ]; then
-    update-alternatives \
-	--remove soqt-dev /usr/share/Coin/conf/soqt-qt4.cfg
-fi
-
-#DEBHELPER#
diff --git a/debian/rules b/debian/rules
index ffc0955..ff282cb 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,127 +1,15 @@
 #!/usr/bin/make -f
-# Sample debian/rules that uses debhelper.
-# This file is public domain software, originally written by Joey Hess.
-#
-# This version is for a multibinary package. It also allows you to build any
-# of the binary packages independantly, via binary-<package> targets.
+%:
+	dh $@ --parallel
 
-# Uncomment this to turn on verbose mode. 
-#export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+override_dh_auto_configure:
+	dh_auto_configure -- --with-coin --enable-man
 
-COMMON_CONFIGURE_FLAGS = \
-  --prefix=/usr \
-  --enable-static --enable-shared \
-  --disable-dependency-tracking \
-  --without-mesa \
-  --with-coin
-
-CFLAGS = -g -D_REENTRANT -Wl,-z,defs
-ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
-CFLAGS += -O0
-else
-CFLAGS += -O2
-endif
-
-build: build-stamp-qt4
-
-build-stamp-qt4:
-	dh_testdir
-	test -d build.qt4 || mkdir build.qt4
-	cd build.qt4 && ../configure $(COMMON_CONFIGURE_FLAGS) \
-		--enable-man --mandir=/usr/share/man \
-		--enable-html htmldir=/usr/share/doc/libsoqt-dev-common/html \
-		--with-suffix=4 QTDIR=/usr/share/qt4
-	$(MAKE) -C build.qt4
-	touch build-stamp-qt4
-
-clean:
-	dh_testdir
-	dh_testroot
-	rm -rf build-stamp-qt? build.qt?
-	rm -f cfg/wrapmsvc.exe
-	rm -f src/Inventor/Qt/stamp-h3
-
-	dh_clean
-
-# This file was deleted from my CVS repository.  It is not needed
-# on linux, but it is a dependency of the top-level "install" rule,
-# so it has to exist.
-cfg/wrapmsvc.exe:
-	touch $@
-
-install: DH_OPTIONS=
-install: build cfg/wrapmsvc.exe
-	dh_testdir
-	dh_testroot
-	dh_prep
-	dh_installdirs
-
-	rm -f build.qt?/man/man3/_*
-
-	$(MAKE) -C build.qt4 DESTDIR=$(CURDIR)/debian/tmp/qt4 install
-
-	sed -i "/dependency_libs/ s/'.*'/''/" `find . -name '*.la'`
-	rmdir debian/tmp/qt4/usr/include/Inventor/Qt/engines
-
-	cd debian/tmp/qt4/usr/share/Coin/conf && mv soqt-default.cfg soqt-qt4.cfg
-
-	dh_install -plibsoqt4-20 debian/tmp/qt4/usr/lib/libSoQt4.so.[0-9]* usr/lib
-	cd debian/libsoqt4-20/usr/lib && ln -s libSoQt4.so.20 libSoQt.so.20
-
-	dh_install -plibsoqt-dev-common debian/tmp/qt4/usr/bin/soqt-config usr/bin
-	dh_install -plibsoqt-dev-common debian/tmp/qt4/usr/include usr
-	dh_install -plibsoqt-dev-common debian/tmp/qt4/usr/share/aclocal usr/share
-	dh_install -plibsoqt-dev-common debian/tmp/qt4/usr/share/doc/libsoqt-dev-common usr/share/doc
-	dh_install -plibsoqt-dev-common debian/tmp/qt4/usr/share/man usr/share
-	dh_install -plibsoqt-dev-common test-code/* usr/share/doc/libsoqt-dev-common/examples
-	dh_installdocs -plibsoqt-dev-common AUTHORS FAQ NEWS README
-
-	dh_install -plibsoqt4-dev debian/tmp/qt4/usr/lib/libSoQt4.so usr/lib
-	dh_install -plibsoqt4-dev debian/tmp/qt4/usr/lib/libSoQt4.la usr/lib
-	dh_install -plibsoqt4-dev debian/tmp/qt4/usr/lib/libSoQt4.a usr/lib
-	dh_install -plibsoqt4-dev debian/tmp/qt4/usr/share/Coin usr/share
-
-	dh_installdocs -plibsoqt4-dev -plibsoqt-dev-common \
-		debian/README.Debian
-
-# This single target is used to build all the packages, all at once, or
-# one at a time. So keep in mind: any options passed to commands here will
-# affect _all_ packages. Anything you want to only affect one package
-# should be put in another target, such as the install target.
-binary-common:
-	dh_testdir
-	dh_testroot
-	dh_installchangelogs
-	dh_installdocs
-	dh_installexamples
-	dh_installmenu
-	dh_installman
-	dh_strip
-	dh_link
-	dh_compress
-	dh_fixperms
-	dh_makeshlibs
-	dh_installdeb
-	dh_shlibdeps
-	dh_gencontrol
-	dh_md5sums
-	dh_builddeb
-
-# Build architecture independant packages using the common target.
-binary-indep: build install
-# (Uncomment this next line if you have such packages.)
-#	 $(MAKE) -f debian/rules DH_OPTIONS=-i binary-common
-
-# Build architecture dependant packages using the common target.
-binary-arch: build install
-	$(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
-
-# Any other binary targets build just one binary package at a time.
-binary-%: build install
-	make -f debian/rules binary-common DH_OPTIONS=-p$*
-
-binary: binary-indep binary-arch
-.PHONY: build clean binary-indep binary-arch binary install
+override_dh_auto_install:
+	dh_auto_install
+	dh_link -plibsoqt4-20 usr/lib/$(DEB_HOST_MULTIARCH)/libSoQt.so.20.6.0 usr/lib/$(DEB_HOST_MULTIARCH)/libSoQt4.so.20.6.0
+	dh_link -plibsoqt4-20 usr/lib/$(DEB_HOST_MULTIARCH)/libSoQt.so.20 usr/lib/$(DEB_HOST_MULTIARCH)/libSoQt4.so.20
+	dh_link -plibsoqt4-dev usr/lib/$(DEB_HOST_MULTIARCH)/libSoQt.so usr/lib/$(DEB_HOST_MULTIARCH)/libSoQt4.so
+	dh_link -plibsoqt4-dev usr/share/Coin/conf/soqt-default.cfg usr/share/Coin/conf/soqt-qt4.cfg
+	rm -rf debian/tmp/usr/share/man/man3/_*.*

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/soqt.git

More information about the debian-science-commits mailing list