[SCM] hydrogen packaging branch, master, updated. 1f8e4361335aef5d223885927c688d654b9566e2

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 5ab196cb75db19597649e7ebbb158728ce93e184
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Tue Feb 16 03:07:37 2010 +0100

    Tighten copyright file: licenses are the common ZLIB and Expat; fix FSF postal address.

diff --git a/debian/copyright b/debian/copyright
index 9ad91e8..ce98ecc 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -10,7 +10,7 @@ Files: libs/hydrogen/src/xml/tinyxml.h,
 	libs/hydrogen/src/xml/tinyxmlerror.cpp,
 	libs/hydrogen/src/xml/tinyxmlparser.cpp
 Copyright: 2000-2002, Lee Thomason (www.grinninglizard.com)
-License: zlib/libpng
+License: ZLIB
 
 Files: libs/hydrogen/include/hydrogen/data_path.h,
 	libs/hydrogen/include/hydrogen/IO/CoreMidiDriver.h,
@@ -30,7 +30,7 @@ Files: libs/hydrogen/src/xml/tinystr.cpp,
 	libs/hydrogen/src/xml/tinystr.h
 Copyright: 2000-2002, Lee Thomason <www.grinninglizard.com>
 	Yves Berquin
-License: other-TinyXml
+License: ZLIB
 
 Files: extra/serverTools/hydrogen.php
 Copyright: 2008, by Sebastian Moors <mauser at smoors.de>
@@ -38,7 +38,7 @@ License: GPL-2+
 
 Files: qt4.py
 Copyright: 2001-2007, The SCons Foundation
-License: other-MIT
+License: Expat
 
 Files: debian/cdbs/*
 Copyright: 2004-2008, 2010, Jonas Smedegaard <dr at jones.dk>
@@ -61,8 +61,8 @@ License: GPL-2+
  .
  You should have received a copy of the GNU General Public License
  along with this program; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA
- 02111-1307 USA.
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+ 02110-1301, USA.
  .
  On Debian GNU/Linux systems, the complete text of the GNU General
  Public License (GPL) version 2 can be found at
@@ -81,15 +81,15 @@ License: LGPL-2.1+
  .
  You should have received a copy of the GNU Lesser General Public
  License along with this library; if not, write to the Free Software
- Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307
- USA. */
+ Foundation, Inc., 51 Franklin Street - Fifth Floor, Boston, MA
+ 02110-1301, USA.
  .
  On Debian systems, the complete text of the GNU Lesser General
  Public License (LGPL, formerly named GNU Library General Public
  License) version 2.1 can be found in
  '/usr/share/common-licenses/LGPL-2.1'.
 
-License: other-TinyXml
+License: ZLIB
  This software is provided 'as-is', without any express or implied 
  warranty. In no event will the authors be held liable for any 
  damages arising from the use of this software.
@@ -109,7 +109,7 @@ License: other-TinyXml
  3. This notice may not be removed or altered from any source 
  distribution.
 
-License: other-MIT
+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, including

-- 
hydrogen packaging