[SCM] WebKit Debian packaging branch, debian/unstable, updated. debian/1.2.6-1-28-g62da83d

[Gustavo Noronha Silva]

The following commit has been merged in the debian/unstable branch:
commit 62da83d24169903e6c13dd0f9565cb421549c387
Merge: 13e905df6788fb8b131dbfa178a0a2f3f93a4b3b 33d638d052c104897119f70cedeb12d6c645c5e9
Author: Gustavo Noronha Silva <kov at debian.org>
Date:   Sun Feb 20 19:19:51 2011 -0300

    Merge branch 'nmu' into debian/unstable
    
    Conflicts:
    	debian/changelog

diff --combined debian/changelog
index bc2ae6c,9e7a4cd..f79d2ef
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,9 +1,17 @@@
 +webkit (1.2.7-1) unstable; urgency=high
 +
 +  * Import new upstream security release.
 +  * Set DM-Upload-Allowed and add myself as an uploader.
 +  * Drop patches for cve-2010-2901 and cve-2010-4040 (included upstream now).
 +
 + -- Michael Gilbert <michael.s.gilbert at gmail.com>  Sat, 19 Feb 2011 17:24:56 -0500
 +
+ webkit (1.2.6-2) unstable; urgency=low
+ 
+   * Acknowledge 1.2.5-2.1 NMU, thanks gregor! (Closes: #598956).
+ 
+  -- Gustavo Noronha Silva <kov at debian.org>  Wed, 12 Jan 2011 09:33:46 -0200
+ 
  webkit (1.2.6-1) unstable; urgency=high
  
    [ Michael Gilbert ]
@@@ -22,6 -20,15 +28,15 @@@
  
   -- Gustavo Noronha Silva <kov at debian.org>  Tue, 11 Jan 2011 09:44:19 -0200
  
+ webkit (1.2.5-2.1) unstable; urgency=low
+ 
+   * Non-maintainer upload.
+   * Add patch 05-fix-jit-on-kfreebsd-i386.patch by Petr Salinger and 
+     Michael Dorrington: Fixes Javascript JIT crashing on kfreebsd-i386
+     (closes: #598956).
+ 
+  -- gregor herrmann <gregoa at debian.org>  Wed, 10 Nov 2010 23:28:55 +0100
+ 
  webkit (1.2.5-2) unstable; urgency=high
  
    * Unapply 02-pool-fixup-and-sparc-support.patch and
diff --combined debian/patches/series
index 0f3e020,31076c4..48f3b50
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,9 -1,12 +1,10 @@@
  02-pool-fixup-and-sparc-support.patch
  04-spoof-user-agent-to-google.patch
+ 05-fix-jit-on-kfreebsd-i386.patch
  cve-2010-2646.patch
  cve-2010-2651.patch
  cve-2010-2900.patch
  cve-2010-3120.patch
  cve-2010-1824.patch
  cve-2010-3254.patch
 -cve-2010-4040.patch
  cve-2010-4042.patch

-- 
WebKit Debian packaging