From e06ffaa26e87c7a1018cdee4f3b924f59f20bc22 Mon Sep 17 00:00:00 2001 From: Olivier Berger Date: Wed, 24 Aug 2011 16:18:33 +0000 Subject: [PATCH] Add check that local repo is activated --- src/debian/changelog | 70 ++------------------------------------------- tools/VM-scripts/install.sh | 10 ++++++- 2 files changed, 12 insertions(+), 68 deletions(-) diff --git a/src/debian/changelog b/src/debian/changelog index 6377aa6..aa5826f 100644 --- a/src/debian/changelog +++ b/src/debian/changelog @@ -1,77 +1,13 @@ -fusionforge (5.1.50~-0) UNRELEASED; urgency=low - - * Bump version number, on the road to 5.2. - - -- Roland Mas Fri, 05 Aug 2011 13:41:04 +0200 - -fusionforge (5.1-4+) UNRELEASED; urgency=low - - [ Olivier Berger ] - * Better document in README.source how the package is build vs upstream - SVN repo. - * Manage pg_hba.conf with custom ucf template that should be less - ambiguous, including a proper default value. - * Use explicit db host connection on 127.0.0.1 in order to avoid some - changes in pg_hba.conf. - * Fix bits around ucf (using ucfr / ucfq) - - [ Roland Mas ] - * Switch dependency on PostgreSQL packages to the metapackage, as - requested by the PostgreSQL maintainer. - * Switch from dpatch to quilt, since the former is being deprecated by - its author. - - -- Roland Mas Mon, 22 Aug 2011 16:23:07 +0200 - -fusionforge (5.1-4) unstable; urgency=low - - [ Olivier Berger ] - * Make sure /usr/share/gforge/db/20110701-gforge-5.1.sql is actually - shipped (closes: #637202). +fusionforge (5.1-0) UNRELEASED; urgency=low [ Roland Mas ] - * Added Olivier to Uploaders. - * Ship httpd.vhosts template as a conffile, so as not to overwrite local - changes. - - -- Roland Mas Tue, 16 Aug 2011 16:18:44 +0200 - -fusionforge (5.1-3) unstable; urgency=low - - * Fixed links for plugins. - - -- Roland Mas Thu, 04 Aug 2011 10:48:53 +0200 - -fusionforge (5.1-2) unstable; urgency=low - - * Bumped Standards-Version to 3.9.2 (no changes). - * Point Vcs-*: header at the upstream Subversion repository. - * Wrap long lines in package descriptions. - * Add Depends: php5-cli to fusionforge-plugin-oslc. - * Use the Simplepie library provided by Debian rather than a local copy. - - -- Roland Mas Thu, 04 Aug 2011 10:31:34 +0200 - -fusionforge (5.1-1) unstable; urgency=low - - [ Roland Mas ] - * New upstream release. Many new features and plugins. - * Fixed chroot generation error in case of some files not always present - (closes: #634169). - * Apache configuration is now split into several snippets rather than in - one monolithic file (closes: #568532). - * Runtime configuration is also now stored into a set of *.ini files - marked as conffiles, so local customizations aren't overwritten - (closes: #599274). - * Add a /usr/share/gforge/bin/fix_default_role.php script to run if - upgrades from really old instances fail when migrating permissions for - users having the "Default" role in their projects (closes: #561351). + * New upstream release. [ Thorsten Glaser ] * Update copyright file * Fix broken link in /usr/share/fusionforge (Evolvis [#1638]) - -- Roland Mas Wed, 03 Aug 2011 20:09:56 +0200 + -- Roland Mas Fri, 01 Jul 2011 14:24:31 +0200 fusionforge (5.0.3-1) unstable; urgency=low diff --git a/tools/VM-scripts/install.sh b/tools/VM-scripts/install.sh index 600c053..ab1cd82 100755 --- a/tools/VM-scripts/install.sh +++ b/tools/VM-scripts/install.sh @@ -9,8 +9,16 @@ # Prerequisite : running 'build.sh' and its prerequisites + +#set -x +grep -q debian-repository /etc/apt/sources.list +if [ $? -ne 0 ]; then + echo "You probably need to add the following in /etc/apt/sources.list :" + echo "deb file:///root/debian-repository local/" + exit 1 +fi + set -e -set -x aptitude update if dpkg -l fusionforge-full | grep -q ^ii ; then -- 2.1.4