[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:24:40 UTC 2016
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-text-ui.git;a=commitdiff;h=58ac16a
The following commit has been merged in the master branch:
commit 58ac16a3161b7cf401a1af587718e4b026fd1e72
Author: Marcin Ziemiński <zieminn at gmail.com>
Date: Fri Jun 20 16:22:44 2014 +0200
Updated licenses
---
app/chat-window.cpp | 1 +
app/chat-window.h | 1 +
app/main.cpp | 6 ++++--
lib/chat-widget.cpp | 1 +
lib/chat-widget.h | 1 +
lib/otr-channel-interface.cpp | 20 ++++++++++++++++++++
lib/otr-channel-interface.h | 20 ++++++++++++++++++++
lib/otr-constants.h | 22 ++++++++++++++++++++++
lib/otr-types.cpp | 21 +++++++++++++++++++++
lib/otr-types.h | 21 +++++++++++++++++++++
lib/otr-utils.cpp | 17 +++++++++++++++++
lib/otr-utils.h | 17 +++++++++++++++++
12 files changed, 146 insertions(+), 2 deletions(-)
diff --git a/app/chat-window.cpp b/app/chat-window.cpp
index 756ea4f..57a2c0d 100644
--- a/app/chat-window.cpp
+++ b/app/chat-window.cpp
@@ -2,6 +2,7 @@
Copyright (C) 2010 David Edmundson <kde at davidedmundson.co.uk>
Copyright (C) 2011 Dominik Schmidt <dev at dominik-schmidt.de>
Copyright (C) 2011 Francesco Nwokeka <francesco.nwokeka at gmail.com>
+ Copyright (C) 2014 Marcin Ziemiński <zieminn at gmail.com>
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
diff --git a/app/chat-window.h b/app/chat-window.h
index 39b447e..420bf3d 100644
--- a/app/chat-window.h
+++ b/app/chat-window.h
@@ -2,6 +2,7 @@
Copyright (C) 2010 David Edmundson <kde at davidedmundson.co.uk>
Copyright (C) 2011 Dominik Schmidt <dev at dominik-schmidt.de>
Copyright (C) 2011 Francesco Nwokeka <francesco.nwokeka at gmail.com>
+ Copyright (C) 2014 Marcin Ziemiński <zieminn at gmail.com>
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
diff --git a/app/main.cpp b/app/main.cpp
index 8da3bc5..b66348c 100644
--- a/app/main.cpp
+++ b/app/main.cpp
@@ -1,6 +1,7 @@
/*
- Copyright (C) 2010 David Edmundson <kde at davidedmundson.co.uk>
- Copyright (C) 2011 Dominik Schmidt <dev at dominik-schmidt.de>
+ Copyright (C) 2010 David Edmundson <kde at davidedmundson.co.uk>
+ Copyright (C) 2011 Dominik Schmidt <dev at dominik-schmidt.de>
+ Copyright (C) 2014 Marcin Ziemiński <zieminn at gmail.com>
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
@@ -45,6 +46,7 @@ int main(int argc, char *argv[])
aboutData.addAuthor(ki18n("David Edmundson"), ki18n("Developer"), "david at davidedmundson.co.uk");
aboutData.addAuthor(ki18n("Dominik Schmidt"), ki18n("Developer"), "kde at dominik-schmidt.de");
aboutData.addAuthor(ki18n("Francesco Nwokeka"), ki18n("Developer"), "francesco.nwokeka at gmail.com");
+ aboutData.addAuthor(ki18n("Marcin Ziemiński"), ki18n("Developer"), "zieminn at gmail.com");
aboutData.setProductName("telepathy/text-ui"); //set the correct name for bug reporting
aboutData.setLicense(KAboutData::License_GPL_V2);
aboutData.setProgramIconName(QLatin1String("telepathy-kde"));
diff --git a/lib/chat-widget.cpp b/lib/chat-widget.cpp
index eac802b..6b15334 100644
--- a/lib/chat-widget.cpp
+++ b/lib/chat-widget.cpp
@@ -1,5 +1,6 @@
/***************************************************************************
* Copyright (C) 2010 by David Edmundson <kde at davidedmundson.co.uk> *
+ * Copyright (C) 2014 by Marcin Ziemiński <zieminn at gmail.com> *
* *
* 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 *
diff --git a/lib/chat-widget.h b/lib/chat-widget.h
index 7500c54..809e985 100644
--- a/lib/chat-widget.h
+++ b/lib/chat-widget.h
@@ -1,6 +1,7 @@
/***************************************************************************
* Copyright (C) 2010 by David Edmundson <kde at davidedmundson.co.uk> *
* Copyright (C) 2011 by Francesco Nwokeka <francesco.nwokeka at gmail.com> *
+ * Copyright (C) 2014 by Marcin Ziemiński <zieminn at gmail.com> *
* *
* 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 *
diff --git a/lib/otr-channel-interface.cpp b/lib/otr-channel-interface.cpp
index 3555b6f..42124e5 100644
--- a/lib/otr-channel-interface.cpp
+++ b/lib/otr-channel-interface.cpp
@@ -1,3 +1,23 @@
+/***************************************************************************
+ * Copyright (C) 2008 Collabora Limited <http://www.collabora.co.uk> *
+ * Copyright (C) 2008 Nokia Corporation *
+ * *
+ * 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.1 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, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
+ ***************************************************************************/
+
#include <TelepathyQt/Channel>
#include "otr-channel-interface.h"
diff --git a/lib/otr-channel-interface.h b/lib/otr-channel-interface.h
index fff476e..05a74b0 100644
--- a/lib/otr-channel-interface.h
+++ b/lib/otr-channel-interface.h
@@ -1,3 +1,23 @@
+/***************************************************************************
+ * Copyright (C) 2008 Collabora Limited <http://www.collabora.co.uk> *
+ * Copyright (C) 2008 Nokia Corporation *
+ * *
+ * 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.1 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, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
+ ***************************************************************************/
+
#ifndef OTR_CHANNEL_INTERFACE_HEADER
#define OTR_CHANNEL_INTERFACE_HEADER
diff --git a/lib/otr-constants.h b/lib/otr-constants.h
index ebbb791..967c324 100644
--- a/lib/otr-constants.h
+++ b/lib/otr-constants.h
@@ -1,3 +1,25 @@
+/***************************************************************************
+ * Copyright (C) 2008 Collabora Limited <http://www.collabora.co.uk> *
+ * Copyright (C) 2008 Nokia Corporation *
+ * Copyright (C) 2014 Marcin Ziemiński <zieminn at gmail.com> *
+ * *
+ * 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.1 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, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
+ ***************************************************************************/
+
+
#ifndef OTR_CONSTANTS_HEADER
#define OTR_CONSTANTS_HEADER
diff --git a/lib/otr-types.cpp b/lib/otr-types.cpp
index e0147d3..3d7ac6b 100644
--- a/lib/otr-types.cpp
+++ b/lib/otr-types.cpp
@@ -1,3 +1,24 @@
+/***************************************************************************
+ * Copyright (C) 2008 Collabora Limited <http://www.collabora.co.uk> *
+ * Copyright (C) 2008 Nokia Corporation *
+ * Copyright (C) 2014 Marcin Ziemiński <zieminn at gmail.com>
+ * *
+ * 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.1 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, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
+ ***************************************************************************/
+
#include "otr-types.h"
namespace Tp
diff --git a/lib/otr-types.h b/lib/otr-types.h
index bc44a1a..a21ded5 100644
--- a/lib/otr-types.h
+++ b/lib/otr-types.h
@@ -1,3 +1,24 @@
+/***************************************************************************
+ * Copyright (C) 2008 Collabora Limited <http://www.collabora.co.uk> *
+ * Copyright (C) 2008 Nokia Corporation *
+ * Copyright (C) 2014 Marcin Ziemiński <zieminn at gmail.com>
+ * *
+ * 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.1 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, write to the *
+ * Free Software Foundation, Inc., *
+ * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA *
+ ***************************************************************************/
+
#ifndef OTR_TYPES_HEADER
#define OTR_TYPES_HEADER
diff --git a/lib/otr-utils.cpp b/lib/otr-utils.cpp
index 55f6604..aafe73e 100644
--- a/lib/otr-utils.cpp
+++ b/lib/otr-utils.cpp
@@ -1,3 +1,20 @@
+/*
+ Copyright (C) 2014 Marcin Ziemiński <zieminn at gmail.com>
+
+ 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 "otr-utils.h"
#include "otr-constants.h"
diff --git a/lib/otr-utils.h b/lib/otr-utils.h
index 040542f..861f411 100644
--- a/lib/otr-utils.h
+++ b/lib/otr-utils.h
@@ -1,3 +1,20 @@
+/*
+ Copyright (C) 2014 Marcin Ziemiński <zieminn at gmail.com>
+
+ 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 OTR_UTILS_HEADER
#define OTR_UTILS_HEADER
--
ktp-text-ui packaging
More information about the pkg-kde-commits
mailing list