[SCM] mixxx/master: Update debian/copyright.

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Wed Jun 20 07:41:44 UTC 2012


The following commit has been merged in the master branch:
commit d66dfe5694281fa4f2208cffe9e5aa3f481cead9
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Jun 20 09:38:12 2012 +0200

    Update debian/copyright.

diff --git a/debian/copyright b/debian/copyright
index 2ca5a12..7d979f0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=202
+Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
 Upstream-Name: Mixxx
 Upstream-Contact:
  Tue Haste Andersen <haste at diku.dk>
@@ -49,7 +49,7 @@ License: LGPL-2.1
 
 Files: lib/gtest-1.3.0/*
 Copyright: 2005-2009, Google Inc.
-License: BSD
+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:
@@ -78,7 +78,7 @@ License: BSD
 
 Files: lib/kissfft/*
 Copyright: 2003-2004 Mark Borgerding
-License: BSD
+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:
  .
@@ -146,7 +146,8 @@ License: GPL-2
  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: On Debian systems the full text of the GNU General Public
+Comment:
+ On Debian systems the full text of the GNU General Public
  License can be found in the `/usr/share/common-licenses/GPL-2' file.
  .
  You should have received a copy of the GNU General Public License
@@ -162,7 +163,8 @@ License: GPL-2+
  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: On Debian systems the full text of the GNU General Public
+Comment:
+ On Debian systems the full text of the GNU General Public
  License can be found in the `/usr/share/common-licenses/GPL-2' file.
  .
  You should have received a copy of the GNU General Public License
@@ -194,7 +196,8 @@ License: LGPL-2.1+
  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.
-Comment: On Debian systems the full text of the GNU Lesser General Public
+Comment:
+ On Debian systems the full text of the GNU Lesser General Public
  License can be found in the `/usr/share/common-licenses/LGPL-2.1' file.
  .
  You should have received a copy of the GNU Lesser General Public License

-- 
mixxx packaging



More information about the pkg-multimedia-commits mailing list