[SCM] rtkit/master: Fix multiple issues in debian/copyright:

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Mon Apr 28 13:12:25 UTC 2014


The following commit has been merged in the master branch:
commit a8541a2c67e4df1dee9714f0a3f81c0ec6f58715
Author: Alessio Treglia <alessio at debian.org>
Date:   Mon Apr 28 14:00:58 2014 +0100

    Fix multiple issues in debian/copyright:
    
    - Fix wrong License fields and files listing.
    - Update copyright holders information.

diff --git a/debian/copyright b/debian/copyright
index 29aef68..036f951 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,29 +1,27 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=200
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: RealtimeKit
 Upstream-Contact: Lennart Poettering <lennart at poettering.net>
 Source: http://0pointer.de/public
 
 Files: *
 Copyright:
- 2009 Lennart Poettering <lennart at poettering.net>
- 2010 David Henningsson <diwic at ubuntu.com>
-License: *
+  2009-2010 Lennart Poettering <lennart at poettering.net>
+  2010 Maarten Lankhorst
+License: GPL-3+
 
-Files: rtkitctl.c
- rtkit-test.c
- rtkit-daemon.c
+Files: rtkit.* sd-daemon.*
 Copyright:
- 2009 Lennart Poettering
- 2010 Maarten Lankhorst
-License: GPL-3+
+  2009-2010 Lennart Poettering <lennart at poettering.net>
+  2010 David Henningsson <diwic at ubuntu.com>
+License: Expat
 
 Files: debian/*
 Copyright:
- 2010-2012 Alessio Treglia <alessio at debian.org>
- 2010 Luke Yelavich <themuso at ubuntu.com>
+  2010-2014 Alessio Treglia <alessio at debian.org>
+  2010 Luke Yelavich <themuso at ubuntu.com>
 License: GPL-3+
 
-License: other
+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,
@@ -54,9 +52,9 @@ License: GPL-3+
  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.
-Comment:
- 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 can
  be found in the `/usr/share/common-licenses/GPL-3' file.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program.  If not, see <http://www.gnu.org/licenses/>.

-- 
rtkit packaging



More information about the pkg-multimedia-commits mailing list