[Python-apps-commits] r8248 - in packages/kupfer/trunk/debian (changelog copyright)

[dktrkranz at users.alioth.debian.org]

    Date: Thursday, March 1, 2012 @ 21:58:00
  Author: dktrkranz
Revision: 8248

Update new copyright information

Modified:
  packages/kupfer/trunk/debian/changelog
  packages/kupfer/trunk/debian/copyright

Modified: packages/kupfer/trunk/debian/changelog
===================================================================
--- packages/kupfer/trunk/debian/changelog	2012-03-01 21:44:20 UTC (rev 8247)
+++ packages/kupfer/trunk/debian/changelog	2012-03-01 21:58:00 UTC (rev 8248)
@@ -2,12 +2,14 @@
 
   * New upstream release.
     - waf script is now provided unpacked.
+  * debian/copyright:
+    - Update new copyright information.
   * debian/rules:
     - get-orig-source target is no longer needed.
   * debian/watch:
     - Adjust watch file to fetch xz tarballs.
 
- -- Luca Falavigna <dktrkranz at debian.org>  Thu, 01 Mar 2012 22:38:44 +0100
+ -- Luca Falavigna <dktrkranz at debian.org>  Thu, 01 Mar 2012 22:57:34 +0100
 
 kupfer (0+v206+dfsg-1) unstable; urgency=low
 

Modified: packages/kupfer/trunk/debian/copyright
===================================================================
--- packages/kupfer/trunk/debian/copyright	2012-03-01 21:44:20 UTC (rev 8247)
+++ packages/kupfer/trunk/debian/copyright	2012-03-01 21:58:00 UTC (rev 8248)
@@ -1,4 +1,4 @@
-Format: http://anonscm.debian.org/viewvc/dep/web/deps/dep5.mdwn?revision=174
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: kupfer
 Upstream-Contact: Ulrik Sverdrup <ulrik.sverdrup at gmail.com>
 Source: http://kaizer.se/publicfiles/kupfer/
@@ -44,15 +44,27 @@
                  Volker Braun, Jonathon Anderson 
 License: GPL-3+
 
-Files: kupfer/plugin/gmail/gmail.svg kupfer/plugin/google_picasa/picasa.svg
+Files: kupfer/plugin/gmail/* kupfer/plugin/google_picasa/*
 Copyright: Unit66
 License: CC-BY-SA-3.0
 
+Files: kupfer/plugin/qsicons/*
+Copyright: Quicksilver Developers
+License: Apache-2.0
+
+Files: kupfer/plugin/vim/vimcon.py
+Copyright: Ali Afshar
+License: MIT
+
+Files: kupfer/dbuscompat.py
+Copyright: 2009, Collabora Ltd.
+License: MIT
+
 Files: kupfer/datatools.py
 Copyright: 2009, Raymond Hettinger 
 License: MIT
 
-Files: waf
+Files: waf*
 Copyright: 2005-2010, Thomas Nagy
 License: BSD-3
 
@@ -416,6 +428,21 @@
       rights are deemed to be included in the License; this License is not
       intended to restrict the license of any rights under applicable law.
 
+License: Apache-2.0
+ Licensed under the Apache License, Version 2.0 (the "License");
+ you may not use this file except in compliance with the License.
+ You may obtain a copy of the License at
+ http://www.apache.org/licenses/LICENSE-2.0
+ .
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+ .
+ On Debian systems, the complete text of the Apache version 2.0 license can be
+ found in "/usr/share/common-licenses/Apache-2.0".
+
 License: MIT
   Permission is hereby granted, free of charge, to any person
   obtaining a copy of this software and associated documentation