MT#6523 merge changes from debian

debian/control

@@ -2,16 +2,15 @@ Source: lua-lemock
 Section: interpreters
 Priority: optional
 Maintainer: Victor Seva <linuxmaniac@torreviejawireless.org>
-Build-Depends: debhelper (>= 8), dh-lua (>= 16~)
+Uploaders: Enrico Tassi <gareuselesinge@debian.org>
+Build-Depends: debhelper (>= 8~), dh-lua (>= 16~)
 Standards-Version: 3.9.3
 Vcs-Git: git://git.debian.org/git/pkg-lua/lua-lemock.git
 Vcs-Browser: http://git.debian.org/?p=pkg-lua/lua-lemock.git
 Homepage: http://lemock.luaforge.net/README.html
 
 Package: lua-lemock
-Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
+Architecture: all
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Provides: ${lua:Provides}
 Suggests: lua-unit
@@ -23,10 +22,8 @@ Description: LeMock (Lua Easy Mock) for unit test
 
 Package: lua-lemock-dev
 Section: libdevel
-Architecture: any
-Multi-Arch: same
-Pre-Depends: multiarch-support
-Depends: lua-lemock-dev (= ${binary:Version}), ${misc:Depends}
+Architecture: all
+Depends: lua-lemock (= ${binary:Version}), ${misc:Depends}
 Provides: ${lua:Provides}
 XB-Lua-Versions: ${lua:Versions}
 Description: LeMock (Lua Easy Mock) for unit test

debian/copyright

@@ -5,24 +5,11 @@ Source: https://github.com/LuaDist/lemock/
 
 Files: *
 Copyright: 2009 Tommy Petterson <ptp@lysator.liu.se>
-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 to use, copy, modify, merge, publish, distribute, sublicense,
- and/or sell copies of the Software, and to permit persons to whom the
- Software is furnished to do so, subject to the following conditions:
- .
- The above copyright notice and this permission notice shall be included in
- all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 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.
+Comment: In the Lua community this license is better known as "MIT".
+  Unfortunately other variants of this license are also known as "MIT".
+  To obtain a machine intepretable copyright file Debian prefers to name this
+  version of the MIT license using the non ambiguous term "Expat".
+License: Expat
 
 Files: debian/*
 Copyright: 2013 Victor Seva <linuxmaniac@torreviejawireless.org>
@@ -45,3 +32,23 @@ License: GPL-2.0+
  .
  On Debian systems, the complete text of the GNU General
  Public License version 2 can be found in "/usr/share/common-licenses/GPL-2".
+
+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 without limitation
+ the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ and/or sell copies of the Software, and to permit persons to whom the
+ Software is furnished to do so, subject to the following conditions:
+ .
+ The above copyright notice and this permission notice shall be included in
+ all copies or substantial portions of the Software.
+ .
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR 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.
+