[SCM] WebKit Debian packaging branch, debian/experimental, updated. upstream/1.1.13-178-gf7e24bb
Gustavo Noronha Silva
kov at debian.org
Tue Aug 25 02:54:30 UTC 2009
The following commit has been merged in the debian/experimental branch:
commit 4348a7f2c924f2adc85aac8a483476c147ffdd10
Author: Gustavo Noronha Silva <kov at debian.org>
Date: Mon Aug 24 21:51:26 2009 -0300
updated copyright file
diff --git a/debian/changelog b/debian/changelog
index 1a44eff..05f1e12 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -7,6 +7,8 @@ webkit (1.1.13-1) experimental; urgency=low
- update Build-Depends on libsoup to match upstream requirements
(Closes: #542272)
- Bump Build-Depends on libsoup2.4-dev to 2.27.91
+ * debian/copyright:
+ - updated with changes since 1.1.12
-- Gustavo Noronha Silva <kov at debian.org> Mon, 24 Aug 2009 21:25:59 -0300
diff --git a/debian/copyright b/debian/copyright
index c3b618c..72ff5a8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -609,8 +609,7 @@ Copyright: © 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009 Apple Inc.
© 2008 David Levin <levin at chromium.org>
© 2009 David Smith (catfish.man at gmail.com)
© 2008, 2009 Gustavo Noronha Silva <gns at gnome.org>
- © 2008, 2009 Jan Alonzo <jmalonzo at gmail.com>
- © 2008, 2009 Jan Michael C. Alonzo
+ © 2008, 2009 Jan Michael Alonzo <jmalonzo at gmail.com>
© 2008 Jürg Billeter <j at bitron.ch>
© 2008 Dominik Röttsches <dominik.roettsches at access-company.com>
© 2009 Igalia S.L.
@@ -735,6 +734,8 @@ Files: JavaScriptCore/wtf/CrossThreadRefCounted.*,
WebCore/platform/text/TextEncodingDetector.*,
WebCore/platform/text/TextEncodingDetectorICU.*,
WebCore/platform/text/TextEncodingDetectorNone.*,
+ WebCore/storage/SQLTransaction*,
+ WebCore/websockets/*,
WebCore/workers/AbstractWorker.*,
WebCore/workers/DedicatedWorkerContext.*,
WebCore/workers/SharedWorker.*,
@@ -848,3 +849,34 @@ License: other
Except as contained in this notice, the name of the authors shall not
be used in advertising or otherwise to promote the sale, use or other deal-
ings in this Software without prior written authorization from him.
+
+Files: WebCore/bindings/js/JSEventSourceConstructor.*,
+ WebCore/bindings/js/JSEventSourceCustom.*,
+ WebCore/page/EventSource.*
+Copyright: © 2009 Ericsson AB
+License: BSD-3
+ Redistribution and use in source and binary forms, with or without
+ modification, are permitted provided that the following conditions
+ are met:
+
+ 1. Redistributions of source code must retain the above copyright
+ notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the above copyright
+ notice, this list of conditions and the following disclaimer
+ in the documentation and/or other materials provided with the
+ distribution.
+ 3. Neither the name of Ericsson nor the names of its contributors
+ may be used to endorse or promote products derived from this
+ software without specific prior written permission.
+
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+ "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+ LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+ A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+ OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+ LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN CONTRACT, 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.
--
WebKit Debian packaging
More information about the Pkg-webkit-commits
mailing list