[openmeca] 03/04: update copyright and fix patch 0003

Damien André damien-andre-guest at moszumanska.debian.org
Tue Apr 25 11:31:11 UTC 2017


This is an automated email from the git hooks/post-receive script.

damien-andre-guest pushed a commit to branch master
in repository openmeca.

commit cd06e56e5664d65f67a99608a9e2bde1b852e330
Author: Damien André <damien.andre at unilim.fr>
Date:   Tue Apr 25 09:46:16 2017 +0200

    update copyright and fix patch 0003
---
 debian/copyright                                   |  97 +++++-----
 ...03-add-hardening-option-linthian-warnings.patch | 208 +--------------------
 2 files changed, 49 insertions(+), 256 deletions(-)

diff --git a/debian/copyright b/debian/copyright
index a2f1518..61b21b3 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -3,152 +3,151 @@ Upstream-Name: openmeca
 Source: https://gitlab.com/damien.andre/openmeca
 
 Files: LICENSE Makefile README.md SRC/README
-Copyright: Copyright (C) 2017 Damien ANDRE
+Copyright: 2017 Damien ANDRE
 License: GPL-3.0
 
 Files: debian/*
-Copyright: Copyright (C) 2017 Damien ANDRE
+Copyright: 2017 Damien ANDRE
 License: GPL-3.0
 
 Files: SRC/OpenMeca/*
-Copyright: Copyright (C) 2012-2017 Damien ANDRE
+Copyright: 2012-2017 Damien ANDRE
 License: GPL-3.0
 
 Files: SRC/OpenMeca/Util/exprtk.hpp
-Copyright: Copyright (C) (1999-2016) Arash Partow
+Copyright: 1999-2016 Arash Partow
 License: CPL-1.0
 
 Files: SRC/ChronoEngine/*
-Copyright: Copyright (c) 2013 Project Chrono
-           Copyright (c) 1996, 2003, 2005, 2006, 2008, 2010, 2011, 2012 Alessandro Tasora
+Copyright: 2013 Project Chrono
+           1996, 2003, 2005, 2006, 2008, 2010, 2011, 2012 Alessandro Tasora
 License: BSD-3-Clause
 
 Files: SRC/ChronoEngine/collision/bullet/*
-Copyright: Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Erwin Coumans
-           Copyright (c) 2006 Simon Hobbs
-	   Copyright (c) 2006-2007 Erin Catto
-	   Copyright (C) 2001,2002 Russell L. Smith
-	   Copyright (c) Ricardo Padrela 2006
-	   Copyright (c) 2006-2009, 2006-2010 Charlie C & Erwin Coumans
-	   Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans
+Copyright: 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Erwin Coumans
+           2006 Simon Hobbs
+	   2006-2007 Erin Catto
+	   2001,2002 Russell L. Smith
+	   Ricardo Padrela 2006
+	   2006-2009, 2006-2010 Charlie C & Erwin Coumans
+	   2003-2006 Gino van den Bergen / Erwin Coumans
 License: Zlib
 
 Files: SRC/ChronoEngine/collision/bullet/LinearMath/btConvexHull.*
-Copyright: Copyright (c) 2003-2006 Stan Melax
-           Copyright (c) 2008 Stan Melax
+Copyright: 2003-2006, 2008 Stan Melax
 License: Zlib
 
 Files: SRC/ChronoEngine/collision/gimpact/ConvexDecomposition/*
-Copyright: Copyright (c) 2004 Open Dynamics Framework Group
+Copyright: 2004 Open Dynamics Framework Group
 License: BSD-3-Clause
 
 Files: SRC/ChronoEngine/collision/gimpact/GIMPACT/*
-Copyright: Copyright (c) 2007, 2007 Francisco Leon Najera. C.C. 80087371.
+Copyright: 2007, 2007 Francisco Leon Najera. C.C. 80087371.
 License: Zlib
 
 Files: SRC/ChronoEngine/collision/gimpact/GIMPACTUtils/*
-Copyright: Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
+Copyright: 2007 Francisco Leon Najera. C.C. 80087371.
 License: Zlib
 
 Files: SRC/ChronoEngine/collision/gimpact/GIMPACT/Bullet/btGenericPoolAllocator.*
-Copyright: Copyright (c) 2003-2006 Erwin Coumans
+Copyright: 2003-2006 Erwin Coumans
 License: Zlib
 
 Files: SRC/ChronoEngine/parallel/ChThreadsSync.h
-Copyright: Copyright (c) 2007 Starbreeze Studios
+Copyright: 2007 Starbreeze Studios
 License: Zlib
 
 Files: SRC/Serialization/*
-Copyright: (C) Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Robert Ramey
-           Copyright 2002, 2005 Daryle Walker
-	   (C) Copyright 2006 David Abrahams
-	   (C) Copyright 2004 Robert Ramey and Martin Ecker
-	   (C) Copyright 2004-2009 Robert Ramey, Martin Ecker and Takatoshi Kondo
-	   (C) Copyright 2003-4 Pavel Vozenilek and Robert Ramey
-	   (C) Copyright Robert Ramey 2003. Jonathan Turkanis 2004.
+Copyright: 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Robert Ramey
+           2002, 2005 Daryle Walker
+	   2006 David Abrahams
+	   2004 Robert Ramey and Martin Ecker
+	   2004-2009 Robert Ramey, Martin Ecker and Takatoshi Kondo
+	   2003-4 Pavel Vozenilek and Robert Ramey
+           2004 Jonathan Turkanis
 License: BSL-1.0
 
 Files: SRC/Serialization/archive/detail/register_archive.hpp
-Copyright: Copyright David Abrahams 2006
+Copyright: 2006 David Abrahams
 License: BSL-1.0
 
 Files: SRC/Serialization/archive/detail/utf8_codecvt_facet.hpp
-Copyright: Copyright (c) 2001 Ronald Garcia, Indiana University
+Copyright: 2001 Ronald Garcia, Indiana University
 License: BSL-1.0
 
 Files: SRC/Serialization/array.hpp
-Copyright: (C) Copyright 2005 Matthias Troyer and Dave Abrahams
+Copyright: 2005 Matthias Troyer and Dave Abrahams
 License: BSL-1.0
 
 Files: SRC/Serialization/bitset.hpp
-Copyright: copyright 2004 Brian Ravnsgaard Riis
+Copyright: 2004 Brian Ravnsgaard Riis
 License: BSL-1.0
 
 Files: SRC/Serialization/collection_size_type.hpp
-Copyright: (C) Copyright 2005 Matthias Troyer
+Copyright: 2005 Matthias Troyer
 License: BSL-1.0
 
 Files: SRC/Serialization/complex.hpp
-Copyright: (C) Copyright 2007 Matthias Troyer
+Copyright: 2007 Matthias Troyer
 License: BSL-1.0
 
 Files: SRC/Serialization/detail/get_data.hpp
-Copyright: (C) Copyright 2005 Matthias Troyer
+Copyright: 2005 Matthias Troyer
 License: BSL-1.0
 
 Files: SRC/Serialization/detail/shared_count_132.hpp
-Copyright: Copyright (c) 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
+Copyright: 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
 License: BSL-1.0
 
 Files: SRC/Serialization/detail/shared_ptr_132.hpp
-Copyright: (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
-           Copyright (c) 2001, 2002, 2003 Peter Dimov
+Copyright: 1998, 1999 Greg Colvin and Beman Dawes
+           2001, 2002, 2003 Peter Dimov
 License: BSL-1.0
 
 Files: SRC/Serialization/detail/shared_ptr_nmt_132.hpp
-Copyright: (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
-           Copyright (c) 2001, 2002 Peter Dimov
+Copyright: 1998, 1999 Greg Colvin and Beman Dawes
+           2001, 2002 Peter Dimov
 License: BSL-1.0
 
 Files: SRC/Serialization/ephemeral.hpp
-Copyright: (C) Copyright 2007 Matthias Troyer.
+Copyright: 2007 Matthias Troyer
 License: BSL-1.0
 
 
 Files: SRC/Serialization/is_bitwise_serializable.hpp
-Copyright: (C) Copyright 2007 Matthias Troyer
+Copyright: 2007 Matthias Troyer
 License: BSL-1.0
 
 Files: SRC/Serialization/optional.hpp
-Copyright: (C) Copyright 2002-4 Pavel Vozenilek
+Copyright: 2002-4 Pavel Vozenilek
 License: BSL-1.0
 
 Files: SRC/Serialization/scoped_ptr.hpp
-Copyright: Copyright (c) 2003 Vladimir Prus
+Copyright: 2003 Vladimir Prus
 License: BSL-1.0
 
 Files: SRC/Serialization/src/utf8_codecvt_facet.cpp
-Copyright: Copyright Vladimir Prus 2004.
+Copyright: 2004 Vladimir Prus
 License: BSL-1.0
 
 Files: SRC/Serialization/throw_exception.hpp
-Copyright: Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
+Copyright: 2002 Peter Dimov and Multi Media Ltd.
 License: BSL-1.0
 
 Files: SRC/Serialization/valarray.hpp
-Copyright: (C) Copyright 2005 Matthias Troyer
+Copyright: 2005 Matthias Troyer
 License: BSL-1.0
 
 Files: SRC/Serialization/variant.hpp
-Copyright: copyright (c) 2005 troy d. straszheim
+Copyright: 2005 troy d. straszheim
 License: BSL-1.0
 
 Files: SRC/Serialization/vector_135.hpp
-Copyright: (C) Copyright 2008 Matthias Troyer
+Copyright: 2008 Matthias Troyer
 License: BSL-1.0
 
 Files: SRC/Serialization/wrapper.hpp
-Copyright: (C) Copyright 2005-2006 Matthias Troyer
+Copyright: 2005-2006 Matthias Troyer
 License: BSL-1.0
 
 
diff --git a/debian/patches/0003-add-hardening-option-linthian-warnings.patch b/debian/patches/0003-add-hardening-option-linthian-warnings.patch
index 68fbab1..c05c106 100644
--- a/debian/patches/0003-add-hardening-option-linthian-warnings.patch
+++ b/debian/patches/0003-add-hardening-option-linthian-warnings.patch
@@ -6,8 +6,7 @@ Subject: add hardening option (linthian warnings)
  SRC/ChronoEngine/ChronoEngine.pro   |  7 +++
  SRC/OpenMeca/OpenMeca.pro           |  5 ++
  SRC/Serialization/Serialization.pro |  8 +++
- debian/copyright                    | 97 ++++++++++++++++++-------------------
- 4 files changed, 68 insertions(+), 49 deletions(-)
+ 3 files changed
 
 diff --git a/SRC/ChronoEngine/ChronoEngine.pro b/SRC/ChronoEngine/ChronoEngine.pro
 index c4a5636..2acb2f4 100644
@@ -59,208 +58,3 @@ index 01cf1d2..ec0623b 100644
  ######################################################################
  # qmake internal options
  ######################################################################
-diff --git a/debian/copyright b/debian/copyright
-index a2f1518..61b21b3 100644
---- a/debian/copyright
-+++ b/debian/copyright
-@@ -3,152 +3,151 @@ Upstream-Name: openmeca
- Source: https://gitlab.com/damien.andre/openmeca
- 
- Files: LICENSE Makefile README.md SRC/README
--Copyright: Copyright (C) 2017 Damien ANDRE
-+Copyright: 2017 Damien ANDRE
- License: GPL-3.0
- 
- Files: debian/*
--Copyright: Copyright (C) 2017 Damien ANDRE
-+Copyright: 2017 Damien ANDRE
- License: GPL-3.0
- 
- Files: SRC/OpenMeca/*
--Copyright: Copyright (C) 2012-2017 Damien ANDRE
-+Copyright: 2012-2017 Damien ANDRE
- License: GPL-3.0
- 
- Files: SRC/OpenMeca/Util/exprtk.hpp
--Copyright: Copyright (C) (1999-2016) Arash Partow
-+Copyright: 1999-2016 Arash Partow
- License: CPL-1.0
- 
- Files: SRC/ChronoEngine/*
--Copyright: Copyright (c) 2013 Project Chrono
--           Copyright (c) 1996, 2003, 2005, 2006, 2008, 2010, 2011, 2012 Alessandro Tasora
-+Copyright: 2013 Project Chrono
-+           1996, 2003, 2005, 2006, 2008, 2010, 2011, 2012 Alessandro Tasora
- License: BSD-3-Clause
- 
- Files: SRC/ChronoEngine/collision/bullet/*
--Copyright: Copyright (c) 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Erwin Coumans
--           Copyright (c) 2006 Simon Hobbs
--	   Copyright (c) 2006-2007 Erin Catto
--	   Copyright (C) 2001,2002 Russell L. Smith
--	   Copyright (c) Ricardo Padrela 2006
--	   Copyright (c) 2006-2009, 2006-2010 Charlie C & Erwin Coumans
--	   Copyright (c) 2003-2006 Gino van den Bergen / Erwin Coumans
-+Copyright: 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010 Erwin Coumans
-+           2006 Simon Hobbs
-+	   2006-2007 Erin Catto
-+	   2001,2002 Russell L. Smith
-+	   Ricardo Padrela 2006
-+	   2006-2009, 2006-2010 Charlie C & Erwin Coumans
-+	   2003-2006 Gino van den Bergen / Erwin Coumans
- License: Zlib
- 
- Files: SRC/ChronoEngine/collision/bullet/LinearMath/btConvexHull.*
--Copyright: Copyright (c) 2003-2006 Stan Melax
--           Copyright (c) 2008 Stan Melax
-+Copyright: 2003-2006, 2008 Stan Melax
- License: Zlib
- 
- Files: SRC/ChronoEngine/collision/gimpact/ConvexDecomposition/*
--Copyright: Copyright (c) 2004 Open Dynamics Framework Group
-+Copyright: 2004 Open Dynamics Framework Group
- License: BSD-3-Clause
- 
- Files: SRC/ChronoEngine/collision/gimpact/GIMPACT/*
--Copyright: Copyright (c) 2007, 2007 Francisco Leon Najera. C.C. 80087371.
-+Copyright: 2007, 2007 Francisco Leon Najera. C.C. 80087371.
- License: Zlib
- 
- Files: SRC/ChronoEngine/collision/gimpact/GIMPACTUtils/*
--Copyright: Copyright (c) 2007 Francisco Leon Najera. C.C. 80087371.
-+Copyright: 2007 Francisco Leon Najera. C.C. 80087371.
- License: Zlib
- 
- Files: SRC/ChronoEngine/collision/gimpact/GIMPACT/Bullet/btGenericPoolAllocator.*
--Copyright: Copyright (c) 2003-2006 Erwin Coumans
-+Copyright: 2003-2006 Erwin Coumans
- License: Zlib
- 
- Files: SRC/ChronoEngine/parallel/ChThreadsSync.h
--Copyright: Copyright (c) 2007 Starbreeze Studios
-+Copyright: 2007 Starbreeze Studios
- License: Zlib
- 
- Files: SRC/Serialization/*
--Copyright: (C) Copyright 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Robert Ramey
--           Copyright 2002, 2005 Daryle Walker
--	   (C) Copyright 2006 David Abrahams
--	   (C) Copyright 2004 Robert Ramey and Martin Ecker
--	   (C) Copyright 2004-2009 Robert Ramey, Martin Ecker and Takatoshi Kondo
--	   (C) Copyright 2003-4 Pavel Vozenilek and Robert Ramey
--	   (C) Copyright Robert Ramey 2003. Jonathan Turkanis 2004.
-+Copyright: 2002, 2003, 2004, 2005, 2007, 2008, 2009, 2010  Robert Ramey
-+           2002, 2005 Daryle Walker
-+	   2006 David Abrahams
-+	   2004 Robert Ramey and Martin Ecker
-+	   2004-2009 Robert Ramey, Martin Ecker and Takatoshi Kondo
-+	   2003-4 Pavel Vozenilek and Robert Ramey
-+           2004 Jonathan Turkanis
- License: BSL-1.0
- 
- Files: SRC/Serialization/archive/detail/register_archive.hpp
--Copyright: Copyright David Abrahams 2006
-+Copyright: 2006 David Abrahams
- License: BSL-1.0
- 
- Files: SRC/Serialization/archive/detail/utf8_codecvt_facet.hpp
--Copyright: Copyright (c) 2001 Ronald Garcia, Indiana University
-+Copyright: 2001 Ronald Garcia, Indiana University
- License: BSL-1.0
- 
- Files: SRC/Serialization/array.hpp
--Copyright: (C) Copyright 2005 Matthias Troyer and Dave Abrahams
-+Copyright: 2005 Matthias Troyer and Dave Abrahams
- License: BSL-1.0
- 
- Files: SRC/Serialization/bitset.hpp
--Copyright: copyright 2004 Brian Ravnsgaard Riis
-+Copyright: 2004 Brian Ravnsgaard Riis
- License: BSL-1.0
- 
- Files: SRC/Serialization/collection_size_type.hpp
--Copyright: (C) Copyright 2005 Matthias Troyer
-+Copyright: 2005 Matthias Troyer
- License: BSL-1.0
- 
- Files: SRC/Serialization/complex.hpp
--Copyright: (C) Copyright 2007 Matthias Troyer
-+Copyright: 2007 Matthias Troyer
- License: BSL-1.0
- 
- Files: SRC/Serialization/detail/get_data.hpp
--Copyright: (C) Copyright 2005 Matthias Troyer
-+Copyright: 2005 Matthias Troyer
- License: BSL-1.0
- 
- Files: SRC/Serialization/detail/shared_count_132.hpp
--Copyright: Copyright (c) 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
-+Copyright: 2001, 2002, 2003 Peter Dimov and Multi Media Ltd.
- License: BSL-1.0
- 
- Files: SRC/Serialization/detail/shared_ptr_132.hpp
--Copyright: (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
--           Copyright (c) 2001, 2002, 2003 Peter Dimov
-+Copyright: 1998, 1999 Greg Colvin and Beman Dawes
-+           2001, 2002, 2003 Peter Dimov
- License: BSL-1.0
- 
- Files: SRC/Serialization/detail/shared_ptr_nmt_132.hpp
--Copyright: (C) Copyright Greg Colvin and Beman Dawes 1998, 1999.
--           Copyright (c) 2001, 2002 Peter Dimov
-+Copyright: 1998, 1999 Greg Colvin and Beman Dawes
-+           2001, 2002 Peter Dimov
- License: BSL-1.0
- 
- Files: SRC/Serialization/ephemeral.hpp
--Copyright: (C) Copyright 2007 Matthias Troyer.
-+Copyright: 2007 Matthias Troyer
- License: BSL-1.0
- 
- 
- Files: SRC/Serialization/is_bitwise_serializable.hpp
--Copyright: (C) Copyright 2007 Matthias Troyer
-+Copyright: 2007 Matthias Troyer
- License: BSL-1.0
- 
- Files: SRC/Serialization/optional.hpp
--Copyright: (C) Copyright 2002-4 Pavel Vozenilek
-+Copyright: 2002-4 Pavel Vozenilek
- License: BSL-1.0
- 
- Files: SRC/Serialization/scoped_ptr.hpp
--Copyright: Copyright (c) 2003 Vladimir Prus
-+Copyright: 2003 Vladimir Prus
- License: BSL-1.0
- 
- Files: SRC/Serialization/src/utf8_codecvt_facet.cpp
--Copyright: Copyright Vladimir Prus 2004.
-+Copyright: 2004 Vladimir Prus
- License: BSL-1.0
- 
- Files: SRC/Serialization/throw_exception.hpp
--Copyright: Copyright (c) 2002 Peter Dimov and Multi Media Ltd.
-+Copyright: 2002 Peter Dimov and Multi Media Ltd.
- License: BSL-1.0
- 
- Files: SRC/Serialization/valarray.hpp
--Copyright: (C) Copyright 2005 Matthias Troyer
-+Copyright: 2005 Matthias Troyer
- License: BSL-1.0
- 
- Files: SRC/Serialization/variant.hpp
--Copyright: copyright (c) 2005 troy d. straszheim
-+Copyright: 2005 troy d. straszheim
- License: BSL-1.0
- 
- Files: SRC/Serialization/vector_135.hpp
--Copyright: (C) Copyright 2008 Matthias Troyer
-+Copyright: 2008 Matthias Troyer
- License: BSL-1.0
- 
- Files: SRC/Serialization/wrapper.hpp
--Copyright: (C) Copyright 2005-2006 Matthias Troyer
-+Copyright: 2005-2006 Matthias Troyer
- License: BSL-1.0
- 
- 

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/openmeca.git



More information about the debian-science-commits mailing list