X-Git-Url: http://git.rot13.org/?a=blobdiff_plain;f=debian%2Fbuild-git-snapshot;h=1e1505d7d49c6de1a29a4f19a472ed0f4126a07f;hb=6ef92056ffea9dd47d59dc9695391167ed3fdcb1;hp=91552ff73c3890e74451422f8ca463394f6632be;hpb=a118102d4e2d7cf6bc1157a560c52fd6deb6f7a7;p=koha.git

diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot
index 91552ff73c..1e1505d7d4 100755
--- a/debian/build-git-snapshot
+++ b/debian/build-git-snapshot
@@ -4,18 +4,18 @@
 #
 # This file is part of Koha.
 #
-# Koha is free software; you can redistribute it and/or modify it under the
-# terms of the GNU General Public License as published by the Free Software
-# Foundation; either version 2 of the License, or (at your option) any later
-# version.
+# Koha is free software; you can redistribute it and/or modify it
+# under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
 #
-# Koha is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR
-# A PARTICULAR PURPOSE.  See the GNU General Public License for more details.
+# Koha is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+# GNU General Public License for more details.
 #
-# You should have received a copy of the GNU General Public License along
-# with Koha; if not, write to the Free Software Foundation, Inc.,
-# 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+# You should have received a copy of the GNU General Public License
+# along with Koha; if not, see <http://www.gnu.org/licenses>.
 
 # Written by Robin Sheat <robin@catalyst.net.nz> and
 #   Srdjan Jankovic <srdjan@catalyst.net.nz>
@@ -27,15 +27,17 @@ use warnings;
 use Getopt::Long;
 use POSIX qw/strftime/;
 
+my $basetgz;
 my $buildresult;
 my $distribution='squeeze-dev';
 my $git_checks='all';
-my $version='3.5-1~git';
+my $version='16.06~git';
 my $auto_version=1;
 my $need_help;
 my $debug;
 
 GetOptions(
+    'basetgz|b=s'      => \$basetgz,
     'buildresult|r=s'   => \$buildresult,
     'distribution|D=s'  => \$distribution,
     'git-checks|g=s'    => \$git_checks,
@@ -62,7 +64,7 @@ sub sys_command_output_screen {
     my ($command) = @_;
 
     print "$command\n" if $debug;
-    system($command);
+    system($command) == 0 or die "Command '$command' returns an error ($?)\n";
 }
 
 sub everything_is_committed {
@@ -108,7 +110,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.5-1~git'.
+        the version string for the resulting package. Default is '$version'.
     --(no)autoversion
         whether or not to use the date and git commit ID in the version value.
         Default is to include it.
@@ -137,7 +139,8 @@ sub build_package {
     sys_command_output( qq{git archive --format=tar --prefix="koha-$newversion/" HEAD | gzip -9 > "../koha_$newversion.tar.gz"} );
 
     my $pdebuildopts = $buildresult ? "--buildresult $buildresult" : "";
-    sys_command_output_screen( "pdebuild $pdebuildopts" );
+    my $pdebuildbasetgz = $basetgz ? "-- --basetgz /var/cache/pbuilder/" . $basetgz . ".tgz" : "";
+    sys_command_output_screen( "pdebuild $pdebuildbasetgz $pdebuildopts" );
 }
 
 everything_is_committed() or die "cannot build: uncommited changes";