From 8eb2c65800d9a7bf867de6b0f64ba4f85b70a10f Mon Sep 17 00:00:00 2001 From: Robin Sheat Date: Thu, 2 Jun 2011 16:27:33 +1200 Subject: [PATCH] Bug 5602: Changes to account for the version update. This is intended to apply on top of the previous 5602 patch. --- debian/README.build | 10 +++++----- debian/build-git-snapshot | 7 ++++--- 2 files changed, 9 insertions(+), 8 deletions(-) diff --git a/debian/README.build b/debian/README.build index 32a0f5d..9d33726 100644 --- a/debian/README.build +++ b/debian/README.build @@ -1,4 +1,5 @@ -In order to build .deb packages, following debian packages need to be present (installed): +In order to build .deb packages, following debian packages need to be present +(installed): devscripts pbuilder dh-make @@ -7,7 +8,6 @@ fakeroot As root (or sudo) execute: pbuilder create -Executing build-git-snapshot without any arguments will leave package and the rest in some pbuilder dir, eg. /var/cache/pbuilder/result -It is highly recommended that --buildresult option is used. - -The script requires sudo. +Executing build-git-snapshot without any arguments will leave package and the +rest in some pbuilder dir, eg. /var/cache/pbuilder/result It is highly +recommended that --buildresult option is used. diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot index c3140e7..295b5fa 100755 --- a/debian/build-git-snapshot +++ b/debian/build-git-snapshot @@ -17,7 +17,8 @@ # with Koha; if not, write to the Free Software Foundation, Inc., # 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. -# Written by Robin Sheat +# Written by Robin Sheat and +# Srdjan Jankovic # Based on an sh version by Lars Wirzenius. use strict; @@ -29,7 +30,7 @@ use POSIX qw/strftime/; my $buildresult; my $distribution='squeeze-dev'; my $git_checks='all'; -my $version='3.3-1~git'; +my $version='3.5-1~git'; my $auto_version=1; my $need_help; my $debug; @@ -99,7 +100,7 @@ Options: tracked files with untracked changes will cause an error), and 'none' (checking git status is skipped totally.) Default is 'all'. --version, -v - the version string for the resulting package. Default is '3.3-1~git'. + the version string for the resulting package. Default is '3.5-1~git'. --(no)autoversion whether or not to use the date and git commit ID in the version value. Default is to include it. -- 1.7.4.1