4 files changed, 46 insertions, 9 deletions
diff --git a/debian/README.Debian b/debian/README.Debian
index 13c7676..403cf62 100644
--- a/debian/README.Debian
+++ b/debian/README.Debian
@@ -3,12 +3,12 @@ work. The package contains the Proposed Debian Java Policy and
 the Debian Java FAQ. It should probably be enough to get things going.
 
 They can be found at
-/usr/share/doc/java-common/debian-java-faq.html
+/usr/share/doc/java-common/debian-java-faq/index.html
 and
-/usr/share/doc/java-common/debian-java-policy.html
+/usr/share/doc/java-common/debian-java-policy/index.html
 
 Previously it existed a bunch of *-dummy packages. They have now been
-removed from the archive. If you need to fullfill the dependencies you have
+removed from the archive. If you need to fulfill the dependencies you have
 to make your own dummy package. The equivs package might help you with
 this.
 
diff --git a/debian/changelog b/debian/changelog
index a82c088..a61d226 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,22 @@
+java-common (0.23) unstable; urgency=low
+
+  * Updated the Debian Java FAQ (closes: #156547, #252219), thanks to
+    Javier Fernandez-Sanguino Peña
+  * policy.xml: corrected typos (closes: #285303), thanks to Bill
+    Allombert
+  * debian/control:
+    + (Uploaders) removed Ola Lundqvist from the uploaders (see
+      debian-java mailing list, June 2005)
+    + (Uploaders) added myself
+    + (Uploaders) added Debian Java Maintainers (closes: #302887)
+  * debian/README.Debian: corrected wrong path the the faq and the policy
+    and a typo (closes: #197256, #285014), thanks to Vincent Lefevre
+  * debian/copyright: moved Ola from current maintainers to previous
+    maintainers, updated the file with the debhelper gpl template, added
+    copyright years (closes: #290189)
+
+ -- Arnaud Vandyck <avdyk@debian.org>  Sat, 11 Jun 2005 13:59:20 +0200
+
 java-common (0.22) unstable; urgency=low
 
   * Changed Maintainer: to the Debian Java Mailing List and added myself
diff --git a/debian/control b/debian/control
index 88d4a5c..4c1715f 100644
--- a/debian/control
+++ b/debian/control
@@ -2,8 +2,8 @@ Source: java-common
 Section: misc
 Priority: optional
 Maintainer: Debian Java Mailing List <debian-java@lists.debian.org>
-Uploaders: Ola Lundqvist <opal@debian.org>, Stefan Gybas <sgybas@debian.org>
-Build-Depends: debhelper (>> 3.0.0), debiandoc-sgml, docbook-utils, docbook-xml, dpsyco-devel, lynx
+Uploaders: Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>
+Build-Depends: debhelper (>= 3.0.0), debiandoc-sgml, docbook-utils, docbook-xml, dpsyco-devel, lynx
 Standards-Version: 3.6.1
 
 Package: java-common
diff --git a/debian/copyright b/debian/copyright
index 4f92c8e..4a2e701 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,13 +2,31 @@ It is a Debian original work.
 
 Current maintainers:
 	Stefan Gybas <sgybas@debian.org>
-	Ola Lundqvist <opal@debian.org>
+	Arnaud Vandyck <avdyk@debian.org>
 
-Previsous maintainers:
+Previous maintainers:
+	Ola Lundqvist <opal@debian.org>
 	Stephane Bortzmeyer <bortzmeyer@debian.org>
 
-Copyright:
+Copyright (C) 1999-2005 by current and previous maintainers for Debian
+
+License:
+
+   This package is free software; you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation; either version 2 of the License, or
+   (at your option) any later version.
+
+   This package is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
 
-GPL. See /usr/share/common-licenses/GPL.
+   You should have received a copy of the GNU General Public License
+   along with this package; if not, write to the Free Software
+   Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
+   02111-1307, USA.
 
+On Debian systems, the complete text of the GNU General
+Public License can be found in `/usr/share/common-licenses/GPL'.