[SCM] ROME: Java library to handle Atom and RSS feeds branch, master, updated. debian/1.0-2-3-g7fc989f

Miguel Landaeta miguel at miguel.cc
Sun Oct 23 18:31:34 UTC 2011


The following commit has been merged in the master branch:
commit 7fc989f13a9b18a4775b186d9de048c85c44db8e
Author: Miguel Landaeta <miguel at miguel.cc>
Date:   Sun Oct 23 13:55:00 2011 -0430

    Make copyright file DEP-5 compliant

diff --git a/debian/changelog b/debian/changelog
index 2990080..a185d9f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ rome (1.0-3) UNRELEASED; urgency=low
 
   * Provide OSGi metadata in jar manifest. (Closes: #646058).
   * Bump Standards-Version to 3.9.2. No changes were required.
+  * Make copyright file DEP-5 compliant.
 
  -- Miguel Landaeta <miguel at miguel.cc>  Sun, 23 Oct 2011 13:38:20 -0430
 
diff --git a/debian/copyright b/debian/copyright
index f6fa5f6..a940174 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,13 +1,26 @@
-The sources were downloaded from https://rome.dev.java.net/dist/rome-1.0-sources.jar.
+Format: http://dep.debian.net/deps/dep5/
+Upstream-Name: Rome
+Upstream-Contact: Sun Microsystems, Inc.
+Source: https://rome.dev.java.net/dist/rome-1.0-sources.jar
 
 Files: *
-Copyright: © 2004-2009 Sun Microsystems, Inc.
+Copyright: © 2004-2009, Sun Microsystems, Inc.
 License: Apache-2.0
- The full text of the Apache 2.0 license is distributed in
- /usr/share/common-licenses/Apache-2.0 on Debian systems.
 
 Files: debian/*
-Copyright: © 2010 Miguel Landaeta <miguel at miguel.cc>
+Copyright: © 2010-2011, Miguel Landaeta <miguel at miguel.cc>
 License: Apache-2.0
- The full text of the Apache 2.0 license is distributed in
- /usr/share/common-licenses/Apache-2.0 on Debian systems.
+
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ .
+     http://www.apache.org/licenses/LICENSE-2.0
+     /usr/share/common-licenses/Apache-2.0 (on Debian systems)
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.

-- 
ROME: Java library to handle Atom and RSS feeds



More information about the pkg-java-commits mailing list