future 1.22 packaging

packaging/debian/debian/copyright

@@ -83,42 +83,11 @@ License: LGPL-2+
  can be found in `/usr/share/common-licenses/LGPL-2' and
  `/usr/share/common-licenses/LGPL-2.1' and `/usr/share/common-licenses/LGPL-3'.
 
-Files: qtgui/q3richtext_p.h
-Copyright: 1992-2007, Trolltech ASA. All rights reserved
-License:
- This file is part of the Qt3Support module of the Qt Toolkit.
- .
- This file may be used under the terms of the GNU General Public License
- version 2.0 as published by the Free Software Foundation and appearing in the
- file LICENSE.GPL included in the packaging of this file.  Please review the
- following information to ensure GNU General Public Licensing requirements will
- be met: http://trolltech.com/products/qt/licenses/licensing/opensource/
- .
- If you are unsure which license is appropriate for your use, please review the
- following information:
- http://trolltech.com/products/qt/licenses/licensing/licensingoverview
- or contact the sales department at sales@trolltech.com.
- .
- In addition, as a special exception, Trolltech gives you certain additional
- rights. These rights are described in the Trolltech GPL Exception version 1.0,
- which can be found at http://www.trolltech.com/products/qt/gplexception/
- and in the file GPL_EXCEPTION.txt in this package.
- .
- In addition, as a special exception, Trolltech, as the sole copyright
- holder for Qt Designer, grants users of the Qt/Eclipse Integration
- plug-in the right for the Qt/Eclipse Integration to link to
- functionality provided by Qt Designer and its related libraries.
- .
- Trolltech reserves all rights not expressly granted herein.
- .
- Trolltech ASA (c) 2007
- .
- This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE
- WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
-
 Files: common/uproplist.h
 Copyright: 1991-2006, Unicode, Inc.
-License:
+License: Unicode
+
+License: Unicode
  All rights reserved. Distributed under the Terms of Use in
  http://www.unicode.org/copyright.html
  .
@@ -153,7 +122,9 @@ License:
 
 Files: utils/md5.*
 Copyright: 1991-1992, RSA Data Security, Inc. All rights reserved.
-License:
+License: RSA
+
+License:RSA
  MD5C.C - RSA Data Security, Inc., MD5 message-digest algorithm
  .
  License to copy and use this software is granted provided that it is
@@ -176,7 +147,9 @@ License:
 Files: desktop/xdg-utils-1.0.1/*
 Copyright: 2006, Kevin Krammer <kevin.krammer@gmx.at>,
                  Jeremy White <jwhite@codeweavers.com>.
-License:
+License: MIT
+
+License: MIT
  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 without limitation the rights
@@ -197,6 +170,8 @@ License:
 
 Files: index/csguess.cpp
 Copyright: 2000-2004, Mikio Hirabayashi
+License: LGPL-2.1+
+
 License: LGPL-2.1+
  This file is part of QDBM, Quick Database Manager.
  .