CVS kaffe/debian

Wolfgang B??r wbaer-guest@haydn.debian.org
Mon Apr 11 17:15:11 2005


Update of /cvsroot/pkg-java/kaffe/debian
In directory haydn:/tmp/cvs-serv15828/debian

Modified Files:
	FileActions changelog kaffe-SYSTEM.postinst.in 
	kaffe-common.manpages kaffe.postinst rules 
Added Files:
	README.Debian 
Log Message:
should be 1.1.5 - but not yet tagged

--- /cvsroot/pkg-java/kaffe/debian/FileActions	2005/04/06 22:34:03	1.4
+++ /cvsroot/pkg-java/kaffe/debian/FileActions	2005/04/11 17:14:41	1.5
@@ -75,9 +75,3 @@
 
 #####################################################
 
-
-
-
-
-
-
--- /cvsroot/pkg-java/kaffe/debian/changelog	2005/04/06 23:23:19	1.4
+++ /cvsroot/pkg-java/kaffe/debian/changelog	2005/04/11 17:14:42	1.5
@@ -1,15 +1,22 @@
 kaffe (2:1.1.5-1) unstable; urgency=low
 
   * New upstream release.
-  * removed javakey, kopi and nm2as.awk from the symlinks (closes:
-    #302782).
-  * added a dummy jdb script, patch from the kaffe mailing list (closes:
-    #298314).
+  * Removed javakey, kopi and nm2as.awk from the symlinks (closes: #302782).
+  * Added a dummy jdb script to simulate a correct JAVA_HOME for tomcat4: 
+    - patch from the kaffe mailing list (closes: #298314, #300468)
+    - patches for regenerated Makefile.in and configure file
+      Attention: these two patches needs to be updated for 
+      EACH new upstream release (Wolfgang)
   * Wolfgang Baer:
     - added a manpage for native2ascii (closes: #301166, #303408).
     - debian/kaffe-dev.links: added. This will solve the include
       problem (closes: #262595).
     - patch to include awt-gtk headers in kaffe-dev (closes: #295703).
+    - debian/kaffe.preinst: added to remove old appletviewer, javakey
+      alternative entries on upgrade, which are no longer supported.
+    - debian/README.Debian: added to explain the kaffe systems 
+      setup via the alternative system (closes: #281520)
+    - WHATSNEW file included in kaffe-doc package
   
  -- Arnaud Vandyck <avdyk@debian.org>  Thu,  7 Apr 2005 00:39:08 +0200
 
--- /cvsroot/pkg-java/kaffe/debian/kaffe-SYSTEM.postinst.in	2005/04/03 21:03:05	1.1.1.1
+++ /cvsroot/pkg-java/kaffe/debian/kaffe-SYSTEM.postinst.in	2005/04/11 17:14:42	1.2
@@ -2,7 +2,6 @@
 set -e
 
 if [ "$1" = "configure" ];then
-#	update-alternatives --remove kaffe-system /usr/lib/kaffe/@NAME@ >/dev/null || true
 	update-alternatives --install /usr/lib/kaffe/.system kaffe-system /usr/lib/kaffe/@NAME@ @PRIORITY@
 fi
 
--- /cvsroot/pkg-java/kaffe/debian/kaffe-common.manpages	2005/04/06 21:39:59	1.2
+++ /cvsroot/pkg-java/kaffe/debian/kaffe-common.manpages	2005/04/11 17:14:42	1.3
@@ -3,7 +3,6 @@
 debian/man/javac.kaffe.1
 debian/man/javadoc.kaffe.1
 debian/man/javap.kaffe.1
-debian/man/jdb.kaffe.1
 debian/man/rmic.kaffe.1
 debian/man/rmiregistry.kaffe.1
 debian/man/serialver.kaffe.1
--- /cvsroot/pkg-java/kaffe/debian/kaffe.postinst	2005/04/06 22:34:03	1.2
+++ /cvsroot/pkg-java/kaffe/debian/kaffe.postinst	2005/04/11 17:14:42	1.3
@@ -3,9 +3,6 @@
 
 if [ "$1" = "configure" ];then
 	for file in jar java javac javadoc javah javap native2ascii rmic rmiregistry serialver ; do
-# removed appletviewer
-# jdb is not in yet
-#		update-alternatives --remove $file /usr/lib/kaffe/bin/$file >/dev/null || true
     update-alternatives --quiet \
         --install /usr/bin/$file $file /usr/lib/kaffe/bin/$file 300 \
         --slave /usr/share/man/man1/$file.1.gz $file.1.gz /usr/share/man/man1/$file.kaffe.1.gz \
--- /cvsroot/pkg-java/kaffe/debian/rules	2005/04/06 21:39:59	1.2
+++ /cvsroot/pkg-java/kaffe/debian/rules	2005/04/11 17:14:42	1.3
@@ -178,6 +178,7 @@
 	mkdir -p debian/kaffe-doc/usr/share/doc/kaffe/FAQ
 	chmod -x build-tree/kaffe-$(RELEASE)/kaffe/scripts/nm2as.awk
 	cp build-tree/kaffe-$(RELEASE)/FAQ/FAQ.* debian/kaffe-doc/usr/share/doc/kaffe/FAQ
+	cp build-tree/kaffe-$(RELEASE)/WHATSNEW debian/kaffe-doc/usr/share/doc/kaffe/
 	dh_installchangelogs $(BUILD_TREE)/ChangeLog -i
 #	dh_installinfo -i
 	dh_installman -i