From bf06ff609caa4fb9954d086c6c1c3755e2343dea Mon Sep 17 00:00:00 2001 From: Oswald Buddenhagen <oswald.buddenhagen@digia.com> Date: Wed, 6 Feb 2013 16:58:49 +0100 Subject: [PATCH] rename script to omit the .py extension this is in line with the other tools, and it allows us to use a sane copyright header. Revert "Add a proper license header qdoc-bot" This reverts commit 30a8d89618f3a885d8e645cbae15ccb8b76f9538. Change-Id: I2ef4c1cde7fb2ca6ccbe2a8f84b3cb99c47a653c Reviewed-by: Oswald Buddenhagen <oswald.buddenhagen@digia.com> --- git-hooks/{qdoc-bot.py => qdoc-bot} | 44 ++++------------------------- 1 file changed, 6 insertions(+), 38 deletions(-) rename git-hooks/{qdoc-bot.py => qdoc-bot} (88%) diff --git a/git-hooks/qdoc-bot.py b/git-hooks/qdoc-bot similarity index 88% rename from git-hooks/qdoc-bot.py rename to git-hooks/qdoc-bot index 456faee..c9f6866 100755 --- a/git-hooks/qdoc-bot.py +++ b/git-hooks/qdoc-bot @@ -1,44 +1,12 @@ #!/usr/bin/python # -*- coding: utf-8 -*- -############################################################################# -## Copyright (C) 2013 Digia Plc and/or its subsidiary(-ies). -## Contact: http://www.qt-project.org/legal -## -## This file is part of the tools applications of the Qt Toolkit. -## -## $QT_BEGIN_LICENSE:BSD$ -## You may use this file under the terms of the BSD license as follows: -## -## "Redistribution and use in source and binary forms, with or without -## modification, are permitted provided that the following conditions are -## met: -## * Redistributions of source code must retain the above copyright -## notice, this list of conditions and the following disclaimer. -## * Redistributions in binary form must reproduce the above copyright -## notice, this list of conditions and the following disclaimer in -## the documentation and/or other materials provided with the -## distribution. -## * Neither the name of Digia Plc and its Subsidiary(-ies) nor the names -## of its contributors may be used to endorse or promote products derived -## from this software without specific prior written permission. -## -## -## THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS -## "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT -## LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR -## A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT -## OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, -## SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT -## LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, -## DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY -## THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -## (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE -## OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE." -## -## $QT_END_LICENSE$ -## -############################################################################# +# Copyright (C) 2012 Digia Plc and/or its subsidiary(-ies). +# Contact: http://www.qt-project.org/legal +# +# You may use this file under the terms of the 3-clause BSD license. +# See the file LICENSE from this package for details. +# # Checkouts have to have the remote: origin codereview-bot:qt/qtbase.git -- GitLab