This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository java-policy.

commit 9eff4fbfe530deabb0dae15ed0fc8d51c1a37e51
Author: Niels Thykier <[email protected]>
Date:   Fri Mar 26 20:59:28 2010 +0000

    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 <[email protected]>  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 <[email protected]>
-Uploaders: Stefan Gybas <[email protected]>, Arnaud Vandyck 
<[email protected]>, Michael Koch <[email protected]>, Matthias Klose 
<[email protected]>, Torsten Werner <[email protected]>
+Uploaders: Stefan Gybas <[email protected]>, Arnaud Vandyck 
<[email protected]>, Michael Koch <[email protected]>, Matthias Klose 
<[email protected]>, Torsten Werner <[email protected]>,
+ Niels Thykier <[email protected]>
 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"
 [
 <!ENTITY must "<emphasis>must</emphasis>">
+<!ENTITY mustnot "<emphasis>must not</emphasis>">
 <!ENTITY may "<emphasis>may</emphasis>">
 <!ENTITY should "<emphasis>should</emphasis>">
 <!ENTITY jvm "<emphasis>java-virtual-machine</emphasis>">
@@ -18,6 +19,18 @@
     <edition>$Revision:$ $Date:$</edition>
     <authorgroup>
       <author>
+       <surname>Thykier</surname>
+       <firstname>Niels</firstname>
+       <authorblurb>
+         <para>
+           <email>[email protected]</email>
+         </para>
+         <para>
+           The current author of the java policy.
+         </para>
+       </authorblurb>
+      </author>
+      <author>
        <surname>Lundqvist</surname>
        <firstname>Ola</firstname>
        <authorblurb>
@@ -25,7 +38,7 @@
            <email>[email protected]</email>
          </para>
          <para>
-           The current author of the java policy.
+           A previous author of the java policy.
          </para>
        </authorblurb>
       </author>
@@ -98,21 +111,16 @@
     </para>
 
     <para>
-      All Java code must be shipped as Java bytecode (*.class files, packaged
-      in a *.jar archive) and with <quote>Architecture: all</quote>.
-    </para>
-
-    <para>
       Packages written in Java are separated in two categories: programs
       and libraries. Programs are intended to be run by end-users. Libraries
       are intended to help programs to run and to be used by developers.
     </para>
 
     <para>
-      Both are shipped as Java bytecode (<filename>*.class</filename>
+      Both &must; be shipped as Java bytecode (<filename>*.class</filename>
       files, packaged in a <filename>*.jar</filename> 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.
     </para>
@@ -135,11 +143,11 @@
 
       <para>
         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;.
       </para>
        
       <para>
@@ -301,8 +309,7 @@
        <listitem>
          <para>
            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.
          </para>
        </listitem>

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-java/java-policy.git

_______________________________________________
pkg-java-commits mailing list
[email protected]
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits

Reply via email to