[SCM] okteta packaging branch, master, updated. debian/4.14.2-1-28-gdc9d937
Maximiliano Curia
maxy at moszumanska.debian.org
Thu Mar 26 19:45:35 UTC 2015
Gitweb-URL: http://git.debian.org/?p=pkg-kde/applications/okteta.git;a=commitdiff;h=22a5624
The following commit has been merged in the master branch:
commit 22a562467bcb0b1723badc7cb1696b09e640c719
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date: Fri Feb 20 11:43:40 2015 +0100
Update copyright information.
---
debian/changelog | 1 +
debian/copyright | 126 +++++++++++++++++++++++++++----------------------------
2 files changed, 62 insertions(+), 65 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index e8f0e1b..c12df33 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,7 @@ okteta (4:14.12.2-1~) UNRELEASED; urgency=medium
* New upstream release (14.12.2).
* Update build dependencies to build against experimental and to
follow cmake.
+ * Update copyright information.
-- Maximiliano Curia <maxy at debian.org> Fri, 20 Feb 2015 09:41:05 +0100
diff --git a/debian/copyright b/debian/copyright
index 0d42651..0fe59cb 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,12 +2,13 @@ Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: okteta
Upstream-Contact: Friedrich W. H. Kossebau <kossebau at kde.org>
Jeremy Paul Whiting <jpwhiting at kde.org>
-Source: http://www.kde.org/download/
+Source: git://anongit.kde.org/okteta
Files: *
Copyright: 2012, Alessandro Di Federico <ale at clearmind.me>
+ 2012, Alex Richardson <alex.richardosn at gmx.de>
2009-2013, Alex Richardson <alex.richardson at gmx.de>
- 2003-2012, Friedrich W. H. Kossebau <kossebau at kde.org>
+ 2003-2014, Friedrich W. H. Kossebau <kossebau at kde.org>
License: LGPL-2.1-KDEeV
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -29,43 +30,8 @@ License: LGPL-2.1-KDEeV
versions 2.1 and 3 can be found in `/usr/share/common-licenses/LGPL-2.1' and
`/usr/share/common-licenses/LGPL-3'.
-Files: mobile/program/about.cpp
- mobile/program/about.h
- mobile/program/main.cpp
- mobile/program/mainwindow.cpp
- mobile/program/mainwindow.h
- mobile/program/program.cpp
- mobile/program/program.h
- program/about.cpp
- program/about.h
- program/main.cpp
- program/mainwindow.cpp
- program/mainwindow.h
- program/program.cpp
- program/program.h
-Copyright: 2006-2012, Friedrich W. H. Kossebau <kossebau at kde.org>
-License: GPL-2 or GPL-3 or GPL-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.
- .
- 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 full text of the GNU General Public License
- versions 2 and 3 can be found in `/usr/share/common-licenses/GPL-2' and
- `/usr/share/common-licenses/GPL-3'.
-
-Files: kasten/controllers/test/allprimitivetypestest.cpp
+Files: COPYING.LIB
+ kasten/controllers/test/allprimitivetypestest.cpp
kasten/controllers/test/arraydatainformationtest.cpp
kasten/controllers/test/basicdatainformationtest.cpp
kasten/controllers/test/customtostringtest.cpp
@@ -80,6 +46,7 @@ Files: kasten/controllers/test/allprimitivetypestest.cpp
kasten/controllers/test/uniondatainformationtest.cpp
kasten/controllers/view/structures/datatypes/strings/utf32stringdata.h
Copyright: 2011-2013, Alex Richardson <alex.richardson at gmx.de>
+ 1991-1999, Free Software Foundation, Inc
License: LGPL-2.1+
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Lesser General Public
@@ -95,40 +62,52 @@ License: LGPL-2.1+
License along with this library; if not, write to the Free Software
Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
.
- 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".
+ On Debian systems, the full text of the GNU Lesser General Public License
+ versions 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-Files: designer/examples/main.cpp
- kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumalgorithm.cpp
- kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumalgorithm.h
- kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparameterset.cpp
- kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparameterset.h
- kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparametersetedit.cpp
- kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparametersetedit.h
- kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilter.cpp
- kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilter.h
- kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparameterset.cpp
- kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparameterset.h
- kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparametersetedit.cpp
- kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparametersetedit.h
-Copyright: 2009-2011, Friedrich W. H. Kossebau <kossebau at kde.org>
-License: public-domain
- These files have no copyright restrictions.
+Files: program/about.cpp
+ program/about.h
+ program/main.cpp
+ program/mainwindow.cpp
+ program/mainwindow.h
+ program/program.cpp
+ program/program.h
+Copyright: 2006-2014, Friedrich W. H. Kossebau <kossebau at kde.org>
+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.
+ .
+ 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 full text of the GNU General Public License
+ versions 2 and 3 can be found in `/usr/share/common-licenses/GPL-2' and
+ `/usr/share/common-licenses/GPL-3'.
Files: libs/kasten/core/tests/util/filesystem.cpp
libs/kasten/core/tests/util/filesystem.h
-Copyright: 2007, Friedrich W. H. Kossebau <kossebau at kde.org>
+Copyright: 2007, Friedrich W. H. Kossebau
License: LGPL-2
This library is free software; you can redistribute it and/or
modify it under the terms of the GNU Library General Public
License version 2 as published by the Free Software Foundation.
.
- On Debian systems, the complete text of the GNU Library General Public
- License version 2 can be found in "/usr/share/common-licenses/LGPL-2".
+ On Debian systems, the full text of the GNU Library General Public License
+ versions 2 can be found in `/usr/share/common-licenses/LGPL-2'.
Files: kasten/controllers/view/structures/modeltest.cpp
kasten/controllers/view/structures/modeltest.h
-Copyright: 2007, Trolltech ASA. All rights reserved
+Copyright: 2007, Trolltech ASA
License: GPL-2
This file may be used under the terms of the GNU General Public
License version 2.0 as published by the Free Software Foundation
@@ -145,12 +124,29 @@ License: GPL-2
This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
.
- On Debian systems, the complete text of the GNU General Public
- License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+ On Debian systems, the full text of the GNU General Public License versions 2
+ can be found in `/usr/share/common-licenses/GPL-2'.
+
+Files: designer/examples/main.cpp
+ kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumalgorithm.cpp
+ kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumalgorithm.h
+ kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparameterset.cpp
+ kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparameterset.h
+ kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparametersetedit.cpp
+ kasten/controllers/view/libbytearraychecksum/algorithm/template/template_bytearraychecksumparametersetedit.h
+ kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilter.cpp
+ kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilter.h
+ kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparameterset.cpp
+ kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparameterset.h
+ kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparametersetedit.cpp
+ kasten/controllers/view/libbytearrayfilter/filter/template/template_bytearrayfilterparametersetedit.h
+Copyright: 2009-2011, Friedrich W. H. Kossebau <kossebau at kde.org>
+License: public-domain
+ These files have no copyright restrictions.
Files: doc/*
-Copyright: 2008-2010, Alex Richardson <alex.richardson at gmx.de>
- 2008-2010, Friedrich W. H. Kossebau <kossebau at kde.org>
+Copyright: 2008-2011, Alex Richardson <alex.richardson at gmx.de>
+ 2008-2011, Friedrich W. H. Kossebau <kossebau at kde.org>
License: GFDL-1.2+
Files: debian/*
--
okteta packaging
More information about the pkg-kde-commits
mailing list