[ecflow] 28/50: fixes

[Alastair McKinstry]

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

mckinstry pushed a commit to branch debian/master
in repository ecflow.

commit 32bb7cf291f17e947ebc31d5f3fdf96024ba241c
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Wed Jul 12 13:29:51 2017 +0100

    fixes
---
 debian/control                  |  2 +-
 debian/ecflow-client.docs       |  6 +++---
 debian/ecflow-server.docs       |  6 +++---
 debian/ecflow-server.install.in | 12 ++++++------
 debian/rules                    | 11 ++++++++---
 5 files changed, 21 insertions(+), 16 deletions(-)

diff --git a/debian/control b/debian/control
index aaa9bcd..9fb3d0a 100644
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Description: Meteorological workflow controller - server
 Package: ecflow-client
 Architecture: any
 Multi-Arch: same
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, libecflow_view0 ( = ${binary:Version})
 Description: Client tools for Meteorological workflow
  ecFlow is a work flow package that enables users to run
  a large number of programs ( with dependencies on each other
diff --git a/debian/ecflow-client.docs b/debian/ecflow-client.docs
index c72be93..8bf5dc0 100644
--- a/debian/ecflow-client.docs
+++ b/debian/ecflow-client.docs
@@ -1,4 +1,4 @@
 README
-Doc/client_options.docx  
-Doc/user_manual.docx  
-Doc/user_manual.pdf
+Doc/user-manual/client_options.docx  
+Doc/user-manual/user_manual.docx  
+Doc/user-manual/user_manual.pdf
diff --git a/debian/ecflow-server.docs b/debian/ecflow-server.docs
index c72be93..8bf5dc0 100644
--- a/debian/ecflow-server.docs
+++ b/debian/ecflow-server.docs
@@ -1,4 +1,4 @@
 README
-Doc/client_options.docx  
-Doc/user_manual.docx  
-Doc/user_manual.pdf
+Doc/user-manual/client_options.docx  
+Doc/user-manual/user_manual.docx  
+Doc/user-manual/user_manual.pdf
diff --git a/debian/ecflow-server.install.in b/debian/ecflow-server.install.in
index 508dcd3..6b5381f 100644
--- a/debian/ecflow-server.install.in
+++ b/debian/ecflow-server.install.in
@@ -1,8 +1,8 @@
-usr/bin/ecflow_logsvr.sh 	/usr/sbin
+usr/bin/ecflow_logsvr 	/usr/sbin
 usr/bin/ecflow_server		/usr/sbin
-usr/bin/ecflow_stop.sh		/usr/sbin
-usr/bin/ecflow_logsvr.pl		/usr/sbin
-usr/bin/ecflow_migrate.py		/usr/sbin
-usr/bin/ecflow_start.sh		/usr/sbin
-usr/bin/ecflow_test_ui.sh		/usr/sbin
+usr/bin/ecflow_stop		/usr/sbin
+usr/bin/ecflow_logsvr.pl	/usr/sbin
+usr/bin/ecflow_migrate		/usr/sbin
+usr/bin/ecflow_start		/usr/sbin
+usr/bin/ecflow_test_ui		/usr/sbin
 usr/bin/noconnect.sh		/usr/sbin
diff --git a/debian/rules b/debian/rules
index a9171e3..d17ff8f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,8 @@ AUTOGENERATED:= ecflow-server.install ecflow-client.install libecflow_view0.inst
 override_dh_auto_clean:
 	rm -f $(patsubst %, debian/%, ${AUTOGENERATED})
 
+# For the moment set ENABLE_SSL=OFF. Enabling it fails tests
+
 override_dh_auto_configure:
 	for f in ${AUTOGENERATED} ; do \
 		sed -e 's%@ARCH@%${DEB_HOST_MULTIARCH}%g' < debian/$$f.in  > debian/$$f ; \
@@ -29,11 +31,14 @@ override_dh_auto_configure:
 		-DBOOST_INCLUDEDIR=/usr/include \
 		-DBOOSTROOT=$(LIBDIR)	\
 		-DENABLE_STATIC_BOOST_LIBS=OFF \
-		-DENABLE_SSL=ON \
+		-DENABLE_SSL=OFF \
 		-DCMAKE_C_CFLAGS="${CFLAGS} ${LDFLAGS}" 
 
 override_dh_auto_install:
+	dh_auto_install
 	#	Drop the suffixes on scripts ...
 	mv $(DESTDIR)/usr/bin/ecflow_logsvr.sh $(DESTDIR)/usr/bin/ecflow_logsvr
-	mv $(DESTDIR)/usr/bin/ecflow_migrate.sh $(DESTDIR)/usr/bin/ecflow_migrate
-	dh_auto_install
+	mv $(DESTDIR)/usr/bin/ecflow_migrate.py $(DESTDIR)/usr/bin/ecflow_migrate
+	mv $(DESTDIR)/usr/bin/ecflow_start.sh 	$(DESTDIR)/usr/bin/ecflow_start
+	mv $(DESTDIR)/usr/bin/ecflow_stop.sh 	$(DESTDIR)/usr/bin/ecflow_stop
+	mv $(DESTDIR)/usr/bin/ecflow_test_ui.sh 	$(DESTDIR)/usr/bin/ecflow_test_ui

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