This is an automated email from the git hooks/post-receive script. sebastic-guest pushed a commit to branch master in repository osmosis.
commit eac336f0848aae3b3070c9a886f3eb88d26037d1 Author: Bas Couwenberg <[email protected]> Date: Wed Apr 9 22:24:51 2014 +0200 Add patch to get version from changelog instead of git. --- debian/changelog | 2 +- debian/control | 1 - debian/patches/04-osmosis-version.patch | 18 ++++++++++++++++++ debian/patches/series | 1 + 4 files changed, 20 insertions(+), 2 deletions(-) diff --git a/debian/changelog b/debian/changelog index a3cb535..d928880 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,8 +23,8 @@ osmosis (0.43.1-1) UNRELEASED; urgency=low * Add build dependency on libwoodstox-java. * Add patch to use packaged libraries during build. * Remove generated files and directories on clean. - * Add build dependency on git, used by gradle build system. * Bump Standards-Version to 3.9.5, changes: Vcs-* fields. + * Add patch to get version from changelog instead of git. -- Bas Couwenberg <[email protected]> Sun, 16 Mar 2014 15:17:02 +0100 diff --git a/debian/control b/debian/control index 0b10e7d..c0ef8b9 100644 --- a/debian/control +++ b/debian/control @@ -31,7 +31,6 @@ Build-Depends: gradle, checkstyle (>= 5.6), ivy, junit4 (>= 4.10), - git, default-jdk, maven-repo-helper Standards-Version: 3.9.5 diff --git a/debian/patches/04-osmosis-version.patch b/debian/patches/04-osmosis-version.patch new file mode 100644 index 0000000..5b52e0d --- /dev/null +++ b/debian/patches/04-osmosis-version.patch @@ -0,0 +1,18 @@ +Description: Extract osmosis version from changelog instead of git. +Author: Bas Couwenberg <[email protected]> +--- a/build.gradle ++++ b/build.gradle +@@ -20,7 +20,7 @@ subprojects { + + // Load the project version dynamically from Git. For release builds, don't add a suffix. + def versionSuffix = "RELEASE".equals(osmosisBuildType) ? '' : '-' + osmosisBuildType +- version = 'git describe --always --dirty'.execute().in.text.trim() + versionSuffix ++ version = 'sh osmosis-version.sh'.execute().in.text.trim() + + // Enable access to artefact dependency repositories. + repositories { +--- /dev/null ++++ b/osmosis-version.sh +@@ -0,0 +1,2 @@ ++#!/bin/sh ++dpkg-parsechangelog | sed -ne 's/^Version: \(.*\)-.*/\1/p' diff --git a/debian/patches/series b/debian/patches/series index f6fafbb..fba5bba 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,3 +1,4 @@ 01-fix_launcher.patch 02-fix_plexus.patch 03-local-dependencies.patch +04-osmosis-version.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/osmosis.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
