update copyright information

diff --git a/debian/changelog b/debian/changelog
index ff9ec1ceb8cff7740f6395a2e3d1460536a0fe20..a1b0471762c72264764b7346a24ce0d1e2074b8e 100644 (file)
--- a/debian/changelog
+++ b/debian/changelog
@@ -18,8 +18,9 @@ midori (0.1.7-1) UNRELEASED; urgency=low
     file. This sets it to 50 for debian, and 39 for ubuntu (just under
     firefox). This addresses the other half of the ubuntu diff.
   * add recommends on libnotify1
+  * update copyright information
 
- -- Ryan Niebur <ryanryan52@gmail.com>  Fri, 29 May 2009 01:05:40 -0700
+ -- Ryan Niebur <ryanryan52@gmail.com>  Fri, 29 May 2009 20:01:25 -0700
 
 midori (0.1.6-1) experimental; urgency=low
 

diff --git a/debian/copyright b/debian/copyright
index 1f6d89cde92604516c042e7b6517f2c72ca36a39..bf2fb3e4502166acf5e2fa9c425ac94eb28029c6 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,14 +5,52 @@ Upstream-Maintainer: Christian Dywan <christian@twotoasts.de>
 Upstream-Source: http://goodies.xfce.org/releases/midori/
 
 Files: *
-Copyright: © 2007, Christian Dywan <christian@twotoasts.de>
+Copyright: © 2007-2009, Christian Dywan <christian@twotoasts.de>
+License: LGPL-2.1+
+
+Files: midori/midori-view.c
+Copyright: Copyright (C) 2007-2009 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009 Jean-François Guchens <zcx000@gmail.com>
+License: LGPL-2.1+
+
+Files: data/speeddial-head.html
+Copyright: Copyright (C) 2009 Jean-François Guchens <zcx000@gmail.com>
+License: LGPL-2.1+
+
+Files: data/mootools.js
+Copyright: Copyright (c) 2006-2009 Valerio Proietti
+License: MIT
+
+Files: extensions/cookie-manager.c extensions/cookie-manager/*
+Copyright: Copyright (C) 2009 Enrico Tröger <enrico(dot)troeger(at)uvena(dot)de>
+License: LGPL-2.1+
+
+Files: extensions/feed-panel/*
+Copyright: Copyright (C) 2009 Dale Whittaker <dayul@users.sf.net>
 License: LGPL-2.1+
 
 Files: debian/*
 Copyright: © 2007, Emanuele Rocca <ema@debian.org>
  © 2008, Trent W. Buck <trentbuck@gmail.com>
+ 2009, Ryan Niebur <ryanryan52@gmail.com>
 License: expat
 
+Files: midori/midori-browser.c
+Copyright:   Copyright (C) 2007-2009 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008 Dale Whittaker <dayul@users.sf.net>
+ Copyright (C) 2009 Jérôme Geulfucci <jeromeg@xfce.org>
+License: LGPL-2.1+
+
+Files: midori/midori-extension.c
+Copyright: Copyright (C) 2008-2009 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2009 Dale Whittaker <dayul@users.sf.net>
+License: LGPL-2.1+
+
+Files: midori/midori-locationaction.c
+Copyright: Copyright (C) 2008-2009 Christian Dywan <christian@twotoasts.de>
+ Copyright (C) 2008 Dale Whittaker <dayul@users.sf.net>
+License: LGPL-2.1+
+
 Files: midori/gtkiconentry.?
 Copyright: © 2004, Christian Hammond
  © 2008, Cody Russell <bratsche@gnome.org>
@@ -26,10 +64,14 @@ Files: extensions/mouse-gestures/*
 Copyright: © 2009, Matthias Kruk <mkruk@matthiaskruk.de>
 License: LGPL-2.1+
 
-Files: midori-0.1.4.orig/icons/scalable/extension.svg
+Files: icons/scalable/extension.svg
 Copyright: © 2008, Nancy Runge <nancy@twotoasts.de>
 License: LGPL-2.1+
 
+Files: midori/sokoke.c
+Copyright: Copyright (C) 2009 Dale Whittaker <dayul@users.sf.net>
+License: LGPL-2.1+
+
 Files: README, TRANSLATE, INSTALL, TODO, HACKING, ChangeLog,
  wscript, */wscript_build, docs/user/midori.css
 Copyright: © 2007, Christian Dywan <christian@twotoasts.de>
@@ -106,3 +148,22 @@ License: BSD-C3
  STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING
  IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
  POSSIBILITY OF SUCH DAMAGE.
+
+License: MIT
+ Permission is hereby granted, free of charge, to any person obtaining a copy
+ of this software and associated documentation files (the "Software"), to deal
+ in the Software without restriction, including without limitation the rights
+ to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+ copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
+ THE SOFTWARE.