[SCM] kde-gtk-config packaging branch, master, updated. 0b5d9f716c07195709100119203c42f3603b7830

Maximiliano Curia maxy at moszumanska.debian.org
Sat Feb 14 08:29:58 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/plasma/kde-gtk-config.git;a=commitdiff;h=535042a

The following commit has been merged in the master branch:
commit 535042ac613a4e4bafd1178bc6212f83f5fb9c31
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Sun Feb 8 22:00:09 2015 +0100

    Update copyright information.
---
 debian/changelog |   1 +
 debian/copyright | 123 +++++++++++++++++++++++--------------------------------
 2 files changed, 52 insertions(+), 72 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 3627c7d..6fdad6c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ kde-gtk-config (4:5.2.0-1~) UNRELEASED; urgency=medium
   * Add myself as Uploader.
   * Update build dependencies to build against experimental and to
     follow cmake.
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Sun, 08 Feb 2015 21:38:12 +0100
 
diff --git a/debian/copyright b/debian/copyright
index fa42005..55e1395 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,47 +1,15 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Debianized-By: Boris Pek <tehnick-8 at mail.ru>
 Debianized-Date: Wed, 08 Feb 2012 00:15:14 +0200
-Upstream-Name: KDE GTK Configurator
+Upstream-Name: kde-gtk-config
 Upstream-Contact: Jose Antonio Sánchez Reynaga <joanzare at gmail.com>
  Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-Source: https://projects.kde.org/projects/extragear/base/kde-gtk-config
- The orig.tar.bz2 is just renamed upstream tarball (without changes).
- See section get-orig-source in debian/rules file for details.
+Source: git://anongit.kde.org/kde-gtk-config
 
 Files: *
-Copyright: 2011 Jose Antonio Sánchez Reynaga <joanzare at gmail.com>
- 2011 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-License: GPL-3+
-
-Files: gtk3proxies/* gtkproxies/*
-Copyright: 2011 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-License: GPL-2 or GPL-3+
- 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) version 3 or any later version
- accepted by the membership of KDE e.V. (or its successor approved
- by the membership of KDE e.V.), which shall act as a proxy
- defined in Section 14 of version 3 of the license.
- .
- 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/>.
- .
- On Debian systems, the complete text of the GNU Lesser General Public License
- can be found in `/usr/share/common-licenses/LGPL-3'.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL-3'.
-
-Files: src/*
-Copyright: 2011 Jose Antonio Sánchez Reynaga <joanzare at gmail.com>
- 2011 Aleix Pol Gonzalez <aleixpol at blue-systems.com>
-License: LGPL-2.1 or LGPL-3+
+Copyright: 2011-2013, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+           2011, José Antonio Sanchez Reynaga <joanzare at gmail.com>
+License: LGPL-2.1+3+KDEeV
  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
@@ -57,48 +25,41 @@ License: LGPL-2.1 or LGPL-3+
  .
  You should have received a copy of the GNU Lesser General Public
  License along with this library.  If not, see <http://www.gnu.org/licenses/>.
-
-Files: cmake/modules/FindGTK*.cmake
-Copyright: 2009 Kitware, Inc.
- Copyright 2008-2009 Philip Lowman <philip at yhbt.com>
-License: BSD-3-clause
-
-Files: debian/*
-Copyright: 2012-2013 Boris Pek <tehnick-8 at mail.ru>
-License: GPL-2+
-
-License: GPL-3+
- 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 (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/>.
- .
- On Debian systems, the complete text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL-3'.
+ On Debian systems, the complete text of the GNU Lesser General Public License
+ version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1', likewise,
+ the complete text of the GNU Lesser General Public License version 3 can be
+ found in `/usr/share/common-licenses/LGPL-3'.
 
-License: GPL-2+
- 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.
+Files: gtk3proxies/preview3.c
+       gtkproxies/preview.c
+       gtkproxies/reload.c
+Copyright: 2011, Aleix Pol Gonzalez <aleixpol at blue-systems.com>
+License: GPL-2+3+KDEeV
+ 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) version 3 or any later version
+ accepted by the membership of KDE e.V. (or its successor approved
+ by the membership of KDE e.V.), which shall act as a proxy
+ defined in Section 14 of version 3 of the license.
  .
- 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.
+ 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/>.
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.
  .
  On Debian systems, the complete text of the GNU General Public License
- can be found in `/usr/share/common-licenses/GPL-2'.
+ version 2 can be found in `/usr/share/common-licenses/GPL-2', likewise, the
+ complete text of the GNU General Public License version 3 can be found in
+ `/usr/share/common-licenses/GPL-3'.
 
+Files: cmake/modules/FindGTK2.cmake
+Copyright: 2009, Kitware, Inc
+           2008-2009, Philip Lowman <philip at yhbt.com>
 License: BSD-3-clause
  Redistribution and use in source and binary forms, with or without
  modification, are permitted provided that the following conditions are met:
@@ -121,3 +82,21 @@ License: BSD-3-clause
  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.
+
+Files: debian/*
+Copyright: 2012-2013, Boris Pek <tehnick-8 at mail.ru>
+License: GPL-2+
+ 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/>.
+ .
+ On Debian systems, the complete text of the GNU General Public License
+ can be found in `/usr/share/common-licenses/GPL-2'.

-- 
kde-gtk-config packaging



More information about the pkg-kde-commits mailing list