[SCM] UNNAMED PROJECT branch, master, updated. 0.31-42-gd37c552
Niels Thykier
nthykier at alioth.debian.org
Thu Feb 17 15:59:14 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 d37c552c4e21c5488a35264ab927054c31604e86 (commit)
via 5886494bfcb7baecc49a5715fc61bf6e82cc0885 (commit)
via bfd936a7be97916911d21fa3cd98d9ee405bf19b (commit)
from 92a65741893d2875e453fa3f248c5c94f6c824fc (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 d37c552c4e21c5488a35264ab927054c31604e86
Author: Niels Thykier <niels at thykier.net>
Date: Thu Feb 17 16:56:36 2011 +0100
jh_makepkg now uses gcj-jdk as B-D and puts JDKs in B-D
commit 5886494bfcb7baecc49a5715fc61bf6e82cc0885
Author: Niels Thykier <niels at thykier.net>
Date: Thu Feb 17 16:40:07 2011 +0100
Removed -5/--sun5 option from jh_makepkg
commit bfd936a7be97916911d21fa3cd98d9ee405bf19b
Author: Niels Thykier <niels at thykier.net>
Date: Thu Feb 17 16:22:44 2011 +0100
Bumped S-V and removed DMUA flag
-----------------------------------------------------------------------
Summary of changes:
debian/changelog | 10 ++++++++++
debian/control | 3 +--
jh_makepkg | 27 +++++----------------------
3 files changed, 16 insertions(+), 24 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 81939e7..c8c121f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,17 @@
javatools (0.33) unreleased; urgency=low
+ [ Matthew Johnson ]
* fixed some bugs in jh_makepkg (Closes: #593351)
+ [ Niels Thykier ]
+ * Bumped Standards-Version 3.9.1 - no changes required.
+ - Also bumped S-V in jh_makepkg.
+ * Removed DMUA flag; no longer needed.
+ * Removed -5/--sun5 option from jh_makepkg.
+ * Used gcj-jdk instead of java-gcj-compat-dev in jh_makepkg.
+ * Put the JDK dependency in Build-Depends of the control files
+ generated by jh_makepkg, since it is needed by the clean rule.
+
-- Matthew Johnson <mjj29 at debian.org> Sun, 05 Sep 2010 15:56:31 +0000
javatools (0.32) unstable; urgency=low
diff --git a/debian/control b/debian/control
index aced9a1..6adc8f5 100644
--- a/debian/control
+++ b/debian/control
@@ -3,11 +3,10 @@ Priority: optional
Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.org>
Uploaders: Matthew Johnson <mjj29 at debian.org>, Niels Thykier <niels at thykier.net>
Build-Depends: debhelper (>= 7.0.50~)
-Standards-Version: 3.9.0
+Standards-Version: 3.9.1
Section: java
Vcs-Git: git://git.debian.org/git/pkg-java/javatools.git
Vcs-Browser: http://git.debian.org/?p=pkg-java/javatools.git
-DM-Upload-Allowed: yes
Package: jarwrapper
Architecture: all
diff --git a/jh_makepkg b/jh_makepkg
index b7fd810..acec058 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -6,7 +6,7 @@
# gcj, sun
COMPAT=7
-STANDARDS=3.8.3
+STANDARDS=3.9.1
set -e
@@ -32,7 +32,6 @@ syntax()
echo -e "\t-k --makefiles: Builds with make"
echo -e "\t-n --none: Create own buildsystem"
echo -e "\tPick One:"
- echo -e "\t-5 --sun5: Build with Sun Java 1.5 (package must be contrib)"
echo -e "\t-6 --sun6: Build with Sun Java <1.6 (package must be contrib)"
echo -e "\t-g --gcj: Build with gcj"
echo -e "\t-d --default: Build with default free platform compiler"
@@ -45,7 +44,7 @@ syntax()
exit 1
}
-ARGS="p package m maintainer e email v upstream l library a app t ant k makefile n none 5 sun5 6 sun6 g gcj o openjdk M maven d default" parseargs "$@"
+ARGS="p package m maintainer e email v upstream l library a app t ant k makefile n none 6 sun6 g gcj o openjdk M maven d default" parseargs "$@"
BUILDDIR="`pwd`"
@@ -223,8 +222,6 @@ if [ -n "`getarg d default`" ]; then
COMP="default"
elif [ -n "`getarg g gcj`" ]; then
COMP="gcj"
-elif [ -n "`getarg 5 sun5`" ]; then
- COMP="sun5"
elif [ -n "`getarg 6 sun6`" ]; then
COMP="sun6"
elif [ -n "`getarg o openjdk`" ]; then
@@ -234,10 +231,9 @@ else
echo "Select:"
echo -e "\t[F] Default Free compiler/runtime (Default)"
echo -e "\t[G] GCJ"
- echo -e "\t[5] Sun Java 1.5 (Package must be in contrib)"
echo -e "\t[6] Sun Java 1.6 (Package must be in contrib)"
echo -e "\t[o] OpenJDK 6"
- echo -n "[FG56o] $ "
+ echo -n "[FG6o] $ "
read t
echo
case $t in
@@ -245,10 +241,6 @@ else
COMP="open"
echo "Selected: OpenJDK 6"
;;
- "5")
- COMP="sun5"
- echo "Selected: Sun 1.5"
- ;;
"6")
COMP="sun6"
echo "Selected: Sun 1.6"
@@ -266,19 +258,13 @@ fi
case $COMP in
"gcj")
- COMPILER=java-gcj-compat-dev
+ COMPILER=gcj-jdk
JAVA_HOME=/usr/lib/jvm/java-gcj
;;
"default")
COMPILER=default-jdk
JAVA_HOME=/usr/lib/jvm/default-java
;;
- "sun5")
- COMPILER=sun-java5-jdk
- JAVA_HOME=/usr/lib/jvm/java-1.5.0-sun
- CONTRIB=contrib/
- JVM=sun5
- ;;
"sun6")
COMPILER=sun-java6-jdk
JAVA_HOME=/usr/lib/jvm/java-6-sun
@@ -298,10 +284,7 @@ Source: $SRCPACKAGE
Section: ${CONTRIB}$SECTION
Priority: optional
Maintainer: $DEBFULLNAME <$DEBEMAIL>
-Build-Depends: debhelper (>> $COMPAT), javahelper (>= $JAVATOOLS_VERSION) $DEPENDS
-END
-echo "Build-Depends-Indep: $COMPILER" >> debian/control
-cat >> debian/control <<END
+Build-Depends: debhelper (>> $COMPAT), $COMPILER, javahelper (>= $JAVATOOLS_VERSION) $DEPENDS
Standards-Version: $STANDARDS
Homepage: <homepage>
hooks/post-receive
--
UNNAMED PROJECT
More information about the pkg-java-commits
mailing list