This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "UNNAMED PROJECT".
The branch, master has been updated
via b686dbd0b23a867878cb55cfe35c2624255234f8 (commit)
from 32b70db3fda3e8ca7db20607e7cdc20cd00859fe (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit b686dbd0b23a867878cb55cfe35c2624255234f8
Author: Niels Thykier <ni...@thykier.net>
Date: Fri Feb 18 12:04:46 2011 +0100
jh_installlibs now properly picks up the version of native packages
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
jh_installlibs | 9 ++++++++-
2 files changed, 10 insertions(+), 1 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 13b8c88..395e8a1 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -14,6 +14,8 @@ javatools (0.33) unreleased; urgency=low
* Made cdbs run jh_installlibs before jh_manifest and jh_classpath.
* Added missing depends on findutils for javahelper.
* Converted tutorial into markdown format.
+ * jh_installlibs now properly picks up the version of native packages.
+ (Closes: #612404)
-- Matthew Johnson <mj...@debian.org> Sun, 05 Sep 2010 15:56:31 +0000
diff --git a/jh_installlibs b/jh_installlibs
index 8466969..6d53147 100755
--- a/jh_installlibs
+++ b/jh_installlibs
@@ -26,7 +26,14 @@ ARGS="i indep s arch p package P tmpdir v verbose n no-act
no-mangle upstream-ve
dh_testdir
-VERSION="`dpkg-parsechangelog | sed -n '/^Version:/s/^[^:]*:
\(.*\)-[^-]*/\1/p'`"
+FULL_VERSION="`dpkg-parsechangelog | sed -n '/^Version:/s/^[^:]*:
\(.*\)$/\1/p'`"
+if echo "$FULL_VERSION" | grep -q -e "-" ; then
+ # version from non-native package
+ VERSION="$(echo "$FULL_VERSION" | sed -n 's/\(.*\)-[^-]*/\1/p')"
+else
+ # version from native package
+ VERSION="$FULL_VERSION"
+fi
VERBOSE="`getarg v verbose`"
DEFAULT_VERSION_MANGLE=".dfsg[0-9]*$"
hooks/post-receive
--
UNNAMED PROJECT
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-java-commits
