[Pkg-sdl-commits] [SCM] Debian packaging of SDL_mixer project branch, master, updated. debian/1.2.11-7-9-g6c0b401

[Manuel A. Fernandez Montecelo]

The following commit has been merged in the master branch:
commit e0175fc8c84e13eff70254d515fa5217dccebd5e
Author: Manuel A. Fernandez Montecelo <manuel.montezelo at gmail.com>
Date:   Fri Jan 20 19:45:45 2012 +0000

    Fix format of the line, it was causing lintian complaints

diff --git a/debian/copyright b/debian/copyright
index b4dc757..65040b4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,7 +24,7 @@ License: zlib/libpng
 
 Files: timidity/*
 Copyright: 1995 Tuukka Toivonen <toivonen at clinet.fi>
-License: Artistic, GPL-2+, LGPL-2.1+
+License: Artistic or GPL-2+ or LGPL-2.1+
 Comment: From README
  From http://www.cgs.fi/~tt/discontinued.html :
  .

-- 
Debian packaging of SDL_mixer project