From: Bill Erickson <berick@esilibrary.com>
Date: Thu, 21 Jun 2012 15:13:15 +0000 (-0400)
Subject: wheezy installer uses wheezy target branches pending master merge
X-Git-Url: https://old-git.evergreen-ils.org/?a=commitdiff_plain;h=44bfef51d584de0b55a44bcab563655280607f29;p=working%2Frandom.git

wheezy installer uses wheezy target branches pending master merge

Signed-off-by: Bill Erickson <berick@esilibrary.com>
---

diff --git a/installer/wheezy/eg_wheezy_installer.sh b/installer/wheezy/eg_wheezy_installer.sh
index 9320a7b9f..bc29d8bbb 100755
--- a/installer/wheezy/eg_wheezy_installer.sh
+++ b/installer/wheezy/eg_wheezy_installer.sh
@@ -76,17 +76,27 @@ if [ ! "$(grep ^opensrf: /etc/passwd)" ]; then
 export LD_LIBRARY_PATH=/openils/lib:/usr/local/lib:/usr/local/lib/dbd:$LD_LIBRARY_PATH' >> /home/opensrf/.bashrc
 fi;
 
+# XXX for now, fetch the debian-wheezy install target working branches
 OSRF_COMMAND='
 cd /home/opensrf;
 git clone git://git.evergreen-ils.org/OpenSRF.git;
+cd OpenSRF;
+git remote add working git://git.evergreen-ils.org/working/OpenSRF.git;
+git fetch working
+git checkout -b collab/berick/debian-wheezy-install-target working/collab/berick/debian-wheezy-install-target
+cd /home/opensrf;
 git clone git://git.evergreen-ils.org/Evergreen.git;
+cd Evergreen;
+git remote add working git://git.evergreen-ils.org/working/Evergreen.git;
+git fetch working
+git checkout -b collab/berick/debian-wheezy-install-target working/collab/berick/debian-wheezy-install-target
 '
 su - opensrf sh -c "$OSRF_COMMAND";
 
 # Install pre-reqs
 mkdir -p /usr/src/evergreen; 
 cd /usr/src/evergreen;
-make -f /home/opensrf/OpenSRF/src/extras/Makefile.install debian-squeeze # XXX s/squeeze/wheezy/ when possible
+make -f /home/opensrf/OpenSRF/src/extras/Makefile.install debian-wheezy
 make -f /home/opensrf/Evergreen/Open-ILS/src/extras/Makefile.install debian-wheezy install_pgsql_server_debs_91
 
 # Patch Ejabberd and register users