diff --git a/debian/changelog b/debian/changelog index e9085df8..a56d3e48 100644 --- a/debian/changelog +++ b/debian/changelog @@ -4,8 +4,9 @@ midori (0.2.6-1) UNRELEASED; urgency=low - fixes segfault (Closes: #579118) - correct link to FAQ (Closes: #582512) * refresh patches + * update copyright - -- Ryan Niebur Sun, 30 May 2010 11:19:09 -0700 + -- Ryan Niebur Sun, 30 May 2010 11:26:13 -0700 midori (0.2.4-3) unstable; urgency=low diff --git a/debian/copyright b/debian/copyright index 16584aba..199adaf3 100644 --- a/debian/copyright +++ b/debian/copyright @@ -14,7 +14,7 @@ Copyright: © 2007-2009, Christian Dywan License: LGPL-2.1+ Files: midori/midori-view.c -Copyright: Copyright (C) 2007-2009 Christian Dywan +Copyright: Copyright (C) 2007-2010 Christian Dywan Copyright (C) 2009 Jean-François Guchens License: LGPL-2.1+ @@ -26,8 +26,18 @@ Files: data/mootools.js Copyright: Copyright (c) 2006-2009 Valerio Proietti License: MIT -Files: extensions/adblock.c +Files: extensions/addons.c +Copyright: Copyright (C) 2008 Christian Dywan + Copyright (C) 2008-2010 Arno Renevier +License: LGPL-2.1+ + +Files: colorful-tabs Copyright: Copyright (C) 2009 Christian Dywan + Copyright (C) 2010 Samuel Creshal +License: LGPL-2.1+ + +Files: extensions/adblock.c +Copyright: Copyright (C) 2009-2010 Christian Dywan Copyright (C) 2009 Alexander Butenko License: LGPL-2.1+ @@ -36,7 +46,7 @@ Copyright: Copyright (C) 2009 Enrico Tröger +Copyright: Copyright (C) 2009-2010 Dale Whittaker License: LGPL-2.1+ Files: debian/* @@ -82,7 +92,7 @@ Copyright: Copyright (C) 2008-2009 Christian Dywan License: LGPL-2.1+ Files: midori/midori-browser.c -Copyright: Copyright (C) 2007-2009 Christian Dywan +Copyright: Copyright (C) 2007-2010 Christian Dywan Copyright (C) 2008 Dale Whittaker Copyright (C) 2009 Jérôme Geulfucci License: LGPL-2.1+ @@ -112,8 +122,8 @@ Copyright: Copyright (C) 2008-2009 Christian Dywan License: LGPL-2.1+ Files: midori/midori-locationaction.c -Copyright: Copyright (C) 2008-2009 Christian Dywan - Copyright (C) 2008 Dale Whittaker +Copyright: Copyright (C) 2008-2010 Christian Dywan + Copyright (C) 2008-2010 Dale Whittaker License: LGPL-2.1+ Files: midori/gtkiconentry.? @@ -125,13 +135,30 @@ License: LGPL-2+ Files: extensions/mouse-gestures.c Copyright: Copyright (C) 2009 Matthias Kruk - Copyright (C) 2009 Christian Dywan + Copyright (C) 2009-2010 Christian Dywan +License: LGPL-2.1+ + +Files: extensions/status-clock.c +Copyright: Copyright (C) 2010 Arno Renevier License: LGPL-2.1+ Files: extensions/tab-switcher.c Copyright: Copyright (C) 2009 André Stösel License: LGPL-2.1+ +Files: midori/midori.vapi +Copyright: Copyright (C) 2010 Christian Dywan +License: expat + +Files: tools/check-style +Copyright: Copyright (C) 2010 Christian Dywan + Copyright (C) 2010 Arno Renevier +License: LGPL-2.1+ + +Files: tools/midori-dev +Copyright: Copyright (C) 2010 David Mohr +License: LGPL-2.1+ + Files: extensions/web-cache.c Copyright: Copyright (C) 2009 Christian Dywan Copyright (C) 2009 Alexander Butenko