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

[Luis Ibanez]

Author: luisibanez-guest
Date: 2012-07-14 19:09:48 +0000 (Sat, 14 Jul 2012)
New Revision: 11805

Modified:
   trunk/packages/vista/trunk/debian/auto_install
   trunk/packages/vista/trunk/debian/changelog
   trunk/packages/vista/trunk/debian/rules
   trunk/packages/vista/trunk/debian/vista.install
Log:
Now installing vista in vista/V5.5-000 directory specifying GTM version.



Modified: trunk/packages/vista/trunk/debian/auto_install
===================================================================
--- trunk/packages/vista/trunk/debian/auto_install	2012-07-14 18:55:31 UTC (rev 11804)
+++ trunk/packages/vista/trunk/debian/auto_install	2012-07-14 19:09:48 UTC (rev 11805)
@@ -1,7 +1,8 @@
 #!/bin/bash
-export GTM_INSTALL_DIR=/usr/lib/fis-gtm/V5.5-000_x86_64
+export GTM_VERSION=V5.5-000
+export GTM_INSTALL_DIR=/usr/lib/fis-gtm/${GTM_VERSION}_x86_64
 export gtm_destdir=`pwd`/debian/tmp
-export VISTA_INSTANCE_DIR=$gtm_destdir/var/lib/vista
+export VISTA_INSTANCE_DIR=$gtm_destdir/var/lib/vista/${GTM_VERSION}
 export CMAKE_VISTA_FOIA_DIR=`pwd`/Vista-FOIA
 export CMAKE_OSEHRA_BINARY_DIR=`pwd`/obj-x86_64-linux-gnu
 mkdir -p $VISTA_INSTANCE_DIR
@@ -9,8 +10,8 @@
 mkdir -p $VISTA_INSTANCE_DIR/o
 mkdir -p $VISTA_INSTANCE_DIR/g
 mkdir -p $VISTA_INSTANCE_DIR/j
-mkdir -p $gtm_destdir/var/log/vista
-mkdir -p $gtm_destdir/var/log/vista/inet
+mkdir -p $gtm_destdir/var/log/vista/${GTM_VERSION}
+mkdir -p $gtm_destdir/var/log/vista/${GTM_VERSION}/inet
 mkdir -p $VISTA_INSTANCE_DIR/inet
 mkdir -p $VISTA_INSTANCE_DIR/profile
 mkdir -p $CMAKE_OSEHRA_BINARY_DIR/Testing

Modified: trunk/packages/vista/trunk/debian/changelog
===================================================================
--- trunk/packages/vista/trunk/debian/changelog	2012-07-14 18:55:31 UTC (rev 11804)
+++ trunk/packages/vista/trunk/debian/changelog	2012-07-14 19:09:48 UTC (rev 11805)
@@ -23,6 +23,7 @@
     Remove sourcing of gtmprofile.
     Replaced $PWD with $CURDIR to address lintian warning:
     "debian-rules-uses-pwd". CURDIR is set by make.
+    Now installing vista in vista/V5.5-000 directory specifying GTM version.
   * debian/get-orig-source:
     Now preparing the routines.ro and globals.lst files at the moment of
     packaging creating the orig.tar.gz file.
@@ -58,6 +59,7 @@
     Added creation of directories: j and logs,for journaling and loging.
     Relocating directories to better fit Debian policies. Logs now go to
     /var/log/vista. The profile example now goes to /usr/share/doc/vista
+    Now installing vista in vista/V5.5-000 directory specifying GTM version.
   * debian/copyright:
     Addressing lintian warning: missing-license-paragraph-in-dep5-copyright,
     added a paragraph stating where to find the license file.
@@ -70,6 +72,7 @@
     Renaming vista.install to full package name: vista-0.0.20121206.install.
     Renaming back to vista.install. There was an error in the package name
     in the control file. The correct name for the file is vista.install now.
+    Now installing vista in vista/V5.5-000 directory specifying GTM version.
   * debian/control:
     Added configuration of metapackage "vista", and specific package
     "vista-0.0.20121206".

Modified: trunk/packages/vista/trunk/debian/rules
===================================================================
--- trunk/packages/vista/trunk/debian/rules	2012-07-14 18:55:31 UTC (rev 11804)
+++ trunk/packages/vista/trunk/debian/rules	2012-07-14 19:09:48 UTC (rev 11805)
@@ -5,10 +5,11 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
+GTM_VERSION := V5.5-000
 TARGETDIR := $(CURDIR)/debian/tmp
-VISTAINSTANCEDIR := $(TARGETDIR)/var/lib/vista
+VISTAINSTANCEDIR := $(TARGETDIR)/var/lib/vista/$(GTM_VERSION)
 VISTA_FOIA_DIR := $(CURDIR)/VistA-FOIA
-GTM_INSTALL_DIR := /usr/lib/fis-gtm/V5.5-000_x86_64
+GTM_INSTALL_DIR := /usr/lib/fis-gtm/$(GTM_VERSION)_x86_64
 VISTA_GLOBALS_DIR := $(VISTAINSTANCEDIR)/g
 VISTA_ROUTINES_DIR := $(VISTAINSTANCEDIR)/r
 GTMPROFILE := $(GTM_INSTALL_DIR)/gtmprofile

Modified: trunk/packages/vista/trunk/debian/vista.install
===================================================================
--- trunk/packages/vista/trunk/debian/vista.install	2012-07-14 18:55:31 UTC (rev 11804)
+++ trunk/packages/vista/trunk/debian/vista.install	2012-07-14 19:09:48 UTC (rev 11805)
@@ -1,8 +1,8 @@
-var/lib/vista/r/* var/lib/vista/r
-var/lib/vista/o/* var/lib/vista/o
-var/lib/vista/g/* var/lib/vista/g
-var/lib/vista/j var/lib/vista/j
-var/log/vista/* var/log/vista
-var/lib/vista/profile/* usr/share/doc/vista
-var/lib/vista/inet/cprs_vista_rpcbroker.sh var/lib/vista/inet
-var/lib/vista/inet/cprs_vista_xinetd etc/xinetd.d/
+var/lib/vista/V5.5-000/r/* var/lib/vista/V5.5-000/r
+var/lib/vista/V5.5-000/o/* var/lib/vista/V5.5-000/o
+var/lib/vista/V5.5-000/g/* var/lib/vista/V5.5-000/g
+var/lib/vista/V5.5-000/j var/lib/vista/V5.5-000/j
+var/lib/vista/V5.5-000/profile/* usr/share/doc/vista/V5.5-000
+var/lib/vista/V5.5-000/inet/cprs_vista_rpcbroker.sh var/lib/vista/V5.5-000/inet
+var/lib/vista/V5.5-000/inet/cprs_vista_xinetd etc/xinetd.d/cprs_vista_V5.5-000_xinetd
+var/log/vista/V5.5-000/* var/log/vista/V5.5-000