[adios] 163/207: Cut 2: change install file instead

[Alastair McKinstry]

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

mckinstry pushed a commit to branch master
in repository adios.

commit 396d4b3a38daa2488d67060a6888beee071d8d99
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Mon Jun 16 16:16:41 2014 +0100

    Cut 2: change install file instead
---
 debian/libadios-bin.install | 2 +-
 debian/rules                | 4 +---
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/debian/libadios-bin.install b/debian/libadios-bin.install
index 131fabc..e8d48af 100644
--- a/debian/libadios-bin.install
+++ b/debian/libadios-bin.install
@@ -14,5 +14,5 @@ usr/bin/skel_cat
 usr/bin/skel_extract
 usr/bin/skeldump
 usr/bin/type_mapper.py	/usr/share/pyshared
-etc/skel		/etc/adios/skel
+etc/skel		/etc/adios
 debian/bash_completion.d/* /etc/bash_completion.d
diff --git a/debian/rules b/debian/rules
index 6fbb1f7..5be97f7 100755
--- a/debian/rules
+++ b/debian/rules
@@ -119,8 +119,6 @@ override_dh_auto_install:
 	mv $(BINDIR)/skel_extract.py $(BINDIR)/skel_extract
 	cp debian/adios_config $(BINDIR)/adios_config
 	# mv $(DESTDIR)/bin/xmlparser.py $(DESTDIR)/bin/xmlparser
-	mv debian/libadios-bin/etc/adios/skel/skel/*  debian/libadios-bin/etc/adios/skel
-	rmdir debian/libadios-bin/etc/adios/skel/skel
 
 override_dh_auto_test:
 	$(DO_TEST) && $(MAKE) check || echo "Tests disabled on bigendian systems for the moment"
@@ -128,8 +126,8 @@ override_dh_auto_test:
 override_dh_installexamples:
 	dh_installexamples
 	find debian/libadios-dev/usr/share/doc/libadios-dev/examples -name '*.o' -delete 
-	find debian/libadios-dev/usr/share/doc/libadios-dev/examples/C -type f -exec chmod -x {} \;
 
 override_dh_fixperms:
 	dh_fixperms
+	find debian/libadios-dev/usr/share/doc/libadios-dev/examples/C -type f -exec chmod -x {} \;
 	chmod -x  debian/libadios-bin/etc/adios/skel/templates/*

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