[Pkg-octave-commit] [octave] 07/07: Minor simplifications to {liboctave-dev, octave-common}.install.

[Sébastien Villemot]

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

sebastien pushed a commit to branch master
in repository octave.

commit 007e2c3427fd4a35749f18bd14f5df96b317f2fa
Author: Sébastien Villemot <sebastien at debian.org>
Date:   Mon Jun 19 16:41:25 2017 +0200

    Minor simplifications to {liboctave-dev,octave-common}.install.
---
 debian/liboctave-dev.install | 5 ++---
 debian/octave-common.install | 5 ++---
 debian/rules                 | 2 --
 3 files changed, 4 insertions(+), 8 deletions(-)

diff --git a/debian/liboctave-dev.install b/debian/liboctave-dev.install
old mode 100755
new mode 100644
index 6acedbe..492f469
--- a/debian/liboctave-dev.install
+++ b/debian/liboctave-dev.install
@@ -1,7 +1,6 @@
-#!/usr/bin/dh-exec
 src/mkoctfile /usr/bin/
 src/octave-config /usr/bin/
 usr/include  /usr
 debian/defs.make /usr/share/octave/debian/
-usr/lib/${DEB_HOST_MULTIARCH}/liboctave.so /usr/lib/${DEB_HOST_MULTIARCH}
-usr/lib/${DEB_HOST_MULTIARCH}/liboctinterp.so /usr/lib/${DEB_HOST_MULTIARCH}
+usr/lib/*/liboctave.so
+usr/lib/*/liboctinterp.so
diff --git a/debian/octave-common.install b/debian/octave-common.install
index 40e4d12..f0958d3 100755
--- a/debian/octave-common.install
+++ b/debian/octave-common.install
@@ -1,10 +1,9 @@
 #!/usr/bin/dh-exec
 
-usr/share/octave /usr/share/
+usr/share/octave
 usr/share/icons
 
-# install the configuration file we copied into the built tmp tree
-/etc/octave.conf /etc
+debian/octave.conf /etc
 
 # Install the Debian-specific error handler
 debian/debian_missing_handler.m /usr/share/octave/${DEB_VERSION_UPSTREAM}/m/debian/
diff --git a/debian/rules b/debian/rules
index f7ad2ac..377a69e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -65,8 +65,6 @@ override_dh_compress:
 	dh_compress --exclude=.pdf
 
 override_dh_auto_install:
-	# Smuggle our configuration file into the installed files
-	mkdir -p debian/tmp/etc && cp debian/octave.conf debian/tmp/etc/
 	# Parallel install does not work as of now, so disable it
 	# (see #861627, workaround implemented in debhelper 10.3)
 	dh_auto_install --max-parallel=1

-- 
Alioth's /home/groups/pkg-octave/bin/git-commit-notice on /srv/git.debian.org/git/pkg-octave/octave.git