[SCM] morituri/master: Update copyright info: Use common License shortname X11.

[js at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 7126729b967d5013cff531ffde9b9328a459c3cd
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sun Nov 29 17:26:03 2015 +0100

    Update copyright info: Use common License shortname X11.

diff --git a/debian/copyright b/debian/copyright
index ede31cf..1dfa94d 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -24,11 +24,7 @@ License: GPL-2+ with Autoconf exception
 
 Files: install-sh
 Copyright: 1994, X Consortium
-License: Expat~X with X exception
- Except as contained in this notice, the name of the X Consortium shall
- not be used in advertising or otherwise to promote the sale, use or
- other dealings in this Software without prior written authorization
- from the X Consortium.
+License: X11
 
 Files: configure
 Copyright: 1992-1996, 1998-2008, Free Software Foundation, Inc.
@@ -134,7 +130,7 @@ License: BSD-2-clause
  (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
  OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
-License: Expat~X
+License: X11
  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
@@ -153,6 +149,11 @@ License: Expat~X
  OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE,
  ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR
  OTHER DEALINGS IN THE SOFTWARE.
+ .
+ Except as contained in this notice, the name of the X Consortium shall
+ not be used in advertising or otherwise to promote the sale, use or
+ other dealings in this Software without prior written authorization
+ from the X Consortium.
 
 License: Fluendo
  Licensees having purchased or holding a valid Flumotion Advanced

-- 
morituri packaging