[kaffe] CVS kaffe (robilad): Resynced with GNU Classpath: cleanups

Kaffe CVS cvs-commits at kaffe.org
Wed Feb 23 14:43:52 PST 2005


PatchSet 5602 
Date: 2005/02/23 22:37:45
Author: robilad
Branch: HEAD
Tag: (none) 
Log:
Resynced with GNU Classpath: cleanups

2005-02-23  Dalibor Topic  <robilad at kaffe.org>

        Resynced with GNU Classpath.

        2005-02-22  Michael Koch  <konqueror at gmx.de>

        * gnu/java/security/PolicyFile.java,
        gnu/java/security/pkcs/PKCS7SignedData.java,
        gnu/java/security/pkcs/SignerInfo.java:
        Fixed copyright header.

Members: 
	ChangeLog:1.3647->1.3648 
	libraries/javalib/gnu/java/security/PolicyFile.java:1.5->1.6 
	libraries/javalib/gnu/java/security/pkcs/PKCS7SignedData.java:1.1->1.2 
	libraries/javalib/gnu/java/security/pkcs/SignerInfo.java:1.2->1.3 

cvs rdiff: [22:43:20] waiting for robilad's lock in /home/cvs/kaffe/kaffe
cvs rdiff: [22:43:50] obtained lock in /home/cvs/kaffe/kaffe
Index: kaffe/ChangeLog
diff -u kaffe/ChangeLog:1.3647 kaffe/ChangeLog:1.3648
--- kaffe/ChangeLog:1.3647	Wed Feb 23 22:09:25 2005
+++ kaffe/ChangeLog	Wed Feb 23 22:37:45 2005
@@ -2,6 +2,17 @@
 
 	Resynced with GNU Classpath.
 
+	2005-02-22  Michael Koch  <konqueror at gmx.de>
+
+        * gnu/java/security/PolicyFile.java,
+        gnu/java/security/pkcs/PKCS7SignedData.java,
+        gnu/java/security/pkcs/SignerInfo.java:
+        Fixed copyright header.
+
+2005-02-23  Dalibor Topic  <robilad at kaffe.org>
+
+	Resynced with GNU Classpath.
+
 	2005-02-22  Roman Kennke <roman at ontographics.com>
 
         * javax/swing/plaf/basic/BasicLookAndFeel.java
Index: kaffe/libraries/javalib/gnu/java/security/PolicyFile.java
diff -u kaffe/libraries/javalib/gnu/java/security/PolicyFile.java:1.5 kaffe/libraries/javalib/gnu/java/security/PolicyFile.java:1.6
--- kaffe/libraries/javalib/gnu/java/security/PolicyFile.java:1.5	Wed Nov 10 11:17:23 2004
+++ kaffe/libraries/javalib/gnu/java/security/PolicyFile.java	Wed Feb 23 22:37:49 2005
@@ -1,18 +1,20 @@
-/* PolicyFile.java -- policy file reader.
-   Copyright (C) 2004  Free Software Foundation, Inc.
+/* PolicyFile.java -- policy file reader
+   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
 any later version.
 
-This program is distributed in the hope that it will be useful, but
+GNU Classpath 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.
 
 You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING.  If not, write to the
+along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 02111-1307 USA.
 
@@ -32,7 +34,6 @@
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
-
 
 package gnu.java.security;
 
Index: kaffe/libraries/javalib/gnu/java/security/pkcs/PKCS7SignedData.java
diff -u kaffe/libraries/javalib/gnu/java/security/pkcs/PKCS7SignedData.java:1.1 kaffe/libraries/javalib/gnu/java/security/pkcs/PKCS7SignedData.java:1.2
--- kaffe/libraries/javalib/gnu/java/security/pkcs/PKCS7SignedData.java:1.1	Thu Nov 11 00:32:42 2004
+++ kaffe/libraries/javalib/gnu/java/security/pkcs/PKCS7SignedData.java	Wed Feb 23 22:37:50 2005
@@ -1,18 +1,20 @@
-/* PKCS7SignedData.java -- reader for PKCS#7 signedData objects.
-   Copyright (C) 2004  Free Software Foundation, Inc.
+/* PKCS7SignedData.java -- reader for PKCS#7 signedData objects
+   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
 any later version.
 
-This program is distributed in the hope that it will be useful, but
+GNU Classpath 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.
 
 You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING.  If not, write to the
+along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 02111-1307 USA.
 
@@ -32,7 +34,6 @@
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
-
 
 package gnu.java.security.pkcs;
 
Index: kaffe/libraries/javalib/gnu/java/security/pkcs/SignerInfo.java
diff -u kaffe/libraries/javalib/gnu/java/security/pkcs/SignerInfo.java:1.2 kaffe/libraries/javalib/gnu/java/security/pkcs/SignerInfo.java:1.3
--- kaffe/libraries/javalib/gnu/java/security/pkcs/SignerInfo.java:1.2	Mon Feb 14 20:49:32 2005
+++ kaffe/libraries/javalib/gnu/java/security/pkcs/SignerInfo.java	Wed Feb 23 22:37:50 2005
@@ -1,18 +1,20 @@
-/* SignerInfo.java -- a SignerInfo object, from PKCS #7.
-   Copyright (C) 2004  Free Software Foundation, Inc.
+/* SignerInfo.java -- a SignerInfo object, from PKCS #7
+   Copyright (C) 2004, 2005  Free Software Foundation, Inc.
 
-This program is free software; you can redistribute it and/or modify
+This file is part of GNU Classpath.
+
+GNU Classpath 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, or (at your option)
 any later version.
 
-This program is distributed in the hope that it will be useful, but
+GNU Classpath 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.
 
 You should have received a copy of the GNU General Public License
-along with this program; see the file COPYING.  If not, write to the
+along with GNU Classpath; see the file COPYING.  If not, write to the
 Free Software Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
 02111-1307 USA.
 
@@ -32,7 +34,6 @@
 this exception to your version of the library, but you are not
 obligated to do so.  If you do not wish to do so, delete this
 exception statement from your version. */
-
 
 package gnu.java.security.pkcs;
 




More information about the kaffe mailing list