[Pkg-mozext-commits] [SCM] Packaging for flashblock branch, master, updated. debian/1.5.14.2-1-8-ge0cd673

[Alexander GQ Gerasiov]

The following commit has been merged in the master branch:
commit 7fb2f77fada0c5e0c814e3720641535a7fe14727
Author: Alexander GQ Gerasiov <gq at debian.org>
Date:   Mon Aug 27 02:01:38 2012 +0400

    debian/copyright: Update to latest version of standard.
    
    Signed-off-by: Alexander GQ Gerasiov <gq at debian.org>

diff --git a/debian/copyright b/debian/copyright
index 4c5dcd6..374d370 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,23 +1,28 @@
-Format-Specification:
-    http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=59
-Name: flashblock
-Maintainer: Ted Mielczarek <luser_mozdev at perilith.com>
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Upstream-Name: flashblock
+Upstream-Contact: Ted Mielczarek <luser_mozdev at perilith.com>
 Source: http://flashblock.mozdev.org
 
 Files: *
-Copyright: 2004-2009 Ted Mielczarek <luser_mozdev at perilith.com>
+Copyright: 2004-2012 Ted Mielczarek <luser_mozdev at perilith.com>
                      Ted Drake
                      Przemyslaw Bialik
                      Lorenzo Colitti
                      Philip Chee <philip.chee at gmail.com>
-License:  MPL-1.1 or GPL-2 or LGPL-2.1
+                     Jesse Ruderman (initial idea)
+                     Neil Rashbrook (whitelist wizardry)
+                     Mark Bokil http://markbokil.org/ (toolbar button code and icons)
+                     Gary Liquid (Flash 8 bug fixes)
+                     Julien Saurin (New extension icon)
+                     Sven Schneider (Silverlight block and play buttons)
+License:  MPL or GPL-2 or LGPL-2.1
 
 Files: debian/*
 Copyright: 2008-2009 Philippe Coval <rzr at gna.org>
-           2009 Alexander GQ Gerasiov <gq at debian.org>
-License:  MPL-1.1 or GPL-2 or LGPL-2.1
+           2009-2012 Alexander GQ Gerasiov <gq at debian.org>
+License:  MPL or GPL-2 or LGPL-2.1
 
-License: MPL-1.1
+License: MPL
     You may obtain a copy of the License at http://www.mozilla.org/MPL/
     The copy of this License is also available in 'MPL' file shipped with this
     package.

-- 
Packaging for flashblock