From bf5b0dc42fae3342d51a6c74c8a61c94189c7bcb Mon Sep 17 00:00:00 2001 From: "Andrew M. Farrell" Date: Wed, 25 Aug 2010 01:07:31 -0400 Subject: [PATCH] Rename code/ to /var/www/invirt-web/ in binary-fixup Remove git checkout steps. Do not symlink /var/www/invirt-web/ to code/ . --- debian/changelog | 6 ++++++ debian/invirt-web.postinst | 2 +- debian/rules | 10 ++++------ 3 files changed, 11 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 157e76a..c8efb75 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,9 @@ +invirt-web (0.1.8) lucid; urgency=low + + * Rename code/ to /var/www/invirt-web/ in binary-fixup + + -- Andrew M. Farrell Thu, 26 Aug 2010 01:48:04 -0400 + invirt-web (0.1.7) unstable; urgency=low * Checkout the current HEAD when building diff --git a/debian/invirt-web.postinst b/debian/invirt-web.postinst index 3703667..14f8469 100755 --- a/debian/invirt-web.postinst +++ b/debian/invirt-web.postinst @@ -20,7 +20,7 @@ set -e case "$1" in configure) - cd /usr/share/invirt-web/package/code + cd /var/www/invirt-web make all a2enmod rewrite diff --git a/debian/rules b/debian/rules index bad8d04..473ad29 100755 --- a/debian/rules +++ b/debian/rules @@ -11,11 +11,9 @@ include /usr/share/cdbs/1/rules/config-package.mk DEB_UPDATE_RCD_PARAMS_invirt-web += defaults 91 9 -GIT_HEAD=$(shell git rev-parse HEAD) - binary-fixup/invirt-web:: - git clone $$(invirt-getconf git.uri)/invirt/packages/invirt-web $(DEB_DESTDIR)/usr/share/invirt-web/package - cd $(DEB_DESTDIR)/usr/share/invirt-web/package && git checkout $(GIT_HEAD) mkdir -p $(DEB_DESTDIR)/var/www/ - ln -s /usr/share/invirt-web/package/code $(DEB_DESTDIR)/var/www/invirt-web - rm -rf $(DEB_DESTDIR)/var/www/invirt-web-repo + mv code/ $(DEB_DESTDIR)/var/www/invirt-web/ + +clean/invirt-web:: + mv $(DEB_DESTDIR)/var/www/invirt-web/ code/ -- 1.7.9.5