summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenjamin Drung <bdrung@debian.org>2011-10-11 20:10:42 +0200
committerBenjamin Drung <bdrung@debian.org>2011-10-11 20:10:42 +0200
commit218b4626cc9e7f2a1a83d7d051154492c79433ae (patch)
tree8cc7b2d70e604af79b37a07aed678daadedaf926
parent3265ccd98db3e161e36c48aead2644610999ec95 (diff)
Relicense my stuff under the ISC license.
-rw-r--r--debian/copyright67
-rw-r--r--man/dh_xul-ext.127
-rw-r--r--man/install-xpi.127
-rw-r--r--man/moz-version.127
-rw-r--r--man/xpi-repack.127
-rwxr-xr-xsrc/install-xpi28
-rwxr-xr-xsrc/moz-version28
-rw-r--r--src/moz_version.py28
-rwxr-xr-xsrc/xpi-repack28
9 files changed, 127 insertions, 160 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.
diff --git a/man/dh_xul-ext.1 b/man/dh_xul-ext.1
index bf90200..b538c63 100644
--- a/man/dh_xul-ext.1
+++ b/man/dh_xul-ext.1
@@ -1,22 +1,17 @@
-.\"Copyright (c) 2010 Benjamin Drung <bdrung@debian.org>
+.\" Copyright (c) 2010-2011 Benjamin Drung <bdrung@debian.org>
.\"
-.\"Permission is hereby granted, free of charge, to any person obtaining a copy
-.\"of this software and associated documentation files (the "Software"), to deal
-.\"in the Software without restriction, including without limitation the rights
-.\"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-.\"copies of the Software, and to permit persons to whom the Software is
-.\"furnished to do so, subject to the following conditions:
+.\" 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 above copyright notice and this permission notice shall be included in
-.\"all copies or substantial portions of the Software.
+.\" 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.
.\"
-.\"THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-.\"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-.\"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-.\"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-.\"THE SOFTWARE.
.TH DH_XUL-EXT "1" "January 2010" "dh_xul-ext" "mozilla-devscripts suite"
.SH NAME
dh_xul-ext \- calculate XUL extension dependencies
diff --git a/man/install-xpi.1 b/man/install-xpi.1
index 839c8ca..3e6211a 100644
--- a/man/install-xpi.1
+++ b/man/install-xpi.1
@@ -1,22 +1,17 @@
-.\"Copyright (c) 2010 Benjamin Drung <bdrung@debian.org>
+.\" Copyright (c) 2010-2011 Benjamin Drung <bdrung@debian.org>
.\"
-.\"Permission is hereby granted, free of charge, to any person obtaining a copy
-.\"of this software and associated documentation files (the "Software"), to deal
-.\"in the Software without restriction, including without limitation the rights
-.\"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-.\"copies of the Software, and to permit persons to whom the Software is
-.\"furnished to do so, subject to the following conditions:
+.\" 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 above copyright notice and this permission notice shall be included in
-.\"all copies or substantial portions of the Software.
+.\" 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.
.\"
-.\"THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-.\"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-.\"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-.\"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-.\"THE SOFTWARE.
.TH INSTALL-XPI "1" "January 2010" "install-xpi" "mozilla-devscripts suite"
.SH NAME
install-xpi \- installs a xpi file into a Debian package
diff --git a/man/moz-version.1 b/man/moz-version.1
index 510ae7b..218f11e 100644
--- a/man/moz-version.1
+++ b/man/moz-version.1
@@ -1,22 +1,17 @@
-.\"Copyright (c) 2009 Benjamin Drung <bdrung@debian.org>
+.\" Copyright (c) 2009-2011 Benjamin Drung <bdrung@debian.org>
.\"
-.\"Permission is hereby granted, free of charge, to any person obtaining a copy
-.\"of this software and associated documentation files (the "Software"), to deal
-.\"in the Software without restriction, including without limitation the rights
-.\"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-.\"copies of the Software, and to permit persons to whom the Software is
-.\"furnished to do so, subject to the following conditions:
+.\" 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 above copyright notice and this permission notice shall be included in
-.\"all copies or substantial portions of the Software.
+.\" 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.
.\"
-.\"THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-.\"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-.\"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-.\"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-.\"THE SOFTWARE.
.TH MOZ-VERSION "1" "August 2009" "moz-version" "mozilla-devscripts suite"
.SH NAME
moz-version \- version format handling tool
diff --git a/man/xpi-repack.1 b/man/xpi-repack.1
index 86cf8d3..50aec84 100644
--- a/man/xpi-repack.1
+++ b/man/xpi-repack.1
@@ -1,22 +1,17 @@
-.\"Copyright (c) 2010 Benjamin Drung <bdrung@debian.org>
+.\" Copyright (c) 2010-2011 Benjamin Drung <bdrung@debian.org>
.\"
-.\"Permission is hereby granted, free of charge, to any person obtaining a copy
-.\"of this software and associated documentation files (the "Software"), to deal
-.\"in the Software without restriction, including without limitation the rights
-.\"to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-.\"copies of the Software, and to permit persons to whom the Software is
-.\"furnished to do so, subject to the following conditions:
+.\" 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 above copyright notice and this permission notice shall be included in
-.\"all copies or substantial portions of the Software.
+.\" 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.
.\"
-.\"THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-.\"IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-.\"FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-.\"AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-.\"LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-.\"OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-.\"THE SOFTWARE.
.TH XPI-REPACK "1" "March 2010" "xpi-repack" "mozilla-devscripts suite"
.SH NAME
xpi-repack \- repack a xpi file into a tarball
diff --git a/src/install-xpi b/src/install-xpi
index 024c5c8..ddd7b1a 100755
--- a/src/install-xpi
+++ b/src/install-xpi
@@ -1,24 +1,18 @@
#!/usr/bin/python
-# Copyright (c) 2009 Benjamin Drung <bdrung@debian.org>
+# Copyright (c) 2009-2011, Benjamin Drung <bdrung@debian.org>
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
+# 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 above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# 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.
import csv
import optparse
diff --git a/src/moz-version b/src/moz-version
index 07c3d6b..6362b31 100755
--- a/src/moz-version
+++ b/src/moz-version
@@ -1,24 +1,18 @@
#!/usr/bin/python
-# Copyright (c) 2009 Benjamin Drung <bdrung@debian.org>
+# Copyright (c) 2009-2011, Benjamin Drung <bdrung@debian.org>
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
+# 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 above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# 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.
import getopt
import os
diff --git a/src/moz_version.py b/src/moz_version.py
index 29c8c9a..ce21f7f 100644
--- a/src/moz_version.py
+++ b/src/moz_version.py
@@ -1,22 +1,16 @@
-# Copyright (c) 2009 Benjamin Drung <bdrung@debian.org>
+# Copyright (c) 2009-2011, Benjamin Drung <bdrung@debian.org>
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
+# 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 above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# 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.
# Reference: https://developer.mozilla.org/en/Toolkit_version_format
diff --git a/src/xpi-repack b/src/xpi-repack
index 5f24add..8bf5dae 100755
--- a/src/xpi-repack
+++ b/src/xpi-repack
@@ -1,24 +1,18 @@
#!/usr/bin/python
-# Copyright (c) 2010 Benjamin Drung <bdrung@debian.org>
+# Copyright (c) 2010-2011, Benjamin Drung <bdrung@debian.org>
#
-# Permission is hereby granted, free of charge, to any person obtaining a copy
-# of this software and associated documentation files (the "Software"), to deal
-# in the Software without restriction, including without limitation the rights
-# to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-# copies of the Software, and to permit persons to whom the Software is
-# furnished to do so, subject to the following conditions:
+# 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 above copyright notice and this permission notice shall be included in
-# all copies or substantial portions of the Software.
-#
-# THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-# IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-# FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-# AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-# LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-# OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-# THE SOFTWARE.
+# 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.
import getopt
import os