CVS kaffe/debian

[Arnaud Vandyck]

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

Modified Files:
	FileActions changelog 
Log Message:
reworked the changelog, changed the FileAction with the one from Wolfgang

--- /cvsroot/pkg-java/kaffe/debian/FileActions	2005/04/06 21:39:59	1.2
+++ /cvsroot/pkg-java/kaffe/debian/FileActions	2005/04/06 21:48:48	1.3
@@ -1,72 +1,83 @@
+############### header files ####################
+
+# header files are taken from the pthreads built
 File: usr/lib/kaffe/pthreads/include
 Target: usr/lib/kaffe/include
 Action: move-link
 
-File: usr/lib/kaffe/jthreads/jre/lib/rt.jar
-Target: usr/share/kaffe-common/lib/rt.jar
-Action: move-link
-
-File: usr/lib/kaffe/jthreads/jre/lib/security
-Target: usr/share/kaffe-common/jre/lib/security
-Action: move-link
-
-#File: usr/lib/kaffe/jthreads/bin/{ja{r,va{,c,doc,h,key,p}},rmi{c,registry},serialver,nm2as.awk,kopi,jdb,install-jar,appletviewer,kaffexprof,native2ascii,kaffe}
-#Target: usr/share/kaffe-common/bin
-#Action: move-link
-
-#File: usr/lib/kaffe/jthreads/jre/bin/{kaffe,java,rmiregistry}
-#Target: usr/share/kaffe-common/jre/bin
-#Action: move-link
-
+# for the other systems they are linked
 File: usr/lib/kaffe/jthreads/include
 Target: usr/lib/kaffe/include
 Action: link
 
-File: usr/lib/kaffe/pthreads/jre/lib/rt.jar
-Target: usr/share/kaffe-common/lib/rt.jar
+File: usr/lib/kaffe/pthreads-profile/include
+Target: usr/lib/kaffe/include
 Action: link
 
-File: usr/lib/kaffe/pthreads/jre/lib/security
-Target: usr/share/kaffe-common/jre/lib/security
-Action: link
+##################################################
 
-#File: usr/lib/kaffe/pthreads/bin/{ja{r,va{,c,doc,h,key,p}},rmi{c,registry},serialver,nm2as.awk,kopi,jdb,install-jar,appletviewer,kaffexprof,native2ascii,kaffe}
-#Target: usr/share/kaffe-common/bin
-#Action: link
-
-#File: usr/lib/kaffe/pthreads/jre/bin/{kaffe,java,rmiregistry}
-#Target: usr/share/kaffe-common/jre/bin
-#Action: link
+############## runtime library ###################
 
-File: usr/lib/kaffe/pthreads-profile/include
-Target: usr/lib/kaffe/include
+File: usr/lib/kaffe/jthreads/jre/lib/rt.jar
+Target: usr/share/kaffe-common/lib/rt.jar
+Action: move-link
+
+File: usr/lib/kaffe/pthreads/jre/lib/rt.jar
+Target: usr/share/kaffe-common/lib/rt.jar
 Action: link
 
 File: usr/lib/kaffe/pthreads-profile/jre/lib/rt.jar
 Target: usr/share/kaffe-common/lib/rt.jar
 Action: link
 
-File: usr/lib/kaffe/pthreads-profile/jre/lib/security
+##################################################
+
+############ lib/security #######################
+
+File: usr/lib/kaffe/jthreads/jre/lib/security
 Target: usr/share/kaffe-common/jre/lib/security
-Action: link
+Action: move-link
 
-File: usr/lib/kaffe/pthreads-profile/bin/{ja{r,va{,c,doc,h,key,p}},rmi{c,registry},serialver,jdb,install-jar,appletviewer,kaffexprof,native2ascii,kaffe}
-Target: usr/share/kaffe-common/bin
+File: usr/lib/kaffe/pthreads/jre/lib/security
+Target: usr/share/kaffe-common/jre/lib/security
 Action: link
 
-#nm2as.awk,kopi,
+File: usr/lib/kaffe/pthreads-profile/jre/lib/security
+Target: usr/share/kaffe-common/jre/lib/security
+Action: link
 
+################################################
 
-File: usr/lib/kaffe/pthreads-profile/jre/bin/{kaffe,java,rmiregistry}
-Target: usr/share/kaffe-common/jre/bin
-Action: link
+########### link the kaffe-system stuff #########
 
-File: usr/lib/kaffe/{lib,share,jre}
+# Comment: Removed share - there is no share directory in .system
+File: usr/lib/kaffe/{lib,jre}
 Target: usr/lib/kaffe/.system
 Action: link
 
-File: usr/lib/kaffe/bin/{ja{r,va{,c,doc,h,key,p}},rmi{c,registry},serialver,jdb,install-jar,appletviewer,kaffexprof,native2ascii,kaffe}
+#Comment: Removed all the programs which are not provided by kaffe
+File: usr/lib/kaffe/bin/{ja{r,va{,c,doc,h,p}},rmi{c,registry},serialver,install-jar,native2ascii,kaffe}
 Target: usr/lib/kaffe/.system/bin
 Action: link
 
-#nm2as.awk,kopi,
+##################################################
+
+########## Delete the installed appletviewer #######
+
+File: usr/lib/kaffe/pthreads/bin/appletviewer
+Action: delete
+
+File: usr/lib/kaffe/jthreads/bin/appletviewer
+Action: delete
+
+File: usr/lib/kaffe/pthreads-profile/bin/appletviewer
+Action: delete
+
+#####################################################
+
+
+
+
+
+
+
--- /cvsroot/pkg-java/kaffe/debian/changelog	2005/04/06 21:39:59	1.2
+++ /cvsroot/pkg-java/kaffe/debian/changelog	2005/04/06 21:48:49	1.3
@@ -1,15 +1,15 @@
 kaffe (2:1.1.5-1) unstable; urgency=low
 
   * New upstream release.
-  * Applied a patch from Wolfgang Bear to include the awt-gtk headers in
-    kaffe-dev (closes: #295703).
   * removed javakey, kopi and nm2as.awk from the symlinks (closes:
     #302782).
-  * added a manpage from Wolfgang (closes: #301166, #303408).
-  * added debian/kaffe-dev.links from Wolfgang to solve the include
-    problem (closes: #262595).
-
- -- Arnaud Vandyck <avdyk@debian.org>  Wed,  6 Apr 2005 22:53:43 +0200
+  * 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).
+  
+ -- Arnaud Vandyck <avdyk@debian.org>  Wed,  6 Apr 2005 23:46:37 +0200
 
 kaffe (2:1.1.4.RC1-1) unstable; urgency=low