[java-policy] 46/198: Fixed some xml errors and reference error to debian policy, using patch from Ahmid, closes: #173033.

Emmanuel Bourg ebourg-guest at moszumanska.debian.org
Wed Sep 23 07:49:28 UTC 2015


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 63689618b059c1f619de50cd091c2096912b88b4
Author: Ola Nordmann <olapc at yahoo.no>
Date:   Wed Dec 18 05:52:54 2002 +0000

    Fixed some xml errors and reference error to debian policy, using patch from Ahmid, closes: #173033.
---
 debian/changelog           |  7 ++++++
 patches/0.16-policy.author |  7 ++++++
 patches/0.16-policy.patch  | 56 ++++++++++++++++++++++++++++++++++++++++++++++
 policy.xml                 | 18 +++++++--------
 4 files changed, 79 insertions(+), 9 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index fdb670d..e76fa3d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+java-common (0.17) unstable; urgency=low
+
+  * Fixed some xml errors and reference error to debian policy, using
+    patch from Ahmed <ahmed at baizid.org>, closes: #173033.
+
+ -- Ola Lundqvist <opal at debian.org>  Mon, 16 Dec 2002 08:07:39 +0100
+
 java-common (0.16) unstable; urgency=low
 
   * Updated java policy with more about JNI, closes: #162282.
diff --git a/patches/0.16-policy.author b/patches/0.16-policy.author
new file mode 100644
index 0000000..730bf9e
--- /dev/null
+++ b/patches/0.16-policy.author
@@ -0,0 +1,7 @@
+Ahmed <ahmed at baizid.org>
+
+A small typo make Java policy invalid XML.
+
+References to the Debian policy do not seem correct.
+
+I propose the attached patch.
diff --git a/patches/0.16-policy.patch b/patches/0.16-policy.patch
new file mode 100644
index 0000000..a955c58
--- /dev/null
+++ b/patches/0.16-policy.patch
@@ -0,0 +1,56 @@
+--- policy.xml	2002-12-12 02:42:18.000000000 +0100
++++ policy.xml	2002-12-12 03:32:28.000000000 +0100
+@@ -133,7 +133,7 @@
+ 	environment.
+       </para>
+       <para>
+-	I &should; use <filename>/etc/alternatives</filename>
++	They &should; use <filename>/etc/alternatives</filename>
+ 	for the name 'java' if they are command-line compatible with the
+ 	Sun's java program.
+       </para>
+@@ -155,7 +155,7 @@
+       <para>
+ 	Java compilers &must; provide &jc; and/or &j2c; and depend on
+ 	java-common. They &must; also depend on the needed runtime environemnt
+-	(&j1r and/or &j2r;).
++	(&j1r; and/or &j2r;).
+       </para>
+       
+       <para>
+@@ -175,11 +175,11 @@
+ 	<filename>/usr/bin</filename> and be executable. They can be Java
+ 	classes (using binfmt_misc) or wrappers. In any case, they &must; run
+ 	without specific environment variables (see
+-	<ulink url="http://www.debian.org/doc/debian-policy/ch3.html#s3.8">Policy
+-	  3.8</ulink>), for instance CLASSPATH. They &must; respect the Policy
++	<ulink url="http://www.debian.org/doc/debian-policy/ch-opersys.html#s10.9">Policy
++	  10.9</ulink>), for instance CLASSPATH. They &must; respect the Policy
+ 	rules for executables (for instance a manual page per executable, see
+-	<ulink url="http://www.debian.org/doc/debian-policy/ch6.html#s6.1">
+-	  Policy 6.1</ulink>).
++	<ulink url="http://www.debian.org/doc/debian-policy/ch-docs.html#s13.1">
++	  Policy 13.1</ulink>).
+       </para>
+       <para>
+         If they have their own auxiliary classes, they
+@@ -324,8 +324,8 @@
+       <listitem>
+ 	<para>
+ 	  Sun's Community Source Licence. Can we use it? How?
+-	  Where can we <ulink url="http://www.sun.com/software/communitysource/faq.html">
+-	    find the text</ulink>?
++	  The 2.3 version of the text can be found 
++	  <ulink url="http://wwws.sun.com/software/java2/license.html">here</ulink>.
+ 	</para>
+       </listitem>
+ 
+@@ -370,7 +370,7 @@
+     <title>Advices to Java packagers</title>
+     
+     <para>
+-      Warning: they are just advices, they are not part of the policy.
++      Warning: These are just advices, they are not part of the policy.
+     </para>
+     
+     <itemizedlist>
diff --git a/policy.xml b/policy.xml
index 4a19688..55da931 100644
--- a/policy.xml
+++ b/policy.xml
@@ -133,7 +133,7 @@
 	environment.
       </para>
       <para>
-	I &should; use <filename>/etc/alternatives</filename>
+	They &should; use <filename>/etc/alternatives</filename>
 	for the name 'java' if they are command-line compatible with the
 	Sun's java program.
       </para>
@@ -155,7 +155,7 @@
       <para>
 	Java compilers &must; provide &jc; and/or &j2c; and depend on
 	java-common. They &must; also depend on the needed runtime environemnt
-	(&j1r and/or &j2r;).
+	(&j1r; and/or &j2r;).
       </para>
       
       <para>
@@ -175,11 +175,11 @@
 	<filename>/usr/bin</filename> and be executable. They can be Java
 	classes (using binfmt_misc) or wrappers. In any case, they &must; run
 	without specific environment variables (see
-	<ulink url="http://www.debian.org/doc/debian-policy/ch3.html#s3.8">Policy
-	  3.8</ulink>), for instance CLASSPATH. They &must; respect the Policy
+	<ulink url="http://www.debian.org/doc/debian-policy/ch-opersys.html#s10.9">Policy
+	  10.9</ulink>), for instance CLASSPATH. They &must; respect the Policy
 	rules for executables (for instance a manual page per executable, see
-	<ulink url="http://www.debian.org/doc/debian-policy/ch6.html#s6.1">
-	  Policy 6.1</ulink>).
+	<ulink url="http://www.debian.org/doc/debian-policy/ch-docs.html#s13.1">
+	  Policy 13.1</ulink>).
       </para>
       <para>
         If they have their own auxiliary classes, they
@@ -324,8 +324,8 @@
       <listitem>
 	<para>
 	  Sun's Community Source Licence. Can we use it? How?
-	  Where can we <ulink url="http://www.sun.com/software/communitysource/faq.html">
-	    find the text</ulink>?
+	  The 2.3 version of the text can be found 
+	  <ulink url="http://wwws.sun.com/software/java2/license.html">here</ulink>.
 	</para>
       </listitem>
 
@@ -370,7 +370,7 @@
     <title>Advices to Java packagers</title>
     
     <para>
-      Warning: they are just advices, they are not part of the policy.
+      Warning: These are just advices, they are not part of the policy.
     </para>
     
     <itemizedlist>

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



More information about the pkg-java-commits mailing list