rev 11024 - branches/kde4/packages/phonon/debian

Ana Beatriz Guerrero López ana at alioth.debian.org
Fri Jun 13 23:12:40 UTC 2008 

Author: ana
Date: 2008-06-13 23:12:40 +0000 (Fri, 13 Jun 2008)
New Revision: 11024

Modified:
   branches/kde4/packages/phonon/debian/changelog
   branches/kde4/packages/phonon/debian/copyright
Log:
* Update copyright file and write the BSD license instead of pointing at it.
* Replace the N/A stuff with some more meaningful (unspecified).



Modified: branches/kde4/packages/phonon/debian/changelog
===================================================================
--- branches/kde4/packages/phonon/debian/changelog	2008-06-13 22:38:00 UTC (rev 11023)
+++ branches/kde4/packages/phonon/debian/changelog	2008-06-13 23:12:40 UTC (rev 11024)
@@ -1,10 +1,15 @@
-phonon (4:4.2~svn820171-2~pre1) UNRELEASED; urgency=low
+phonon (4:4.2~svn820171-2) experimental; urgency=low
 
   +++ Changes by Modestas Vainius:
 
   * Exclude phonon metapackage from automatic shlibdeps because libphonon4
     itself ended up depending on it somehow.
 
+  +++ Changes by Ana Beatriz Guerrero Lopez:
+
+  * Update copyright file and write the BSD license instead of pointing at it.
+  * Replace the N/A stuff with some more meaningful (unspecified).
+
  -- Debian Qt/KDE Maintainers <debian-qt-kde at lists.debian.org>  Sat, 14 Jun 2008 00:54:52 +0300
 
 phonon (4:4.2~svn820171-1) experimental; urgency=low

Modified: branches/kde4/packages/phonon/debian/copyright
===================================================================
--- branches/kde4/packages/phonon/debian/copyright	2008-06-13 22:38:00 UTC (rev 11023)
+++ branches/kde4/packages/phonon/debian/copyright	2008-06-13 23:12:40 UTC (rev 11024)
@@ -9,7 +9,7 @@
 
 Copyright and licenses:
 
-When nothing (N/A) is mentioned, the code files in this package are under
+When nothing is mentioned, the code files in this package are under
 the GNU Library Public License as stated in COPYING.LIB:
 
 
@@ -30,22 +30,42 @@
 Detailed copyright and license information for each file can be found below:                          --
 
 Files: CMakeLists.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon.pc.cmake
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Directory: cmake/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Directory: cmake/
 As you can read in cmake/COPYING-CMAKE-SCRIPTS all files under this directory
-are under the BSD license.
+are under the following license:
+  
+    | 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.
 
-On Debian systems, you can find the complete texts of te BSD license at 
-/usr/share/common-licenses/BSD
 
-
 Files: cmake/FindAlsa.cmake
 Copyright: © 2006, David Faure, <faure at kde.org>
            © 2007, Matthias Kretz <kretz at kde.org>
@@ -54,7 +74,7 @@
 Copyright: © 2008, Alexander Neundorf, <neundorf at kde.org>
 
 Files: cmake/FindGLIB2.cmake
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: cmake/FindGObject.cmake
 Copyright: © 2006, Tim Beaulen <tbscope at gmail.com>
@@ -66,7 +86,7 @@
 Copyright: © 2007, Trolltech ASA
 
 Files: cmake/FindPackageHandleStandardArgs.cmake
-Copyright-And-License-N/A Copyright 
+Copyright-And-License: unspecified Copyright 
 
 Files: cmake/FindQt4.cmake
 Copyright: © 2002 Kitware, Inc., Insight Consortium.  All rights reserved.
@@ -84,13 +104,13 @@
 
 
 Directory: ds9/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: ds9/CMakeLists.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: ds9/ConfigureChecks.cmake
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: ds9/abstractvideorenderer.cpp
 Copyright: © 2007 Trolltech ASA. All Rights Reserved.
@@ -129,7 +149,7 @@
 License: LGPL-2.1 or 3
 
 Files: ds9/ds9.desktop
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: ds9/effect.cpp
 Copyright: © 2007 Trolltech ASA. All Rights Reserved.
