From 2f259b586749499ce18a4bef47cdb0a2428cf83e Mon Sep 17 00:00:00 2001 From: Lucas Carvalho <lucas@nexedi.com> Date: Mon, 23 Aug 2010 11:57:53 +0000 Subject: [PATCH] Applying changes from release/5.4.6 to trunk/buildout. (r37778, r37947) git-svn-id: https://svn.erp5.org/repos/public/erp5/trunk@37949 20353a03-c40f-0410-a6d1-a30d3c3de9de --- buildout/Makefile | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/buildout/Makefile b/buildout/Makefile index cc39dceb93..7c9b71a827 100644 --- a/buildout/Makefile +++ b/buildout/Makefile @@ -27,7 +27,7 @@ debian-appliance: sed -i "s,__PACKAGE_NAME__,erp5-$(PACKAGE_VERSION),g" debian-erp5-appliance/debian/control sed -i "s,__PACKAGE_VERSION__,$(PACKAGE_VERSION),g" debian-erp5-appliance/debian/changelog sed -i "s,__PACKAGE_RELEASE__,$(PACKAGE_SOFTWARE_RELEASE),g" debian-erp5-appliance/debian/changelog - sudo svn co https://svn.erp5.org/repos/public/erp5/trunk/buildout $(SOFTWARE_BUILD_PATH) + sudo svn co https://svn.erp5.org/repos/public/erp5/release/5.4.6/ $(SOFTWARE_BUILD_PATH) sudo chown -R `whoami` $(SOFTWARE_BUILD_PATH) sudo $(SOFTWARE_BUILD_PATH)/helpers/debian.lenny.sh cd $(SOFTWARE_BUILD_PATH); $(MAKE) $(MFLAGS) @@ -41,7 +41,7 @@ debian-appliance: svn co https://svn.erp5.org/repos/public/spec/debian-tiolive-application/ debian-tiolive-application sed -i "s,__PACKAGE_VERSION__,$(PACKAGE_VERSION),g" debian-tiolive-application/debian/rules sed -i "s,__PACKAGE_VERSION__,$(PACKAGE_VERSION),g" debian-tiolive-application/debian/changelog - sed -i "s,__PACKAGE_RELEASE__,$(PACKAGE_SOFTWARE_RELEASE),g" debian-tiolive-application/debian/changelog + sed -i "s,__PACKAGE_RELEASE__,$(PACKAGE_APPLICATION_RELEASE),g" debian-tiolive-application/debian/changelog cd debian-tiolive-application; sudo dpkg-buildpackage -b checkout-rpmgen: -- 2.30.9