Relicense my stuff under the ISC license.

1 files changed, 39 insertions, 28 deletions

diff --git a/debian/copyright b/debian/copyright
index 546115b..e791c69 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,17 +1,46 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?view=co&revision=174
+Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
 Upstream-Name: mozilla-devscripts
 Source: git://git.debian.org/pkg-mozext/mozilla-devscripts.git
 
-Files: src/xpi.mk, src/xpi-pack, src/xpi-unpack, src/Buildsystem/xul_ext.pm
-Copyright:  (c) 2007, 2008, 2009 Fabien Tassin <fta@sofaraway.org>
-	    (c) 2007, 2008, 2009 Alexander Sack <asac@canonical.com>
-	    (c) 2007, 2008, 2009 Sasa Bodiroza <jazzva@gmail.com>
-            (c) 2008-2009 Canonical Ltd.
-            (c) Sasa Bodiroza
-            (c) 2010 Mike Hommey
-License: GPL-2.0+
+Files: *
+Copyright: 2009-2011, Benjamin Drung <bdrung@debian.org>
+License: ISC
+ Permission to use, copy, modify, and/or distribute this software for any
+ purpose with or without fee is hereby granted, provided that the above
+ copyright notice and this permission notice appear in all copies.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+ WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+ MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+ ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+ WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+ ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+ OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+
+Files: README
+Copyright: 2007-2009, Sasa Bodiroza <jazzva@gmail.com>
+           2009-2011, Benjamin Drung <bdrung@debian.org>
+           2007-2009, Alexander Sack <asac@ubuntu.com>
+           2007-2009, Fabien Tassin <fta@sofaraway.org>
+
+Files: man/xpi-pack.1 man/xpi-unpack.1
+Copyright: 2007-2009, Sasa Bodiroza <jazzva@gmail.com>
+License: GPL-2+
+
+Files: src/xpi.mk
+Copyright: 2008-2009 Canonical Ltd.
+License: GPL-2+
+
+Files: src/xpi-pack src/xpi-unpack
+Copyright: 2007-2009, Sasa Bodiroza <jazzva@gmail.com>
+           2007-2009, Alexander Sack <asac@ubuntu.com>
+License: GPL-2+
 
-License: GPL-2.0+
+Files: src/Buildsystem/xul_ext.pm src/Sequence/xul_ext.pm
+Copyright: 2010, Mike Hommey <glandium@debian.org>
+License: GPL-2+
+
+License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
  the Free Software Foundation; either version 2 of the License, or
@@ -27,21 +56,3 @@ License: GPL-2.0+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
-
-Files: src/dh_xul-ext, src/install-xpi, src/moz-version, src/moz_version.py,
-       src/xpi-repack, tests/*
-Copyright: (c) 2009 Benjamin Drung <bdrung@debian.org>
-License: ISC
-
-License: ISC
- Permission to use, copy, modify, and/or distribute this software for any
- purpose with or without fee is hereby granted, provided that the above
- copyright notice and this permission notice appear in all copies.
- .
- THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
- WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
- MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
- ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
- WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
- ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
- OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.