From fe2a998bfe82513f5ab5a8dc9d373d57c9c68ec5 Mon Sep 17 00:00:00 2001 From: Frédéric Buclin Date: Wed, 11 Jan 2012 23:41:51 +0100 Subject: Bug 680131: Replace the MPL 1.1 license by the MPL 2.0 one in all files, and add it to files which miss one r=kiko r=mkanat r=mrbball a=LpSolit --- contrib/cmdline/bugcount | 7 +++++++ contrib/cmdline/bugids | 23 +++++------------------ contrib/cmdline/buglist | 23 +++++------------------ contrib/cmdline/bugs | 7 +++++++ contrib/cmdline/bugslink | 8 +++++++- contrib/cmdline/makequery | 23 +++++------------------ contrib/cmdline/query.conf | 23 +++++------------------ 7 files changed, 41 insertions(+), 73 deletions(-) (limited to 'contrib/cmdline') diff --git a/contrib/cmdline/bugcount b/contrib/cmdline/bugcount index b41412a12..4d3b412ae 100755 --- a/contrib/cmdline/bugcount +++ b/contrib/cmdline/bugcount @@ -1,4 +1,11 @@ #!/bin/sh +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. + thisdir=`dirname "$0"` bugids=`$thisdir/bugids "$@"` diff --git a/contrib/cmdline/bugids b/contrib/cmdline/bugids index 6bb54213a..7cac698db 100755 --- a/contrib/cmdline/bugids +++ b/contrib/cmdline/bugids @@ -1,23 +1,10 @@ #!/bin/sh -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Bugzilla Bug Tracking System. -# -# The Initial Developer of the Original Code is -# Andreas Franke . -# Corporation. Portions created by Andreas Franke are -# Copyright (C) 2001,2005 Andreas Franke. All -# Rights Reserved. -# -# Contributor(s): +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. thisdir=`dirname "$0"` buglist="$thisdir/buglist" diff --git a/contrib/cmdline/buglist b/contrib/cmdline/buglist index 4bd5f20b5..e6eaa8296 100755 --- a/contrib/cmdline/buglist +++ b/contrib/cmdline/buglist @@ -1,23 +1,10 @@ #!/bin/sh -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Bugzilla Bug Tracking System. -# -# The Initial Developer of the Original Code is -# Andreas Franke . -# Corporation. Portions created by Andreas Franke are -# Copyright (C) 2001,2005 Andreas Franke. All -# Rights Reserved. -# -# Contributor(s): +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. defaultcolumnlist="severity priority platform status resolution target_milestone status_whiteboard keywords summaryfull" diff --git a/contrib/cmdline/bugs b/contrib/cmdline/bugs index 2e8655876..a63fd19eb 100755 --- a/contrib/cmdline/bugs +++ b/contrib/cmdline/bugs @@ -1,4 +1,11 @@ #!/bin/sh +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. + thisdir=`dirname "$0"` bugids=`$thisdir/bugids "$@"` || echo "$bugids" 1>&2 && exit 1 diff --git a/contrib/cmdline/bugslink b/contrib/cmdline/bugslink index ee7d5c588..355d954e1 100755 --- a/contrib/cmdline/bugslink +++ b/contrib/cmdline/bugslink @@ -1,8 +1,14 @@ #!/bin/sh +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. +# +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. + thisdir=`dirname "$0"` bugids=`$thisdir/bugids "$@"` || echo "$bugids" 1>&2 && exit 1 bugids=`echo "$bugids" | sed -e 's/ /\,/g'` echo "https://bugzilla.mozilla.org/buglist.cgi?ctype=html&bug_id=$bugids" - diff --git a/contrib/cmdline/makequery b/contrib/cmdline/makequery index b34efb841..e2008c3f6 100755 --- a/contrib/cmdline/makequery +++ b/contrib/cmdline/makequery @@ -1,23 +1,10 @@ #!/bin/sh -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Bugzilla Bug Tracking System. -# -# The Initial Developer of the Original Code is -# Andreas Franke . -# Corporation. Portions created by Andreas Franke are -# Copyright (C) 2001,2005 Andreas Franke. All -# Rights Reserved. -# -# Contributor(s): +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. conf="`dirname $0`/query.conf" diff --git a/contrib/cmdline/query.conf b/contrib/cmdline/query.conf index 87390cd3f..41585a30c 100755 --- a/contrib/cmdline/query.conf +++ b/contrib/cmdline/query.conf @@ -1,22 +1,9 @@ -# The contents of this file are subject to the Mozilla Public -# License Version 1.1 (the "License"); you may not use this file -# except in compliance with the License. You may obtain a copy of -# the License at http://www.mozilla.org/MPL/ +# This Source Code Form is subject to the terms of the Mozilla Public +# License, v. 2.0. If a copy of the MPL was not distributed with this +# file, You can obtain one at http://mozilla.org/MPL/2.0/. # -# Software distributed under the License is distributed on an "AS -# IS" basis, WITHOUT WARRANTY OF ANY KIND, either express or -# implied. See the License for the specific language governing -# rights and limitations under the License. -# -# The Original Code is the Bugzilla Bug Tracking System. -# -# The Initial Developer of the Original Code is -# Andreas Franke . -# Corporation. Portions created by Andreas Franke are -# Copyright (C) 2001 Andreas Franke. All -# Rights Reserved. -# -# Contributor(s): +# This Source Code Form is "Incompatible With Secondary Licenses", as +# defined by the Mozilla Public License, v. 2.0. # # This is `query.conf', the config file for `buglist'. -- cgit v1.2.3-24-g4f1b