Bugzilla – Attachment 4338 Details for
Bug 5602
Improve configurability of package building scripts
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
[x]
|
Forgot Password
Login:
[x]
[patch]
Updates to account for new version number
0001-Bug-5602-Changes-to-account-for-the-version-update.patch (text/plain), 2.47 KB, created by
Robin Sheat
on 2011-06-02 04:30:04 UTC
(
hide
)
Description:
Updates to account for new version number
Filename:
MIME Type:
Creator:
Robin Sheat
Created:
2011-06-02 04:30:04 UTC
Size:
2.47 KB
patch
obsolete
>From 8eb2c65800d9a7bf867de6b0f64ba4f85b70a10f Mon Sep 17 00:00:00 2001 >From: Robin Sheat <robin@catalyst.net.nz> >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 <robin@catalyst.net.nz> >+# Written by Robin Sheat <robin@catalyst.net.nz> and >+# Srdjan Jankovic <srdjan@catalyst.net.nz> > # 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 >
You cannot view the attachment while viewing its details because your browser does not support IFRAMEs.
View the attachment on a separate page
.
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
|
Splinter Review
Attachments on
bug 5602
:
4007
|
4338
|
4391
|
4392
|
5370