[SCM] UNNAMED PROJECT branch, master, updated. 0.36-3-ge811a21
Niels Thykier
nthykier at alioth.debian.org
Mon Jul 4 07:33:04 UTC 2011
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 e811a2154dfcd85ce8c9ce93356dc4d9adf14712 (commit)
from c550f982f48c856a5b985e652eb963b0afcd41ca (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 e811a2154dfcd85ce8c9ce93356dc4d9adf14712
Author: Niels Thykier <niels at thykier.net>
Date: Mon Jul 4 09:29:14 2011 +0200
Added support for -s/--same-arch in jh_lib
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 2 ++
jh_classpath | 3 ++-
jh_depends | 3 ++-
jh_exec | 3 ++-
jh_installjavadoc | 3 ++-
jh_installlibs | 3 ++-
jh_lib.sh.in | 2 +-
7 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index fc6371e..93f5a99 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,8 @@ javatools (0.37) UNRELEASED; urgency=low
runs. (Closes: #632620)
* Applied changes from NMU.
- depend on gcj-jdk rather than gcj for java-propose-classpath.
+ * Added support for -s/--same-arch in jh_lib and related shell
+ scripts. (Closes: #632619)
-- Niels Thykier <niels at thykier.net> Mon, 04 Jul 2011 09:17:23 +0200
diff --git a/jh_classpath b/jh_classpath
index 6dad090..3112d2b 100755
--- a/jh_classpath
+++ b/jh_classpath
@@ -12,6 +12,7 @@ syntax()
echo -e "\t-V --version: show the version"
echo -e "\t-i --indep: act on all Arch: all packages"
echo -e "\t-a --arch: act on all Arch-specific packages"
+ echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-c<classpath> --classpath=<classpath>: The classpath to set on the jar(s)"
@@ -20,7 +21,7 @@ syntax()
exit 1
}
-ARGS="i indep a arch p package P tmpdir v verbose n no-act c classpath" parseargs "$@"
+ARGS="i indep a arch s same-arch p package P tmpdir v verbose n no-act c classpath" parseargs "$@"
dh_testdir
diff --git a/jh_depends b/jh_depends
index e46a0a1..93bf6b6 100755
--- a/jh_depends
+++ b/jh_depends
@@ -17,6 +17,7 @@ syntax()
echo -e "\t-v --verbose: show more information while running"
echo -e "\t-i --indep: work on all indep packages"
echo -e "\t-a --arch: work on all arch-specific packages"
+ echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
echo -e "\t-n --no-act: don't actually do anything, just print the results"
echo -e "\t-j[<jvm>] --jvm[=<jvm>]: Options are: default, headless, gcj, open, sun, sun6. Can be a space-separated list."
echo -e "\t-X<package> --exclude=<package>: don't add this package to depends"
@@ -82,7 +83,7 @@ function home-to-jvm()
echo "$JVM"
}
-ARGS="X exclude p package P tmpdir v verbose i indep a arch n no-act j jvm" parseargs "$@"
+ARGS="X exclude p package P tmpdir v verbose i indep a arch s same-arch n no-act j jvm" parseargs "$@"
VERBOSE="`getarg v verbose`"
diff --git a/jh_exec b/jh_exec
index c9df872..d031661 100755
--- a/jh_exec
+++ b/jh_exec
@@ -14,6 +14,7 @@ syntax()
echo -e "\t-V --version: print the version"
echo -e "\t-i --indep: run for all Arch: all packages"
echo -e "\t-a --arch: run for all Arch-specific packages"
+ echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-v --verbose: show more information while running"
@@ -21,7 +22,7 @@ syntax()
exit 1
}
-ARGS="i indep a arch p package P tmpdir v verbose n no-act" parseargs "$@"
+ARGS="i indep a arch s same-arch p package P tmpdir v verbose n no-act" parseargs "$@"
VERBOSE="`getarg v verbose`"
dh_testdir
diff --git a/jh_installjavadoc b/jh_installjavadoc
index 5d8a283..52ebf6b 100755
--- a/jh_installjavadoc
+++ b/jh_installjavadoc
@@ -12,6 +12,7 @@ syntax()
echo -e "\t-V --version: show the version"
echo -e "\t-i --indep: act on all Arch: all packages"
echo -e "\t-a --arch: act on all Arch-specific packages"
+ echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-v --verbose: show more information while running"
@@ -20,7 +21,7 @@ syntax()
exit 1
}
-ARGS="A author i indep a arch p package P tmpdir v verbose n no-act" parseargs "$@"
+ARGS="A author i indep a arch s same-arch p package P tmpdir v verbose n no-act" parseargs "$@"
dh_testdir
diff --git a/jh_installlibs b/jh_installlibs
index f5e95af..0760145 100755
--- a/jh_installlibs
+++ b/jh_installlibs
@@ -12,6 +12,7 @@ syntax()
echo -e "\t-V --version: show the version"
echo -e "\t-i --indep: act on all Arch: all packages"
echo -e "\t-a --arch: act on all Arch-specific packages"
+ echo -e "\t-s --same-arch: alias of --arch for compatibility with debhelper"
echo -e "\t-p<package> --package=<package>: package to act on (default=all)"
echo -e "\t-P<packagedir> --tmpdir=<package>: package directory (default=\$CWD/debian/package)"
echo -e "\t-v --verbose: show more information while running"
@@ -22,7 +23,7 @@ syntax()
exit 1
}
-ARGS="i indep s arch p package P tmpdir v verbose n no-act no-mangle upstream-version version-strip" parseargs "$@"
+ARGS="i indep a arch s same-arch p package P tmpdir v verbose n no-act no-mangle upstream-version version-strip" parseargs "$@"
dh_testdir
diff --git a/jh_lib.sh.in b/jh_lib.sh.in
index 79fd3a9..0cb90f6 100644
--- a/jh_lib.sh.in
+++ b/jh_lib.sh.in
@@ -86,7 +86,7 @@ findpackages()
echo $opt_package
elif [ -n "$opt_i" ] || [ -n "$opt_indep" ]; then
egrep '^(Package|Architecture)' debian/control | grep -B1 'Architecture: all'|sed -n '/^Package:/s/^[^:]*: *//p'
- elif [ -n "$opt_a" ] || [ -n "$opt_arch" ]; then
+ elif [ -n "$opt_a" ] || [ -n "$opt_arch" ] || [ -n "$opt_s" ] || [ -n "$opt_same_arch" ]; then
egrep '^(Package|Architecture)' debian/control | grep -v 'Architecture: all' | grep -B1 Architecture|sed -n '/^Package:/s/^[^:]*: *//p'
else
sed -n '/^Package:/s/^[^:]*: *//p' debian/control
hooks/post-receive
--
UNNAMED PROJECT
More information about the pkg-java-commits
mailing list