Bug 26265: (QA follow-up) Remove g option from regex, add few dirs

[koha-equinox.git] / debian / build-git-snapshot

diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot
index 62447fd..cedddae 100755 (executable)
--- a/debian/build-git-snapshot
+++ b/debian/build-git-snapshot
@@ -21,21 +21,22 @@
 #   Srdjan Jankovic <srdjan@catalyst.net.nz>
 # Based on an sh version by Lars Wirzenius.
 
-use strict;
-use warnings;
+use Modern::Perl;
 
-use Getopt::Long;
+use Getopt::Long qw(:config no_ignore_case);
 use POSIX qw/strftime/;
 
+my $basetgz;
 my $buildresult;
 my $distribution='squeeze-dev';
 my $git_checks='all';
-my $version='3.21~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,
@@ -123,6 +124,8 @@ sub latest_sha1 {
 
 sub adjust_debian_changelog {
     my ($newversion) = @_;
+    # debian revision
+    $newversion .= "-1";
 
     sys_command_output( qq{dch --force-distribution -D "$distribution" -v "$newversion" "Building git snapshot."} );
     sys_command_output( qq{dch -r "Building git snapshot."} );
@@ -134,10 +137,11 @@ sub reset_debian_changelog {
 
 sub build_package {
     my ($newversion) = @_;
-    sys_command_output( qq{git archive --format=tar --prefix="koha-$newversion/" HEAD | gzip -9 > "../koha_$newversion.tar.gz"} );
+    sys_command_output( qq{git archive --format=tar --prefix="koha-$newversion/" HEAD | gzip -9 > "../koha_$newversion.orig.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";