[med-svn] r11646 - trunk/packages/vista/trunk/debian

[Luis Ibanez]

Author: luisibanez-guest
Date: 2012-07-09 00:45:48 +0000 (Mon, 09 Jul 2012)
New Revision: 11646

Modified:
   trunk/packages/vista/trunk/debian/auto_install
   trunk/packages/vista/trunk/debian/changelog
   trunk/packages/vista/trunk/debian/rules
Log:
Specify dh_install defining files to be moved to their final destination.


Modified: trunk/packages/vista/trunk/debian/auto_install
===================================================================
--- trunk/packages/vista/trunk/debian/auto_install	2012-07-09 00:03:20 UTC (rev 11645)
+++ trunk/packages/vista/trunk/debian/auto_install	2012-07-09 00:45:48 UTC (rev 11646)
@@ -1,6 +1,6 @@
 #!/bin/bash
 export GTM_INSTALL_DIR=/usr/lib/fis-gtm/V5.5-000_x86_64
-export VISTA_INSTANCE_DIR=debian/var/lib/vista
+export VISTA_INSTANCE_DIR=debian/tmp/var/lib/vista
 export CMAKE_VISTA_FOIA_DIR=`pwd`/Vista-FOIA
 export CMAKE_OSEHRA_BINARY_DIR=`pwd`/obj-x86_64-linux-gnu
 mkdir -p $VISTA_INSTANCE_DIR

Modified: trunk/packages/vista/trunk/debian/changelog
===================================================================
--- trunk/packages/vista/trunk/debian/changelog	2012-07-09 00:03:20 UTC (rev 11645)
+++ trunk/packages/vista/trunk/debian/changelog	2012-07-09 00:45:48 UTC (rev 11646)
@@ -16,6 +16,7 @@
     OSEHRA_PATH should be a PATH type, not a STRING type.
     Skip dh_auto_test, by adding override_dh_auto_test section.
     Added full path to OSEHRA_PATH and VISTAINSTANCEDIR by using $(shell pwd).
+    Specify dh_install defining files to be moved to their final destination.
   * debian/get-orig-source:
     Now preparing the routines.ro and globals.lst files at the moment of
     packaging creating the orig.tar.gz file.

Modified: trunk/packages/vista/trunk/debian/rules
===================================================================
--- trunk/packages/vista/trunk/debian/rules	2012-07-09 00:03:20 UTC (rev 11645)
+++ trunk/packages/vista/trunk/debian/rules	2012-07-09 00:45:48 UTC (rev 11646)
@@ -6,7 +6,8 @@
 #export DH_VERBOSE=1
 
 PWD := $(shell pwd)
-VISTAINSTANCEDIR := $(PWD)/debian/var/lib/vista
+TARGETDIR := $(PWD)/debian/tmp
+VISTAINSTANCEDIR := $(TARGETDIR)/var/lib/vista
 VISTA_FOIA_DIR := $(PWD)/VistA-FOIA
 GTM_INSTALL_DIR := /usr/lib/fis-gtm/V5.5-000_x86_64
 VISTA_GLOBALS_DIR := $(VISTAINSTANCEDIR)/g
@@ -32,5 +33,8 @@
 override_dh_auto_install:
 	./debian/auto_install
 
+override_dh_install:
+	dh_install --sourcedir=debian/tmp --list-missing
+
 get-orig-source:
 	./debian/get-orig-source