[SCM] ktp-contact-list packaging branch, master, updated. debian/15.12.1-2-1070-g6c56f91

Maximiliano Curia maxy at moszumanska.debian.org
Sat May 28 00:14:00 UTC 2016


Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/ktp-contact-list.git;a=commitdiff;h=9361b0e

The following commit has been merged in the master branch:
commit 9361b0e7a36df8ff2bb2197a4ebdcf47c01f81be
Author: Martin Klapetek <mklapetek at kde.org>
Date:   Fri Sep 20 13:18:48 2013 +0200

    Relicense GPL files to LGPLv2.1+
    
    With copyright owners permissions.
---
 contact-delegate-overlay.cpp  | 36 ++++++++++++++++++------------------
 contact-delegate-overlay.h    | 38 +++++++++++++++++++-------------------
 contact-overlays.cpp          | 38 +++++++++++++++++++-------------------
 contact-overlays.h            | 38 +++++++++++++++++++-------------------
 contact-view-hover-button.cpp | 40 ++++++++++++++++++++--------------------
 contact-view-hover-button.h   | 39 ++++++++++++++++++++-------------------
 filter-bar.cpp                | 38 +++++++++++++++++++-------------------
 filter-bar.h                  | 37 ++++++++++++++++++-------------------
 8 files changed, 152 insertions(+), 152 deletions(-)

diff --git a/contact-delegate-overlay.cpp b/contact-delegate-overlay.cpp
index 3d47199..4b14c5f 100644
--- a/contact-delegate-overlay.cpp
+++ b/contact-delegate-overlay.cpp
@@ -1,22 +1,22 @@
 /*
-*  Qt item view for images - delegate additions
-*
-*  Copyright (C) 2009 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
-*  Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot 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, write to the Free Software Foundation, Inc.,
-*  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
+    Qt item view for images - delegate additions
+
+    Copyright (C) 2009 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
+    Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser 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 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
 */
 
 #include "contact-delegate-overlay.h"
diff --git a/contact-delegate-overlay.h b/contact-delegate-overlay.h
index 1550cc0..0357c5d 100644
--- a/contact-delegate-overlay.h
+++ b/contact-delegate-overlay.h
@@ -1,23 +1,23 @@
 /*
- *  Qt item view for images - delegate additions
- *
- *  Copyright (C) 2009 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
- *  Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot 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, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+    Qt item view for images - delegate additions
+
+    Copyright (C) 2009 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
+    Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser 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 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #ifndef CONTACTDELEGATEOVERLAY_H
 #define CONTACTDELEGATEOVERLAY_H
diff --git a/contact-overlays.cpp b/contact-overlays.cpp
index 7bd9c1c..2e663f3 100644
--- a/contact-overlays.cpp
+++ b/contact-overlays.cpp
@@ -1,23 +1,23 @@
 /*
- *  Contact overlay buttons
- *
- *  Copyright (C) 2009 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
- *  Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot 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, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+    Contact overlay buttons
+
+    Copyright (C) 2009 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
+    Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser 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 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "contact-overlays.h"
 
diff --git a/contact-overlays.h b/contact-overlays.h
index cd9b5cb..a998644 100644
--- a/contact-overlays.h
+++ b/contact-overlays.h
@@ -1,23 +1,23 @@
 /*
- *  Contact overlay buttons
- *
- *  Copyright (C) 2009 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
- *  Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot 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, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+    Contact overlay buttons
+
+    Copyright (C) 2009 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
+    Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser 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 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #ifndef CONTACTOVERLAYS_H
 #define CONTACTOVERLAYS_H
diff --git a/contact-view-hover-button.cpp b/contact-view-hover-button.cpp
index 0f8887f..bb0e95c 100644
--- a/contact-view-hover-button.cpp
+++ b/contact-view-hover-button.cpp
@@ -1,24 +1,24 @@
 /*
- *  Qt item view mouse hover button
- *
- *  Copyright (C) 2008 Peter Penz <peter dot penz at gmx dot at>
- *  Copyright (C) 2009 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
- *  Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot 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, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+    Qt item view mouse hover button
+
+    Copyright (C) 2008 Peter Penz <peter dot penz at gmx dot at>
+    Copyright (C) 2009 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
+    Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser 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 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #include "contact-view-hover-button.h"
 
diff --git a/contact-view-hover-button.h b/contact-view-hover-button.h
index 78fd226..f38f157 100644
--- a/contact-view-hover-button.h
+++ b/contact-view-hover-button.h
@@ -1,23 +1,24 @@
 /*
- *  Qt item view mouse hover button
- *
- *  Copyright (C) 2009  Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
- *  Copyright (C) 2011  Martin Klapetek <martin dot klapetek at gmail dot 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, write to the Free Software Foundation, Inc.,
- *  51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
- */
+    Qt item view mouse hover button
+
+    Copyright (C) 2008 Peter Penz <peter dot penz at gmx dot at>
+    Copyright (C) 2009 Marcel Wiesweg <marcel dot wiesweg at gmx dot de>
+    Copyright (C) 2011 Martin Klapetek <martin dot klapetek at gmail dot com>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser 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 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #ifndef CONTACTVIEWHOVERBUTTON_H
 #define CONTACTVIEWHOVERBUTTON_H
diff --git a/filter-bar.cpp b/filter-bar.cpp
index d6e25d4..dd57421 100644
--- a/filter-bar.cpp
+++ b/filter-bar.cpp
@@ -1,22 +1,22 @@
-/***************************************************************************
- *   Copyright (C) 2006-2010 by Peter Penz <peter.penz19 at gmail.com>        *
- *   Copyright (C) 2006 by Gregor Kališnik <gregor at podnapisi.net>          *
- *                                                                         *
- *   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, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+    Copyright (C) 2006-2010 by Peter Penz <peter.penz19 at gmail.com>
+    Copyright (C) 2006 by Gregor Kališnik <gregor at podnapisi.net>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser 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 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
+
 #include "filter-bar.h"
 
 #include <QBoxLayout>
diff --git a/filter-bar.h b/filter-bar.h
index 01ebf12..76dc572 100644
--- a/filter-bar.h
+++ b/filter-bar.h
@@ -1,22 +1,21 @@
-/***************************************************************************
- *   Copyright (C) 2006-2010 by Peter Penz <peter.penz19 at gmail.com>        *
- *   Copyright (C) 2006 by Gregor Kališnik <gregor at podnapisi.net>          *
- *                                                                         *
- *   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, write to the                         *
- *   Free Software Foundation, Inc.,                                       *
- *   51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA            *
- ***************************************************************************/
+/*
+    Copyright (C) 2006-2010 by Peter Penz <peter.penz19 at gmail.com>
+    Copyright (C) 2006 by Gregor Kališnik <gregor at podnapisi.net>
+
+    This library is free software; you can redistribute it and/or
+    modify it under the terms of the GNU Lesser 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 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
+    Lesser General Public License for more details.
+
+    You should have received a copy of the GNU Lesser General Public
+    License along with this library; if not, write to the Free Software
+    Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301  USA
+*/
 
 #ifndef FILTERBAR_H
 #define FILTERBAR_H

-- 
ktp-contact-list packaging



More information about the pkg-kde-commits mailing list