[SCM] ktp-text-ui packaging branch, master, updated. debian/15.12.1-1-1918-gdf4b0ec
Maximiliano Curia
maxy at moszumanska.debian.org
Sat May 28 00:19:28 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=d7b1089
The following commit has been merged in the master branch:
commit d7b108944030c8867e904b4a497eaf3c28285b7d
Author: George Kiagiadakis <george.kiagiadakis at collabora.com>
Date: Wed Jun 8 18:10:44 2011 +0300
Fix licenses to comply with the KDE licensing policy.
REVIEW: 101555
Acked-by: David Edmundson <kde at davidedmundson.co.uk>
Acked-by: Dominik Schmidt <domme at rautelinux.org>
---
.../adiumxtra-protocol-handler.cpp | 7 +++----
.../adiumxtra-protocol-handler.h | 2 +-
adiumxtra-protocol-handler/bundle-installer.cpp | 18 ++++++++++++++++++
adiumxtra-protocol-handler/bundle-installer.h | 18 ++++++++++++++++++
adiumxtra-protocol-handler/chat-style-installer.cpp | 2 +-
adiumxtra-protocol-handler/chat-style-installer.h | 2 +-
adiumxtra-protocol-handler/emoticon-set-installer.cpp | 2 +-
adiumxtra-protocol-handler/emoticon-set-installer.h | 2 +-
adiumxtra-protocol-handler/main.cpp | 2 +-
app/chat-window.cpp | 2 +-
app/chat-window.h | 2 +-
app/telepathy-chat-ui.cpp | 2 +-
app/telepathy-chat-ui.h | 2 +-
13 files changed, 49 insertions(+), 14 deletions(-)
diff --git a/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp b/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
index 29c7efa..9ce134b 100644
--- a/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
+++ b/adiumxtra-protocol-handler/adiumxtra-protocol-handler.cpp
@@ -1,10 +1,10 @@
/*
- <one line to give the program's name and a brief idea of what it does.>
- Copyright (C) <year> <name of author>
+ KDE Telepathy AdiumxtraProtocolHandler - Install Adiumxtra packages through adiumxtra://-pseudo protocol
+ Copyright (C) 2010 Dominik Schmidt <domme at rautelinux.org>
This program 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 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
@@ -16,7 +16,6 @@
along with this program. If not, see <http://www.gnu.org/licenses/>.
*/
-
#include "adiumxtra-protocol-handler.h"
#include "chat-style-installer.h"
#include "emoticon-set-installer.h"
diff --git a/adiumxtra-protocol-handler/adiumxtra-protocol-handler.h b/adiumxtra-protocol-handler/adiumxtra-protocol-handler.h
index b6faf96..9b58210 100644
--- a/adiumxtra-protocol-handler/adiumxtra-protocol-handler.h
+++ b/adiumxtra-protocol-handler/adiumxtra-protocol-handler.h
@@ -4,7 +4,7 @@
This program 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 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
diff --git a/adiumxtra-protocol-handler/bundle-installer.cpp b/adiumxtra-protocol-handler/bundle-installer.cpp
index 29541c1..b402d9e 100644
--- a/adiumxtra-protocol-handler/bundle-installer.cpp
+++ b/adiumxtra-protocol-handler/bundle-installer.cpp
@@ -1,3 +1,21 @@
+/*
+ KDE Telepathy AdiumxtraProtocolHandler - Install Adiumxtra packages through adiumxtra://-pseudo protocol
+ Copyright (C) 2010 Dominik Schmidt <domme at rautelinux.org>
+
+ This program 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
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
#include "bundle-installer.h"
#include <KDebug>
diff --git a/adiumxtra-protocol-handler/bundle-installer.h b/adiumxtra-protocol-handler/bundle-installer.h
index 17ecf5b..ab6fede 100644
--- a/adiumxtra-protocol-handler/bundle-installer.h
+++ b/adiumxtra-protocol-handler/bundle-installer.h
@@ -1,3 +1,21 @@
+/*
+ KDE Telepathy AdiumxtraProtocolHandler - Install Adiumxtra packages through adiumxtra://-pseudo protocol
+ Copyright (C) 2010 Dominik Schmidt <domme at rautelinux.org>
+
+ This program 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
+ (at your option) any later version.
+
+ This program 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 General Public License for more details.
+
+ You should have received a copy of the GNU General Public License
+ along with this program. If not, see <http://www.gnu.org/licenses/>.
+*/
+
#ifndef BUNDLEINSTALLER_H
#define BUNDLEINSTALLER_H
diff --git a/adiumxtra-protocol-handler/chat-style-installer.cpp b/adiumxtra-protocol-handler/chat-style-installer.cpp
index 4a8ef01..bf3e012 100644
--- a/adiumxtra-protocol-handler/chat-style-installer.cpp
+++ b/adiumxtra-protocol-handler/chat-style-installer.cpp
@@ -4,7 +4,7 @@
This program 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 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
diff --git a/adiumxtra-protocol-handler/chat-style-installer.h b/adiumxtra-protocol-handler/chat-style-installer.h
index 4408a8d..9c746bf 100644
--- a/adiumxtra-protocol-handler/chat-style-installer.h
+++ b/adiumxtra-protocol-handler/chat-style-installer.h
@@ -4,7 +4,7 @@
This program 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 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
diff --git a/adiumxtra-protocol-handler/emoticon-set-installer.cpp b/adiumxtra-protocol-handler/emoticon-set-installer.cpp
index 47d593e..7a75564 100644
--- a/adiumxtra-protocol-handler/emoticon-set-installer.cpp
+++ b/adiumxtra-protocol-handler/emoticon-set-installer.cpp
@@ -4,7 +4,7 @@
This program 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 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
diff --git a/adiumxtra-protocol-handler/emoticon-set-installer.h b/adiumxtra-protocol-handler/emoticon-set-installer.h
index 2add6ac..50bdd28 100644
--- a/adiumxtra-protocol-handler/emoticon-set-installer.h
+++ b/adiumxtra-protocol-handler/emoticon-set-installer.h
@@ -4,7 +4,7 @@
This program 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 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
diff --git a/adiumxtra-protocol-handler/main.cpp b/adiumxtra-protocol-handler/main.cpp
index d070863..2359418 100644
--- a/adiumxtra-protocol-handler/main.cpp
+++ b/adiumxtra-protocol-handler/main.cpp
@@ -4,7 +4,7 @@
This program 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 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 54b6d10..43c9d47 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -5,7 +5,7 @@
This program 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 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
diff --git a/app/chat-window.h b/app/chat-window.h
index 3a14401..2b2b70d 100644
--- a/app/chat-window.h
+++ b/app/chat-window.h
@@ -4,7 +4,7 @@
This program 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 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
diff --git a/app/telepathy-chat-ui.cpp b/app/telepathy-chat-ui.cpp
index 1d013a4..1654a9d 100644
--- a/app/telepathy-chat-ui.cpp
+++ b/app/telepathy-chat-ui.cpp
@@ -4,7 +4,7 @@
This program 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 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
diff --git a/app/telepathy-chat-ui.h b/app/telepathy-chat-ui.h
index 3d20015..306912d 100644
--- a/app/telepathy-chat-ui.h
+++ b/app/telepathy-chat-ui.h
@@ -4,7 +4,7 @@
This program 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 3 of the License, or
+ the Free Software Foundation, either version 2 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list