Added changes up to the 0.25 uploaddebian/0.25

6 files changed, 31 insertions, 18 deletions

diff --git a/debian/changelog b/debian/changelog
index c427846..c6f5b7e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,10 +1,27 @@
+java-common (0.25) unstable; urgency=low
+
+  [Matthias Klose]
+  * update-java-alternatives: Search for /usr/lib/jvm/.*.jinfo files
+    as well, new option --plugin.
+
+ -- Michael Koch <konqueror@gmx.de>  Tue,  9 May 2006 21:33:38 +0000
+
 java-common (0.24) unstable; urgency=low
 
-  * Added new JVM launcher support scripts and settings file. These support
-    machine wide, per-user, per-program JVM selection. They should be sourced
-    from a package's wrapper script to determine JAVA_HOME.
+  [Matthias Klose]
+  * Search for the update-java-alternatives description files in
+    /usr/lib/jvm/*.jinfo.
+  * Add a script update-java-alternatives(8).
+
+  [Michael Koch]
+  * Updated DH_COMPAT level to 4.
+  * Updated Standards-Version to 3.7.2.
+  * Added myself to Uploaders field.
+  * Added myself to debian/copyright and updated address of FSF.
+  * Moved most of Build-Depends to Build-Depends-Indep.
+  * Removed CVS directories.
 
- -- Jerry Haltom <wasabi@larvalstage.net>  Wed,  6 Jul 2005 17:44:45 -0500
+ -- Michael Koch <konqueror@gmx.de>  Sat,  6 May 2006 22:20:14 +0000
 
 java-common (0.23) unstable; urgency=low
 
diff --git a/debian/control b/debian/control
index 4c1715f..45c1f58 100644
--- a/debian/control
+++ b/debian/control
@@ -2,9 +2,10 @@ Source: java-common
 Section: misc
 Priority: optional
 Maintainer: Debian Java Mailing List <debian-java@lists.debian.org>
-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
+Uploaders: Stefan Gybas <sgybas@debian.org>, Arnaud Vandyck <avdyk@debian.org>, Michael Koch <konqueror@gmx.de>
+Build-Depends: debhelper (>= 3.0.0)
+Build-Depends-Indep: debiandoc-sgml, docbook-utils, docbook-xml, dpsyco-devel, lynx
+Standards-Version: 3.7.2
 
 Package: java-common
 Architecture: all
diff --git a/debian/copyright b/debian/copyright
index 4a2e701..8b93b9a 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,12 +3,13 @@ It is a Debian original work.
 Current maintainers:
 	Stefan Gybas <sgybas@debian.org>
 	Arnaud Vandyck <avdyk@debian.org>
+	Michael Koch <konqueror@gmx.de>
 
 Previous maintainers:
 	Ola Lundqvist <opal@debian.org>
 	Stephane Bortzmeyer <bortzmeyer@debian.org>
 
-Copyright (C) 1999-2005 by current and previous maintainers for Debian
+Copyright (C) 1999-2006 by current and previous maintainers for Debian
 
 License:
 
@@ -23,10 +24,9 @@ License:
    GNU General Public License for more details.
 
    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.
+   along with this program; if not, write to the Free Software
+   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
 On Debian systems, the complete text of the GNU General
-Public License can be found in `/usr/share/common-licenses/GPL'.
+Public License can be found in `/usr/share/common-licenses/GPL-2'.
 
diff --git a/debian/java-common.dirs b/debian/java-common.dirs
index bf7c2a3..13c9f03 100644
--- a/debian/java-common.dirs
+++ b/debian/java-common.dirs
@@ -1,2 +1 @@
-usr/share/java-common
 usr/share/java
diff --git a/debian/java-common.install b/debian/java-common.install
deleted file mode 100644
index 6153158..0000000
--- a/debian/java-common.install
+++ /dev/null
@@ -1,3 +0,0 @@
-share/java-common.sh	usr/share/java-common
-share/jvm-find.sh	usr/share/java-common
-etc/jvm			etc
diff --git a/debian/rules b/debian/rules
index f195b97..3c4b39e 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-export DH_COMPAT=3
+export DH_COMPAT=4
 
 build: build-stamp
 build-stamp:
@@ -62,7 +62,6 @@ binary-indep: build install
 #	dh_installcron -i
 	dh_installman -i
 #	dh_installinfo -i
-	dh_install -i
 #	dh_undocumented -i
 	dh_installchangelogs  -i
 	dh_link -i