@@ -248,13 +268,13 @@
 License: LGPL-2.1 or 3
 
 Directory: gstreamer/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: gstreamer/CMakeLists.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: gstreamer/ConfigureChecks.cmake
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: gstreamer/abstractrenderer.cpp
 Copyright: © 2007 Trolltech ASA. All Rights Reserved.
@@ -358,13 +378,13 @@
 License: LGPL-2.1 or 3
 
 Files: gstreamer/gstreamer.desktop
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: gstreamer/lgpl-2.1.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: gstreamer/lgpl-3.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: gstreamer/medianode.cpp
 Copyright: © 2007 Trolltech ASA. All Rights Reserved.
@@ -455,31 +475,31 @@
 License: LGPL-2.1 or 3
 
 Directory: includes/*
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Directory: phonon/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/.krazy
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/BUGS
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/CMakeLists.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/IDEAS
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/Mainpage.dox
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/Messages.sh
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/TODO
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/abstractaudiooutput.cpp
 Copyright: © 2005-2006 Matthias Kretz <kretz at kde.org>
@@ -552,7 +572,7 @@
 License: LGPL-2
 
 Files: phonon/backend.dox
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/backendcapabilities.cpp
 Copyright: © 2005-2006 Matthias Kretz <kretz at kde.org>
@@ -611,7 +631,7 @@
 License: LGPL-2
 
 Files: phonon/extractmethodcalls.rb
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/factory.cpp
 Copyright: © 2004-2007 Matthias Kretz <kretz at kde.org>
@@ -677,7 +697,7 @@
 License: LGPL-2
 
 Files: phonon/mediaobject.dox
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/mediaobject.h
 Copyright: © 2005 Matthias Kretz <kretz at kde.org>
@@ -728,7 +748,7 @@
 License: LGPL-2
 
 Files: phonon/org.kde.Phonon.AudioOutput.xml
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/path.cpp
 Copyright: © 2007 Matthias Kretz <kretz at kde.org>
@@ -759,7 +779,7 @@
 License: LGPL-2
 
 Files: phonon/phononnamespace.h.in
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/phononnamespace_p.h
 Copyright: © 2005-2006 Matthias Kretz <kretz at kde.org>
@@ -778,7 +798,7 @@
 License: LGPL-2
 
 Files: phonon/preprocessandextract.sh
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/qsettingsgroup_p.h
 Copyright: © 2007 Matthias Kretz <kretz at kde.org>
@@ -797,7 +817,7 @@
 License: LGPL-2
 
 Files: phonon/stream-thoughts
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/streaminterface.cpp
 Copyright: © 2007 Matthias Kretz <kretz at kde.org>
@@ -864,19 +884,19 @@
 License: LGPL-2
 
 Directory: phonon/DESIGN/*
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Directory: phonon/backend/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/backend/Mainpage.dox
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Directory: phonon/examples/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/examples/CMakeLists.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/examples/crossfade.cpp
 Copyright: © 2006 Matthias Kretz <kretz at kde.org>
@@ -898,31 +918,31 @@
 Copyright: © 2007 Matthias Kretz <kretz at kde.org>
 
 Files: phonon/examples/simpleplay.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/examples/tutorial1.cpp
 Copyright: © 2007 Matthias Kretz <kretz at kde.org>
 
 Files: phonon/examples/tutorial1.pro
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/examples/tutorial2.cpp
 Copyright: © 2007 Matthias Kretz <kretz at kde.org>
 
 Files: phonon/examples/tutorial2.pro
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/examples/tutorial3.cpp
 Copyright: © 2007 Matthias Kretz <kretz at kde.org>
 
 Files: phonon/examples/tutorial3.pro
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/examples/tutorial4.cpp
 Copyright: © 2007 Matthias Kretz <kretz at kde.org>
 
 Files: phonon/examples/tutorial4.pro
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/examples/videoplayandforget.cpp
 Copyright: © 2006 Matthias Kretz <kretz at kde.org>
@@ -935,10 +955,10 @@
 Copyright: © 2007 Matthias Kretz <kretz at kde.org>
 
 Directory: phonon/experimental/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/experimental/CMakeLists.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/experimental/audiodataoutput.cpp
 Copyright: © 2005 Matthias Kretz <kretz at kde.org>
@@ -1061,10 +1081,10 @@
 License: LGPL-2
 
 Directory: phonon/experimental/tests/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/experimental/tests/CMakeLists.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/experimental/tests/audiodataoutputtest.cpp
 Copyright: © 2006-2007 Matthias Kretz <kretz at kde.org>
@@ -1075,34 +1095,34 @@
 License: LGPL-2
 
 Directory: phonon/experimental/tests/methods/*
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/experimental/tests/methods/audiodataoutput.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/experimental/tests/methods/avcapture.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/experimental/tests/methods/avwriter.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/experimental/tests/methods/overlayapi.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/experimental/tests/methods/videodataoutput.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/experimental/tests/methods/visualization.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Directory: phonon/tests/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/CMakeLists.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/TODO
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/audiocapturedevicetest.cpp
 Copyright: © 2006-2007 Matthias Kretz <kretz at kde.org>
@@ -1132,7 +1152,7 @@
 License: LGPL-2
 
 Files: phonon/tests/backendtester.ui
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/bytestreamtest.cpp
 Copyright: © 2006-2007 Matthias Kretz <kretz at kde.org>
@@ -1187,7 +1207,7 @@
 License: LGPL-2
 
 Files: phonon/tests/testresources.qrc
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/videocapturedevicetest.cpp
 Copyright: © 2006-2007 Matthias Kretz <kretz at kde.org>
@@ -1198,13 +1218,13 @@
 License: LGPL-2
 
 Files: phonon/tests/zero.ogg
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Directory: phonon/tests/fakebackend/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/fakebackend/CMakeLists.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/fakebackend/abstractaudiooutput.cpp
 Copyright: © 2006 Matthias Kretz <kretz at kde.org>
@@ -1283,10 +1303,10 @@
 License: LGPL-2
 
 Files: phonon/tests/fakebackend/fake.desktop
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/fakebackend/fakebackend.pro
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/fakebackend/mediaobject.cpp
 Copyright: © 2006-2007 Matthias Kretz <kretz at kde.org>
@@ -1349,10 +1369,10 @@
 License: LGPL-2
 
 Directory: phonon/tests/guitest/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/guitest/CMakeLists.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/guitest/anglewidget.cpp
 Copyright: © 2007 Matthias Kretz <kretz at kde.org>
@@ -1451,55 +1471,55 @@
 License: LGPL-2
 
 Directory: phonon/tests/methods/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/abstractaudiooutput.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/abstractvideooutput.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/audiooutput.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/backendcapabilities.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/effect.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/effectparameter.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/factory.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/mediacontroller.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/mediaobject.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/objectdescription.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/phononnamespace.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/videowidget.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: phonon/tests/methods/volumefadereffect.cpp
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Directory: qt7/
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: qt7/CMakeLists.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: qt7/ConfigureChecks.cmake
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: qt7/audioconnection.cpp
 Copyright: © 2007 Trolltech ASA. All Rights Reserved.
@@ -1606,10 +1626,10 @@
 License: LGPL-2.1 or 3
 
 Files: qt7/lgpl-2.1.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: qt7/lgpl-3.txt
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: qt7/medianode.cpp
 Copyright: © 2007 Trolltech ASA. All Rights Reserved.
@@ -1656,7 +1676,7 @@
 License: LGPL-2.1 or 3
 
 Files: qt7/objc_help.mm
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: qt7/quicktimeaudioplayer.cpp
 Copyright: © 2007 Trolltech ASA. All Rights Reserved.
@@ -1683,7 +1703,7 @@
 License: LGPL-2.1 or 3
 
 Files: qt7/quicktimestreamreader_objc.mm
-Copyright-And-License-N/A
+Copyright-And-License: unspecified
 
 Files: qt7/quicktimevideoplayer.cpp
 Copyright: © 2007 Trolltech ASA. All Rights Reserved.
@@ -1728,7 +1748,6 @@
                 2 or later (at your option).
 
 On Debian systems, you can find the complete texts of these licenses at:
-  - BSD:       /usr/share/common-licenses/BSD
   - LGPL-2:    /usr/share/common-licenses/LGPL-2
   - LGPL-2.1:  /usr/share/common-licenses/LGPL-2.1

More information about the pkg-kde-commits mailing list