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 3ca73a7b000f49637f233c7c2049cb07e6fc3105 Author: Emmanuel Bourg <[email protected]> Date: Wed Sep 23 08:44:51 2015 +0200 Removed the patches directory --- debian/changelog | 1 + patches/0.16-policy.author | 7 ------ patches/0.16-policy.patch | 56 ------------------------------------------ patches/0.18-jni-policy.author | 1 - patches/0.18-jni-policy.patch | 52 --------------------------------------- 5 files changed, 1 insertion(+), 116 deletions(-) diff --git a/debian/changelog b/debian/changelog index 7f9251e..4e65ae0 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,6 +2,7 @@ java-policy (0.54) UNRELEASED; urgency=medium * Team upload. * Moved the Java policy to a separate package. + * Removed the ./patches directory (all applied a long time ago) -- Emmanuel Bourg <[email protected]> Tue, 22 Sep 2015 09:23:34 +0200 diff --git a/patches/0.16-policy.author b/patches/0.16-policy.author deleted file mode 100644 index 730bf9e..0000000 --- a/patches/0.16-policy.author +++ /dev/null @@ -1,7 +0,0 @@ -Ahmed <[email protected]> - -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 deleted file mode 100644 index a955c58..0000000 --- a/patches/0.16-policy.patch +++ /dev/null @@ -1,56 +0,0 @@ ---- 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/patches/0.18-jni-policy.author b/patches/0.18-jni-policy.author deleted file mode 100644 index a2f932c..0000000 --- a/patches/0.18-jni-policy.author +++ /dev/null @@ -1 +0,0 @@ -From: Ben Burton <[email protected]> diff --git a/patches/0.18-jni-policy.patch b/patches/0.18-jni-policy.patch deleted file mode 100644 index ae0f053..0000000 --- a/patches/0.18-jni-policy.patch +++ /dev/null @@ -1,52 +0,0 @@ ---- java-common-0.16/policy.xml 2002-09-26 00:53:03.000000000 +1000 -+++ java-common-0.16.1/policy.xml 2003-02-09 23:16:23.000000000 +1100 -@@ -147,6 +147,14 @@ - virtual machine, you &may; name the compiler package xxxx-dev. - </para> - -+ <para> -+ Some Java classes implement their routines using a "native" -+ language (such as C). This native code is compiled and stored -+ in dynamic libraries (such as JNI modules) that are loaded at -+ runtime. If a virtual machine supports native code, it &must; -+ include the directory <filename>/usr/lib/jni</filename> in its -+ search path for these dynamic libraries. -+ </para> - </sect1> - - <sect1 id="policy-compiler"> -@@ -245,18 +253,27 @@ - This applies only to libraries, <emphasis>not</emphasis> to the core - classes provied by a the runtime environment. - </para> -- -+ -+ <para> -+ Some Java libraries rely on code written in a "native" language, -+ such as JNI (Java Native Interface) code. This native code is -+ compiled into separate dynamic libraries which are loaded by the -+ Java virtual machine at runtime. -+ </para> -+ - <para> -- If the Java code depends on code written in a "native" language, -- for example Java Native Interface code, the compiled native code -- &should; be shipped in a separate architecture-specific package -- named libXXX[version]-jni. The package containing Java bytecode -- &should; depend on this package. -+ If a Java library relies on native code, the dynamic libraries -+ containing this compiled native code &should; be installed into -+ the directory <filename>/usr/lib/jni</filename>. These dynamic -+ libraries &should; be shipped in a separate architecture-specific -+ package named libXXX[version]-jni. The package containing the Java -+ bytecode (generally libXXX[version]-java) &should; depend on -+ this package. - </para> - <para> - There may be situations, such as with very small packages, - where it is better to bundle the Java code and the native code -- together into a single package. Such packages should be -+ together into a single package. Such packages &should; be - architecture-specific and follow the usual libXXX[version]-java - naming convention. - </para> -- 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

