Removed unused lintian overrides.

8 files changed, 19 insertions, 20 deletions

diff --git a/debian-java-faq/debian-java-faq.sgml b/debian-java-faq/debian-java-faq.sgml
index 7cdf389..ba407c9 100644
--- a/debian-java-faq/debian-java-faq.sgml
+++ b/debian-java-faq/debian-java-faq.sgml
@@ -16,7 +16,7 @@
 <name>Javier Fernández-Sanguino Peña</name>
 <email>jfs@debian.org</email>
 </author>
-<version>$Revision: 7297 $, $Date: 2010-04-15 23:31:12 +0200 (Thu, 15 Apr 2010) $
+<version>$Revision: 7333 $, $Date: 2010-05-13 15:22:31 +0200 (Thu, 13 May 2010) $
 
 <abstract>
 Answers to Frequently Asked Questions on Debian and Java
@@ -213,6 +213,7 @@ recommend java-virtual-machine. Please check the policy for more details.
 <item><package>pja</package></item>
 <item><package>slide-webdavclient</package></item>
 <item><package>java-package</package></item>
+<item><package>java-gcj-compat</package></item>
 </list>
 </p>
 
@@ -419,19 +420,14 @@ also source to bytecode, or bytecode to native code.
 
 <chapt>Java Virtual Machines (JVM)
 <p>
-<sect>What jvms work in Debian?
-
-<p>Currently Sun's jvm works in Debian. Another solution is to use
-gcj and to compile to native code, thus solving the VM problem.)  
-
-<sect>What free JVMs are available in Debian?
+<sect>What JVMs are available in Debian?
 
 <p>The following JVMs are currently available in Debian Squeeze:
 
 <list>
 <item><package>openjdk-6-jre</package></item>
 <item><package>sun-java6-jre</package> (non-free)</item>
-<item><package>gij-4.3</package></item>
+<item><package>gcj-4.4-jre</package></item>
 </list>
 
 </p>
@@ -439,8 +435,9 @@ gcj and to compile to native code, thus solving the VM problem.)
 <p>The following lists JVMs available in Debian 5.0 release ('Lenny'):
 
 <list>
-<item><package>kaffe</package>
-<item><package>gij-4.3</package>
+<item><package>openjdk-6-jre</package></item>
+<item><package>kaffe</package></item>
+<item><package>gij-4.3</package></item>
 </list>
 
 
@@ -460,8 +457,9 @@ id="http://www.debian.org/Bugs/" name="Debian Bug Tracking System">.  As
 a quick link, here are some packages:
 
 <list>
-<item><url id="http://bugs.debian.org/java-common" name="java-common">
-<item><url id="http://bugs.debian.org/gcj" name="gcj">
+<item><url id="http://bugs.debian.org/java-common" name="java-common"></item>
+<item><url id="http://bugs.debian.org/src:openjdk-6" name="openjdk-6"></item>
+<item><url id="http://bugs.debian.org/src:gcj-4.4" name="gcj-4.4"></item>
 </list>
 
 <p>As common within the Debian project, the developers would
@@ -489,10 +487,10 @@ software chain is free.
 <list>
 
 <item>You can install the package icedtea-gcjwebplugin or the non-free
-packages sun-java5-plugin or sun-java6-plugin in <em>Lenny</em>. 
+packages sun-java5-plugin or sun-java6-plugin in <em>Lenny</em>.</item>
 
 <item>You can install the package icedtea6-plugin or the non-free
-package sun-java6-plugin in <em>Squeeze</em>.
+package sun-java6-plugin in <em>Squeeze</em>.</item>
 
 </list>
 
diff --git a/debian/changelog b/debian/changelog
index ec952ed..a884d66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+java-common (0.37) UNRELEASED; urgency=low
+
+  * Synced the Java FAQ.
+  * Removed unused lintian overrides.
+
+ -- Niels Thykier <niels@thykier.net>  Thu, 13 May 2010 15:46:11 +0200
+
 java-common (0.36) unstable; urgency=low
 
   * Correct a ${jdk} that should have been a ${jre} in the decription
diff --git a/debian/default-jdk-builddep.install b/debian/default-jdk-builddep.install
deleted file mode 100644
index 7ad8902..0000000
--- a/debian/default-jdk-builddep.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/lintian/default-jdk-builddep /usr/share/lintian/overrides
diff --git a/debian/default-jdk.install b/debian/default-jdk.install
deleted file mode 100644
index 97c72ee..0000000
--- a/debian/default-jdk.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/lintian/default-jdk /usr/share/lintian/overrides
diff --git a/debian/default-jre.install b/debian/default-jre.install
deleted file mode 100644
index 52ae16b..0000000
--- a/debian/default-jre.install
+++ /dev/null
@@ -1 +0,0 @@
-debian/lintian/default-jre /usr/share/lintian/overrides
diff --git a/debian/lintian/default-jdk b/debian/lintian/default-jdk
deleted file mode 100644
index 7c3b623..0000000
--- a/debian/lintian/default-jdk
+++ /dev/null
@@ -1 +0,0 @@
-default-jdk: cannot-check-whether-usr-share-doc-symlink-points-to-foreign-package
diff --git a/debian/lintian/default-jdk-builddep b/debian/lintian/default-jdk-builddep
deleted file mode 100644
index 2654685..0000000
--- a/debian/lintian/default-jdk-builddep
+++ /dev/null
@@ -1 +0,0 @@
-default-jdk-builddep: cannot-check-whether-usr-share-doc-symlink-points-to-foreign-package
diff --git a/debian/lintian/default-jre b/debian/lintian/default-jre
deleted file mode 100644
index 8f16039..0000000
--- a/debian/lintian/default-jre
+++ /dev/null
@@ -1 +0,0 @@
-default-jre: cannot-check-whether-usr-share-doc-symlink-points-to-foreign-package