[med-svn] [opensurgsim] 03/03: Use *.install files and dh_linktree

[Paul Novotny]

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

paulnovo-guest pushed a commit to branch master
in repository opensurgsim.

commit 9c23169c2ba2da815e9f149c869331f454f715dd
Author: Paul Novotny <paul at paulnovo.us>
Date:   Thu Feb 26 08:41:45 2015 -0500

    Use *.install files and dh_linktree
    
    Move the installation of files into packages to *.install files, instead
    of using override_dh_install in debian/rules. Also, replace the use of
    dh_link with dh_linktree.
---
 debian/control                    | 21 ++++++++++++++++-----
 debian/libopensurgsim-dev.install |  3 +++
 debian/libopensurgsim.install     |  1 +
 debian/opensurgsim-doc.links      |  1 -
 debian/opensurgsim-doc.linktrees  |  1 +
 debian/rules                      | 12 +-----------
 6 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/debian/control b/debian/control
index 2921071..e8d5120 100644
--- a/debian/control
+++ b/debian/control
@@ -3,10 +3,21 @@ Section: science
 Priority: optional
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 Uploaders: Paul Novotny <paul at paulnovo.us>
-Build-Depends: debhelper (>= 9), libboost-chrono-dev, libboost-date-time-dev,
- libboost-filesystem-dev, libboost-system-dev, libboost-thread-dev, cmake,
- doxygen, libeigen3-dev, google-mock, libjs-jquery, libjs-mathjax,
- libopenscenegraph-dev, libyaml-cpp-dev (>= 0.5.1+hg20150210)
+Build-Depends: debhelper (>= 9),
+               dh-linktree,
+               libboost-chrono-dev,
+               libboost-date-time-dev,
+               libboost-filesystem-dev,
+               libboost-system-dev,
+               libboost-thread-dev,
+               cmake,
+               doxygen,
+               libeigen3-dev,
+               google-mock,
+               libjs-jquery,
+               libjs-mathjax,
+               libopenscenegraph-dev,
+               libyaml-cpp-dev (>= 0.5.1+hg20150210)
 Standards-Version: 3.9.6
 Homepage: http://www.opensurgsim.org/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-med/opensurgsim.git
@@ -41,7 +52,7 @@ Description: Free platform for surgical simulation - development
 Package: opensurgsim-doc
 Section: doc
 Architecture: all
-Depends: ${misc:Depends}, libjs-jquery, libjs-mathjax
+Depends: ${misc:Depends}, libjs-mathjax
 Suggests: libopensurgsim-dev, libopensurgsim
 Description: Free platform for surgical simulation - documentation
  OpenSurgSim is C++ toolkit for developing real-time surgical simulations. It
diff --git a/debian/libopensurgsim-dev.install b/debian/libopensurgsim-dev.install
new file mode 100644
index 0000000..3971d34
--- /dev/null
+++ b/debian/libopensurgsim-dev.install
@@ -0,0 +1,3 @@
+usr/include/*
+usr/lib/cmake/OpenSurgSim/*
+usr/lib/lib*.so
diff --git a/debian/libopensurgsim.install b/debian/libopensurgsim.install
new file mode 100644
index 0000000..d0dbfd1
--- /dev/null
+++ b/debian/libopensurgsim.install
@@ -0,0 +1 @@
+usr/lib/lib*.so.*
diff --git a/debian/opensurgsim-doc.links b/debian/opensurgsim-doc.links
deleted file mode 100644
index 6219e06..0000000
--- a/debian/opensurgsim-doc.links
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/javascript/jquery/jquery.js /usr/share/doc/opensurgsim-doc/jquery.js
diff --git a/debian/opensurgsim-doc.linktrees b/debian/opensurgsim-doc.linktrees
new file mode 100644
index 0000000..ba255bb
--- /dev/null
+++ b/debian/opensurgsim-doc.linktrees
@@ -0,0 +1 @@
+replace usr/share/javascript/jquery/jquery.js usr/share/doc/opensurgsim-doc/html/jquery.js
diff --git a/debian/rules b/debian/rules
index f522257..d2549ae 100755
--- a/debian/rules
+++ b/debian/rules
@@ -2,14 +2,10 @@
 
 #DH_VERBOSE = 1
 
-pkg_lib = libopensurgsim
-pkg_dev = libopensurgsim-dev
-pkg_doc = opensurgsim-doc
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=-format
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with linktree
 
 override_dh_auto_configure:
 	dh_auto_configure -- \
@@ -22,9 +18,3 @@ override_dh_auto_configure:
 	-DCTEST_CUSTOM_TESTS_IGNORE="MultiAxisDeviceTest" \
 	-DUSE_SYSTEM_YAMLCPP:BOOL=ON
 
-override_dh_install:
-	dh_install -p$(pkg_dev) --autodest usr/include/*
-	dh_install -p$(pkg_dev) --autodest usr/lib/lib*.so
-	dh_install -p$(pkg_dev) --autodest usr/lib/cmake/OpenSurgSim/*
-	dh_install -p$(pkg_lib) --autodest usr/lib/lib*.so.*
-	dh_install -p$(pkg_doc)

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-med/opensurgsim.git