[pkg-java] r13588 - in trunk/ca-certificates-java: . debian

[Torsten Werner]

Author: twerner
Date: 2011-04-25 13:16:59 +0000 (Mon, 25 Apr 2011)
New Revision: 13588

Modified:
   trunk/ca-certificates-java/UpdateCertificates.java
   trunk/ca-certificates-java/debian/copyright
Log:
Update copyright and license.


Modified: trunk/ca-certificates-java/UpdateCertificates.java
===================================================================
--- trunk/ca-certificates-java/UpdateCertificates.java	2011-04-25 13:12:02 UTC (rev 13587)
+++ trunk/ca-certificates-java/UpdateCertificates.java	2011-04-25 13:16:59 UTC (rev 13588)
@@ -5,18 +5,19 @@
  * http://gitorious.org/opensuse/ca-certificates/blobs/master/keystore.java
  * for the Debian operating system. It updates the global JVM keystore.
  *
- * This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public License
- * version 2 as published by the Free Software Foundation.
- * 
+ * This program 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 program 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; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+
+ * You should have received a copy of the GNU General Public License along
+ * with this program; if not, write to the Free Software Foundation, Inc.,
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
  *
  */
 

Modified: trunk/ca-certificates-java/debian/copyright
===================================================================
--- trunk/ca-certificates-java/debian/copyright	2011-04-25 13:12:02 UTC (rev 13587)
+++ trunk/ca-certificates-java/debian/copyright	2011-04-25 13:16:59 UTC (rev 13588)
@@ -1,15 +1,18 @@
 This package was debianized by Matthias Klose <doko at ubuntu.com>
 on Mon, 02 Jun 2008 14:52:46 +0000.
 
-Upstream Author: 
+Authors: 
 
     Matthias Klose <doko at ubuntu.com>
+    Torsten Werner <twerner at debian.org>
 
 Copyright: 
 
-    <Copyright (C) 2008 Canonical Ltd>
+    Copyright (C) 2008 Canonical Ltd
+    Copyright (C) 2011 Torsten Werner <twerner at debian.org>
 
 License:
 
-The Debian package is (C) 2008, Canonical Ltd and
-is licensed under the GPL, see `/usr/share/common-licenses/GPL'.
+The Debian package is (C) 2008, Canonical Ltd and (C) 2011, Torsten Werner
+<twerner at debian.org> and is licensed under the GPL, see
+`/usr/share/common-licenses/GPL'.