[SCM] sddm packaging branch, master, updated. 948483c715091214b9d0cc10337f5d2fb42b2074

Maximiliano Curia maxy at moszumanska.debian.org
Fri Mar 27 13:27:45 UTC 2015


Gitweb-URL: http://git.debian.org/?p=pkg-kde/kde-std/sddm.git;a=commitdiff;h=948483c

The following commit has been merged in the master branch:
commit 948483c715091214b9d0cc10337f5d2fb42b2074
Author: Maximiliano Curia <maxy at gnuservers.com.ar>
Date:   Fri Mar 27 14:24:18 2015 +0100

    Update copyright information.
---
 debian/changelog |   1 +
 debian/copyright | 208 ++++++++++++++++++++++++++++---------------------------
 2 files changed, 106 insertions(+), 103 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index a02fd38..0e60008 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ sddm (0.11.0-1~1) UNRELEASED; urgency=medium
   [ Maximiliano Curia ]
   * New upstream release (0.10.0).
   * New upstream release (0.11.0).
+  * Update copyright information.
 
  -- Maximiliano Curia <maxy at debian.org>  Fri, 27 Mar 2015 13:37:37 +0100
 
diff --git a/debian/copyright b/debian/copyright
index f3d8c1c..dc53736 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,66 +3,58 @@ Upstream-Name: sddm
 Source: https://github.com/sddm/sddm.git
 
 Files: *
-Copyright: 2013 Abdurrahman AVCI <abdurrahmanavci at gmail.com>
-           2013-2014 Martin Bříza <mbriza at redhat.com>
-           2013 Nikita Mikhaylov <nslqqq at gmail.com>
-           2014 Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
-           2007 Matthias Kretz <kretz at kde.org>
-           2014 David Edmundson <davidedmundson at kde.org>
-           2008 Helio Chissini de Castro <helio at kde.org>
-           2001-2005 Oswald Buddenhagen <ossi at kde.org>
-           2010 Roman Shtylman <shtylman at gmail.com>
-           2012 Nuno Pineheiro <nuno at oxygen-icons.org>
-           2013 Reza Fatahilah Shah
-           Dacian Stanciu.
+Copyright: 2013, Abdurrahman AVCI <abdurrahmanavci at gmail.com>
+           2014, David Edmundson <davidedmundson at kde.org>
+           1989-1991, Free Software Foundation, Inc
+           2013-2014, Martin Bříza <mbriza at redhat.com>
+           2013, Nikita Mikhaylov <nslqqq at gmail.com>
+           2014, Pier Luigi Fiorini <pierluigi.fiorini at gmail.com>
+           2000-2001, Branden Robinson
+           2001-2005, Oswald Buddenhagen <ossi at kde.org>
+           2010, Rosetta Contributors and Canonical Ltd 2010
+           2011, Rosetta Contributors and Canonical Ltd 2011
+           2012, Rosetta Contributors and Canonical Ltd 2012
+           2013, Rosetta Contributors and Canonical Ltd 2013
+           2014, Rosetta Contributors and Canonical Ltd 2014
 License: GPL-2+
 
