[felix-framework] 06/06: Update copyright to copyright format 1.0

[Markus Koschany]

This is an automated email from the git hooks/post-receive script.

apo-guest pushed a commit to branch master
in repository felix-framework.

commit 62b5b3b74553f1f400b1a589a3bfe41b71bbe173
Author: Markus Koschany <apo at gambaru.de>
Date:   Mon Jul 14 12:33:16 2014 +0200

    Update copyright to copyright format 1.0
---
 debian/changelog | 2 +-
 debian/copyright | 5 +++--
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 4b732d1..587b3a2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ felix-framework (4.4.0-1) unstable; urgency=medium
   * Team upload.
   * Imported Upstream version 4.4.0.
   * Drop 01-java8-compatibility.patch. Fixed upstream.
-  * Update list of debian/copyright holders.
+  * Update debian/copyright to copyright format 1.0.
   * Fix lintian warning "description-synopsis-starts-with-article".
 
  -- Markus Koschany <apo at gambaru.de>  Mon, 14 Jul 2014 11:53:08 +0200
diff --git a/debian/copyright b/debian/copyright
index 7bfc359..dc7883c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,9 +1,10 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=166
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: felix-framework
 Source: http://felix.apache.org/site/downloads.cgi
 
 Files: *
-Copyright: Copyright 2010 The Apache Software Foundation
+Copyright: 2010-2012, The Apache Software Foundation
+           2011,2012, OSGi Alliance
 License: Apache-2.0
 
 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/felix-framework.git