[Git][java-team/javatools][experimental] 9 commits: Remove short -o option for --javacopts from jh_build (Closes: #951573)
Tony Mancill
gitlab at salsa.debian.org
Sun Sep 6 23:50:04 BST 2020
Tony Mancill pushed to branch experimental at Debian Java Maintainers / javatools
Commits:
174ad5eb by tony mancill at 2020-09-06T09:31:14-07:00
Remove short -o option for --javacopts from jh_build (Closes: #951573)
- - - - -
00cd6709 by tony mancill at 2020-09-06T09:33:41-07:00
Remove short -o option for --javaopts from jh_manifest
- - - - -
c3e7d3a2 by tony mancill at 2020-09-06T10:51:24-07:00
Fix jh_depends "-j headless" having no effect (Closes: #935244)
Thank you to Dmitry Smirnov for the patch.
- - - - -
719756ae by tony mancill at 2020-09-06T10:56:22-07:00
Update dh_link example in tutorial (Closes: #935849)
- - - - -
9ae8f6fc by tony mancill at 2020-09-06T10:56:57-07:00
Use debhelper-compat 13
- - - - -
7c9c3f6e by tony mancill at 2020-09-06T10:57:31-07:00
Add myself to Uploaders
- - - - -
e10827f5 by tony mancill at 2020-09-06T15:26:00-07:00
Remove --parallel option from dh sequencer
Gbp-Dch: ignore
- - - - -
0a945af6 by tony mancill at 2020-09-06T15:45:15-07:00
More consistent whitespace in jh_makepkg
- - - - -
8aa85712 by tony mancill at 2020-09-06T15:45:15-07:00
prepare changelog for upload to experimental
- - - - -
8 changed files:
- debian/changelog
- debian/control
- debian/rules
- jh_build
- jh_depends
- jh_makepkg
- jh_manifest
- tutorial.txt
Changes:
=====================================
debian/changelog
=====================================
@@ -1,3 +1,16 @@
+javatools (0.76) experimental; urgency=medium
+
+ * Uploading to experimental because options have been removed
+ * Remove short -o option for --javacopts from jh_build (Closes: #951573)
+ * Remove short -o option for --javaopts from jh_manifest
+ * Fix jh_depends "-j headless" having no effect (Closes: #935244)
+ * Update dh_link example in tutorial (Closes: #935849)
+ * Use debhelper-compat 13
+ * Add myself to Uploaders
+ * Note: merging master into experimental introduced whitespace changes
+
+ -- tony mancill <tmancill at debian.org> Sun, 06 Sep 2020 10:57:45 -0700
+
javatools (0.75) unstable; urgency=medium
* Team upload.
=====================================
debian/control
=====================================
@@ -2,9 +2,10 @@ Source: javatools
Section: java
Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
-Uploaders: Emmanuel Bourg <ebourg at apache.org>
+Uploaders: Emmanuel Bourg <ebourg at apache.org>,
+ tony mancill <tmancill at debian.org>
Build-Depends:
- debhelper-compat (= 12),
+ debhelper-compat (= 13),
default-jdk,
libarchive-zip-perl (>= 1.30-6~),
libtest-minimumversion-perl,
=====================================
debian/rules
=====================================
@@ -7,7 +7,7 @@ POD2MAN=pod2man --stderr --utf8 -c Javahelper -r "$(DEB_VERSION)"
MOD_PATH:=lib/Debian/Javahelper
%:
- dh $@ --parallel
+ dh $@
jh_lib.sh: jh_lib.sh.in
sed 's,%JAVATOOLS_VERSION%,${DEB_VERSION},' < $< > $@
=====================================
jh_build
=====================================
@@ -63,7 +63,7 @@ Use I<home> as B<JAVA_HOME> (overrides the B<JAVA_HOME> environment variable).
Whether or not to build javadoc for the jar files. The default is to
generate javadoc along with the jar files.
-=item B<-o> I<options>, B<--javacopts=>I<options>
+=item B<--javacopts=>I<options>
Pass I<options> to javac (when invoking javac). The I<options> value
is a space-separate list of options (remember to quote the argument to avoid the shell
@@ -136,7 +136,7 @@ init(options => {
'no-javadoc' => sub { $build_javadoc = 0; },
'clean' => \$do_clean,
# Space-separated list of options
- 'javacopts|o=s' => sub { @javac_opts = split(' ', $_[1])},
+ 'javacopts=s' => sub { @javac_opts = split(' ', $_[1])},
'javadoc-opts=s' => sub { @javadoc_opts = split(' ', $_[1])},
});
=====================================
jh_depends
=====================================
@@ -211,7 +211,7 @@ for p in $PACKAGES; do
DEBDEPS="jarwrapper (>=0.5) $DEBDEPS"
fi
JVMDEPS=
- if [ -n "`getarg j jvm`" ] && [ -z "$JVM" ]; then
+ if [ -n "`getarg j jvm`" ]; then
JVM="`getarg j jvm`"
fi
=====================================
jh_makepkg
=====================================
@@ -327,8 +327,8 @@ Description: Short Description
END
if [ "$TYPE" = "lib" ] ; then
- # add doc package template
- cat >> debian/control <<END
+ # add doc package template
+ cat >> debian/control <<END
Package: $BINPACKAGE-doc
Architecture: all
@@ -379,15 +379,16 @@ export JAVA_HOME=${JAVA_HOME}
dh \$@ --with javahelper
END
- case $BUILD in
- "ant")
- ;;
- "make")
- ;;
- "byhand")
- echo ${SRCPACKAGE}.jar src > debian/javabuild
- ;;
- esac
+
+case $BUILD in
+ "ant")
+ ;;
+ "make")
+ ;;
+ "byhand")
+ echo ${SRCPACKAGE}.jar src > debian/javabuild
+ ;;
+esac
case $TYPE in
"app")
@@ -402,9 +403,9 @@ END
"lib")
echo "$SRCPACKAGE.jar" > debian/$BINPACKAGE.jlibs
if [ "$BUILD" = "byhand" ]; then
- echo "internal" > debian/$BINPACKAGE-doc.javadoc
+ echo "internal" > debian/$BINPACKAGE-doc.javadoc
else
- echo "<javadoc build dir here>" > debian/$BINPACKAGE-doc.javadoc
+ echo "<javadoc build dir here>" > debian/$BINPACKAGE-doc.javadoc
fi
;;
esac
=====================================
jh_manifest
=====================================
@@ -75,7 +75,7 @@ the given jar file do not have a Class-Path attribute.
Sets the Main-Class attribute to I<class> in all processed jar files.
-=item B<-o> I<options>, B<--javaopts=>I<options>
+=item B<--javaopts=>I<options>
Sets the Debian-Java-Parameters to I<options> in all processed jar
files. This attribute is used by jarwrapper to start java with extra
@@ -98,8 +98,7 @@ my $jopt = '';
my $envcp = 0;
init(options => {
- # -o clashes debhelper's "only scripts"
- 'javaopts|o=s' => \$jopt,
+ 'javaopts=s' => \$jopt,
'java-home|j=s' => \$jvm,
'main|m=s' => \$mcl,
'classpath|c=s' => \$cp,
=====================================
tutorial.txt
=====================================
@@ -573,7 +573,7 @@ debian/salliere.install
debian/salliere.links
- usr/share/salliere/salliere.jar usr/bin
+ usr/share/salliere/salliere.jar usr/bin/salliere.jar
Using javahelper with CDBS
--------------------------
View it on GitLab: https://salsa.debian.org/java-team/javatools/-/compare/04acc015d5cbd6c3b89a4406ff474367619d1dec...8aa857125a2e92523150563750179bc789c28072
--
View it on GitLab: https://salsa.debian.org/java-team/javatools/-/compare/04acc015d5cbd6c3b89a4406ff474367619d1dec...8aa857125a2e92523150563750179bc789c28072
You're receiving this email because of your account on salsa.debian.org.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://alioth-lists.debian.net/pipermail/pkg-java-commits/attachments/20200906/9bb2d2f9/attachment.html>
More information about the pkg-java-commits
mailing list