-Files: cmake/*
+Files: components/2.0/Background.qml
+       components/2.0/Button.qml
+       components/2.0/Clock.qml
+       components/2.0/ComboBox.qml
+       components/2.0/ImageButton.qml
+       components/2.0/LayoutBox.qml
+       components/2.0/Menu.qml
+       components/2.0/PasswordBox.qml
+       components/2.0/PictureBox.qml
+       components/2.0/TextBox.qml
+       components/common/TextConstants.qml
+       data/themes/circles/Main.qml
+       data/themes/elarun/Main.qml
+       data/themes/maldives/Main.qml
+       data/themes/maui/Main.qml
+Copyright: 2013, Abdurrahman AVCI <abdurrahmanavci at gmail.com>
+           2013, Nikita Mikhailov <nslqqq at gmail.com>
+           2013, Reza Fatahilah Shah <rshah0385 at kireihana.com>
+License: Expat
+
+Files: src/auth/Auth.cpp
+       src/auth/Auth.h
+       src/auth/AuthPrompt.cpp
+       src/auth/AuthPrompt.h
+       src/auth/AuthRequest.cpp
+       src/auth/AuthRequest.h
+       src/common/ConfigReader.cpp
+       src/common/ConfigReader.h
+Copyright: 2013-2014, Martin Bříza <mbriza at redhat.com>
+License: LGPL-2.1+
+
+Files: cmake/FindXCB.cmake
+       cmake/FindXKB.cmake
 Copyright: 2013, Abdurrahman AVCI <abdurrahmanavci at gmail.com>
            2008, Helio Chissini de Castro <helio at kde.org>
            2007, Matthias Kretz <kretz at kde.org>
 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:
- .
- 1. Redistributions of source code must retain the copyright
-    notice, this list of conditions and the following disclaimer.
- 2. Redistributions in binary form must reproduce the copyright
-    notice, this list of conditions and the following disclaimer in the
-    documentation and/or other materials provided with the distribution.
- 3. The name of the author may not be used to endorse or promote products
-    derived from this software without specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
- IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
- OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
- IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
- INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
- NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
- DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
- THEORY OF LIABILITY, WHETHER IN 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: src/qauth/*
-Copyright: 2013 Martin Bříza <mbriza at redhat.com>
-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
- 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, see <http://www.gnu.org/licenses/>.
- .
- On Debian systems, the complete text of the GNU General
- Public License version 2 can be found in "/usr/share/common-licenses/LGPL-2.1".
 
 Files: data/themes/circles/*
 Copyright: 2013, Abdurrahman AVCI <abdurrahmanavci at gmail.com>
@@ -128,55 +120,6 @@ License: LGPL-3
  On Debian systems, the complete text of the GNU Lesser General
  Public License version 3 can be found in "/usr/share/common-licenses/LGPL-3".
 
-Files: *.qml
-Copyright: 2013 Nikita Mikhailov <nslqqq at gmail.com>
-           2013 Abdurrahman AVCI <abdurrahmanavci at gmail.com>
-           2013 Reza Fatahilah Shah <rshah0385 at kireihana.com>
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the "Software"),
- to deal in the Software without restriction, including without limitation the
- rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
- sell copies of the Software, and to permit persons to whom the Software is
- furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included
- in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
- OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
- WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
- IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
-Files: src/auth/Auth.cpp
-       src/auth/Auth.h
-       src/auth/AuthPrompt.cpp
-       src/auth/AuthPrompt.h
-       src/auth/AuthRequest.cpp
-       src/auth/AuthRequest.h
-       src/common/ConfigReader.cpp
-       src/common/ConfigReader.h
-Copyright: 2013-2014 Martin Bříza <mbriza at redhat.com>
-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
- 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
- .
- 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".
-
 Files: debian/*
 Copyright: © 2014 Rohan Garg <rohangarg at kubuntu.org>
            © 2014 Scarlett Clark <scarlett at scarlettgatelyclark.com>
@@ -224,6 +167,48 @@ Commment: The xorg-x11 package is no longer in the archive, the license of the
  FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
  DEALINGS IN THE SOFTWARE.
 
+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:
+ .
+ 1. Redistributions of source code must retain the copyright
+    notice, this list of conditions and the following disclaimer.
+ 2. Redistributions in binary form must reproduce the copyright
+    notice, this list of conditions and the following disclaimer in the
+    documentation and/or other materials provided with the distribution.
+ 3. The name of the author may not be used to endorse or promote products
+    derived from this software without specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS OR
+ IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
+ OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED.
+ IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT,
+ INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+ DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+ THEORY OF LIABILITY, WHETHER IN 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.
+
+License: Expat
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of this software and associated documentation files (the "Software"),
+ to deal in the Software without restriction, including without limitation the
+ rights to use, copy, modify, merge, publish, distribute, sublicense, and/or
+ sell copies of the Software, and to permit persons to whom the Software is
+ furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included
+ in all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS
+ OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY,
+ WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR
+ IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+
 License: GPL-2+
  This package is free software; you can redistribute it and/or modify
  it under the terms of the GNU General Public License as published by
@@ -240,3 +225,20 @@ License: GPL-2+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+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
+ 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, see <http://www.gnu.org/licenses/>.
+ .
+ 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".

-- 
sddm packaging



More information about the pkg-kde-commits mailing list