From 9eff4fbfe530deabb0dae15ed0fc8d51c1a37e51 Mon Sep 17 00:00:00 2001 From: Niels Thykier Date: Fri, 26 Mar 2010 20:59:28 +0000 Subject: Added myself to uploaders and applied p1_trival_changes.patch --- debian/changelog | 8 ++++++++ debian/control | 3 ++- policy.xml | 37 ++++++++++++++++++++++--------------- 3 files changed, 32 insertions(+), 16 deletions(-) diff --git a/debian/changelog b/debian/changelog index b3ab6a2..a9d7617 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +java-common (0.35) UNRELEASED; urgency=low + + * Added myself to Uploaders. + * Added myself to the list of Authors of the Java Policy. + * Applied minor corrections to the Java Policy. + + -- Niels Thykier Fri, 26 Mar 2010 21:44:45 +0100 + java-common (0.34) unstable; urgency=low * Build a default-jdk-doc package to make the documentation available diff --git a/debian/control b/debian/control index fe7f213..21b1619 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,8 @@ Source: java-common Section: java Priority: optional Maintainer: Debian Java Mailing List -Uploaders: Stefan Gybas , Arnaud Vandyck , Michael Koch , Matthias Klose , Torsten Werner +Uploaders: Stefan Gybas , Arnaud Vandyck , Michael Koch , Matthias Klose , Torsten Werner , + Niels Thykier Build-Depends: debhelper (>= 5) Build-Depends-Indep: debiandoc-sgml, docbook-utils, docbook-xml, dpsyco-devel, lynx Standards-Version: 3.8.2 diff --git a/policy.xml b/policy.xml index a0ba44f..e3e2945 100644 --- a/policy.xml +++ b/policy.xml @@ -3,6 +3,7 @@ "/usr/share/sgml/docbook/dtd/4.1/docbook.dtd" [ must"> +must not"> may"> should"> java-virtual-machine"> @@ -17,6 +18,18 @@ Debian policy for Java $Revision:$ $Date:$ + + Thykier + Niels + + + niels@thykier.net + + + The current author of the java policy. + + + Lundqvist Ola @@ -25,7 +38,7 @@ opal@debian.org - The current author of the java policy. + A previous author of the java policy. @@ -97,11 +110,6 @@ &jvm;, &j1r; and &j2r;. - - All Java code must be shipped as Java bytecode (*.class files, packaged - in a *.jar archive) and with Architecture: all. - - Packages written in Java are separated in two categories: programs and libraries. Programs are intended to be run by end-users. Libraries @@ -109,10 +117,10 @@ - Both are shipped as Java bytecode (*.class + Both &must; be shipped as Java bytecode (*.class files, packaged in a *.jar archive) and with - an "Architecture: all" since Java bytecode is supposed to be portable. - It may additionally be shipped as machine code, as produced for example + an "Architecture: all". + It &may; additionally be shipped as machine code, as produced for example by the GNU Compiler for Java, in a separate architecture-specific package. @@ -135,11 +143,11 @@ Packages that contain a runtime conforming to the Java 1.1 - specification should provide &j1r;. Packages that contain a runtime - conforming to the Java 2 specification should provide &j2r;. - If a package conforms to both, then it should provide both; however, + specification &should; provide &j1r;. Packages that contain a runtime + conforming to the Java 2 specification &should; provide &j2r;. + If a package conforms to both, then it &should; provide both; however, packages that do not implement the methods from Java 1.1 that have been - deprecated in Java 2 must not provide &j1r;. + deprecated in Java 2 &mustnot; provide &j1r;. @@ -301,8 +309,7 @@ If your source package can compile (correctly) only - with non-free tools (the only free Java compilers seem to be - guavac, gcj and jikes, it cannot go to main. If your package itself + with non-free tools, it cannot go to main. If your package itself is free, it &must; go to contrib. -- cgit v1.2.3