From a1ce323ab2dbae6c43e23e2d3ae2ea5be7659173 Mon Sep 17 00:00:00 2001 From: Mirko Tietgen Date: Tue, 23 Jan 2018 11:43:10 +0100 Subject: [PATCH] Bug 20072 - Fix build-git-snapshot for Debian source format quilt With bug 18696 we need a few tiny changes to build-git-snapshot: - Debian revision number for debian/changelog - "orig" in the file name for the tar.gz archive Signed-off-by: Mirko Tietgen --- debian/build-git-snapshot | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/debian/build-git-snapshot b/debian/build-git-snapshot index 1e1505d..260816d 100755 --- a/debian/build-git-snapshot +++ b/debian/build-git-snapshot @@ -125,6 +125,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."} ); @@ -136,7 +138,7 @@ 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" : ""; my $pdebuildbasetgz = $basetgz ? "-- --basetgz /var/cache/pbuilder/" . $basetgz . ".tgz" : ""; -- 2.1.4