You can not select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
111 lines
4.9 KiB
111 lines
4.9 KiB
From 0b30f5542a2dee7d73c546617a5ea612e17816b1 Mon Sep 17 00:00:00 2001
|
|
From: =?UTF-8?q?Fridrich=20=C5=A0trba?= <fridrich.strba@bluewin.ch>
|
|
Date: Thu, 7 Jun 2012 09:54:29 +0200
|
|
Subject: [PATCH] Oops, wrong license headers
|
|
|
|
---
|
|
src/conv/raw/pub2raw.cpp | 34 +++++++++++++++++++++-------------
|
|
src/lib/MSPUBDocument.cpp | 35 +++++++++++++++++++++--------------
|
|
2 files changed, 42 insertions(+), 27 deletions(-)
|
|
|
|
diff --git a/src/conv/raw/pub2raw.cpp b/src/conv/raw/pub2raw.cpp
|
|
index 2a3a455..22cab3d 100644
|
|
--- a/src/conv/raw/pub2raw.cpp
|
|
+++ b/src/conv/raw/pub2raw.cpp
|
|
@@ -1,23 +1,31 @@
|
|
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* libmspub
|
|
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
|
|
+ *
|
|
+ * 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 or as specified alternatively below. You may obtain a copy of
|
|
+ * the License at http://www.mozilla.org/MPL/
|
|
+ *
|
|
+ * 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.
|
|
+ *
|
|
+ * Major Contributor(s):
|
|
+ * Copyright (C) 2005-2012 Fridrich Strba <fridrich.strba@bluewin.ch>
|
|
* Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
|
|
- * Copyright (C) 2005 Fridrich Strba (fridrich.strba@bluewin.ch)
|
|
* Copyright (C) 2004 Marc Oude Kotte (marc@solcon.nl)
|
|
*
|
|
- * This library is free software; you can redistribute it and/or
|
|
- * modify it under the terms of the GNU Library General Public
|
|
- * License as published by the Free Software Foundation; either
|
|
- * version 2 of the License, or (at your option) any later version.
|
|
+ * All Rights Reserved.
|
|
*
|
|
- * This library is distributed in the hope that it will be useful,
|
|
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
- * Library General Public License for more details.
|
|
+ * For minor contributions see the git repository.
|
|
*
|
|
- * You should have received a copy of the GNU Library General Public
|
|
- * License along with this library; if not, write to the
|
|
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
- * Boston, MA 02111-1301 USA
|
|
+ * Alternatively, the contents of this file may be used under the terms of
|
|
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
|
|
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
|
|
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
|
|
+ * instead of those above.
|
|
*/
|
|
|
|
#include <stdio.h>
|
|
diff --git a/src/lib/MSPUBDocument.cpp b/src/lib/MSPUBDocument.cpp
|
|
index 17d6d58..2c59987 100644
|
|
--- a/src/lib/MSPUBDocument.cpp
|
|
+++ b/src/lib/MSPUBDocument.cpp
|
|
@@ -1,22 +1,29 @@
|
|
/* -*- Mode: C++; tab-width: 2; indent-tabs-mode: nil; c-basic-offset: 2 -*- */
|
|
/* libmspub
|
|
- * Copyright (C) 2006 Ariya Hidayat (ariya@kde.org)
|
|
- * Copyright (C) 2007 Fridrich Strba (fridrich.strba@bluewin.ch)
|
|
+ * Version: MPL 1.1 / GPLv2+ / LGPLv2+
|
|
*
|
|
- * This library is free software; you can redistribute it and/or
|
|
- * modify it under the terms of the GNU Library General Public
|
|
- * License as published by the Free Software Foundation; either
|
|
- * version 2 of the License, or (at your option) any later version.
|
|
+ * 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 or as specified alternatively below. You may obtain a copy of
|
|
+ * the License at http://www.mozilla.org/MPL/
|
|
*
|
|
- * This library is distributed in the hope that it will be useful,
|
|
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
|
|
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
|
|
- * Library General Public License for more details.
|
|
+ * 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.
|
|
*
|
|
- * You should have received a copy of the GNU Library General Public
|
|
- * License along with this library; if not, write to the
|
|
- * Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
|
|
- * Boston, MA 02111-1301 USA
|
|
+ * Major Contributor(s):
|
|
+ * Copyright (C) 2012 Fridrich Strba <fridrich.strba@bluewin.ch>
|
|
+ *
|
|
+ * All Rights Reserved.
|
|
+ *
|
|
+ * For minor contributions see the git repository.
|
|
+ *
|
|
+ * Alternatively, the contents of this file may be used under the terms of
|
|
+ * either the GNU General Public License Version 2 or later (the "GPLv2+"), or
|
|
+ * the GNU Lesser General Public License Version 2 or later (the "LGPLv2+"),
|
|
+ * in which case the provisions of the GPLv2+ or the LGPLv2+ are applicable
|
|
+ * instead of those above.
|
|
*/
|
|
|
|
#include <sstream>
|
|
--
|
|
1.7.7
|
|
|