Updated copyright

distros/debian/copyright

@@ -18,37 +18,9 @@ License: AGPL-3+
   You should have received a copy of the GNU Affero General Public License
   along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-Files: src/openalpr/TRexpp.h
-       src/openalpr/support/tinythread.*
-Copyright: 2003-2004 Alberto Demichelis
-License: Zlib
-  Copyright (C) 2003-2004 Alberto Demichelis
-  .
-  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.
-  .
-  Permission is granted to anyone to use this software for
-  any purpose, including commercial applications, and to alter
-  it and redistribute it freely, subject to the following restrictions:
-  .
-    1. The origin of this software must not be misrepresented;
-    you must not claim that you wrote the original software.
-    If you use this software in a product, an acknowledgment
-    in the product documentation would be appreciated but
-    is not required.
-  .
-    2. Altered source versions must be plainly marked as such,
-    and must not be misrepresented as being the original software.
-  .
-    3. This notice may not be removed or altered from any
-    source distribution.
-
 Files: src/openalpr/support/re2.h src/openalpr/support/re2/*
 Copyright: 2008 The RE2 Authors. 
 License: BSD-3-clause
-  Copyright (c) 2009 The RE2 Authors. All rights reserved.
-  .
   Redistribution and use in source and binary forms, with or without
   modification, are permitted provided that the following conditions are
   met:
@@ -75,27 +47,6 @@ License: BSD-3-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.
 
-Files: src/openalpr/simpleini/*
-       src/tclap/*
-Copyright: 2006-2013 Brodie Thiesfield
-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.
-
 Files: src/openalpr/support/tinydir.h
 Copyright: 2013, Cong Xu
 License: BSD-2-clause
@@ -118,3 +69,58 @@ License: BSD-2-clause
   ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
   (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
+  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.
+
+Files: src/tclap/*
+Copyright: 2003 Michael E. Smoot 
+License: Expat
+
+Files: src/openalpr/simpleini/*
+Copyright: 2006-2013 Brodie Thiesfield
+License: Expat
+
+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.
+  .
+  Permission is granted to anyone to use this software for
+  any purpose, including commercial applications, and to alter
+  it and redistribute it freely, subject to the following restrictions:
+  .
+    1. The origin of this software must not be misrepresented;
+    you must not claim that you wrote the original software.
+    If you use this software in a product, an acknowledgment
+    in the product documentation would be appreciated but
+    is not required.
+  .
+    2. Altered source versions must be plainly marked as such,
+    and must not be misrepresented as being the original software.
+  .
+    3. This notice may not be removed or altered from any
+    source distribution.
+
+Files: src/openalpr/TRexpp.h
+Copyright: 2003-2004 Alberto Demichelis
+License: Zlib
+
+Files: src/openalpr/support/tinythread.*
+Copyright: 2010-2012 Marcus Geelnard
+License: Zlib