[eigen3] 03/04: Apply cme fix dpkg.
Anton Gladky
gladk at moszumanska.debian.org
Sat Sep 3 20:18:15 UTC 2016
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository eigen3.
commit 6e583efc06e0e8ef04025071de71422e5df37dad
Author: Anton Gladky <gladk at debian.org>
Date: Sat Sep 3 22:14:47 2016 +0200
Apply cme fix dpkg.
---
debian/copyright | 218 ++++++++++++-------------
debian/patches/02_remove_buildtype_check.patch | 1 -
debian/patches/04_remove_piwik.patch | 1 -
debian/patches/05_remove_html_timestamp.patch | 1 -
debian/patches/06_remove_doc_matrix.patch | 1 -
debian/patches/07_remove_compressed_doc.patch | 1 -
debian/patches/08_fix_path_FindEigen3.patch | 1 -
debian/patches/10_vectorization.patch | 2 +-
debian/patches/12_grammer_tweak.patch | 5 +-
9 files changed, 113 insertions(+), 118 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 825a5e2..6b6ad21 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,4 @@
-Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
+Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Source: http://eigen.tuxfamily.org
Files: *
@@ -17,65 +17,93 @@ Files: Eigen/src/LU/PartialPivLU_MKL.h Eigen/src/PardisoSupport/PardisoSupport.h
Copyright: 2011 Intel Corporation
License: BSD-3-clause
+License: BSD-3-clause
+ Redistribution and use in source and binary forms, with or without modification,
+ are permitted provided that the following conditions are met:
+ .
+ * Redistributions of source code must retain the above copyright notice, this
+ list of conditions and the following disclaimer.
+ * Redistributions in binary form must reproduce the above copyright notice,
+ this list of conditions and the following disclaimer in the documentation
+ and/or other materials provided with the distribution.
+ * Neither the name of Intel Corporation nor the names of its contributors may
+ be used to endorse or promote products derived from this software without
+ specific prior written permission.
+ .
+ THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
+ ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
+ WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
+ DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
+ ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
+ (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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: LGPL-2.1+
+ On Debian systems, the complete text of the GNU Lesser General
+ Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
+
License: MPL-2
Mozilla Public License Version 2.0
==================================
- .
+ .
1. Definitions
--------------
- .
+ .
1.1. "Contributor"
means each individual or legal entity that creates, contributes to
the creation of, or owns Covered Software.
- .
+ .
1.2. "Contributor Version"
means the combination of the Contributions of others (if any) used
by a Contributor and that particular Contributor's Contribution.
- .
+ .
1.3. "Contribution"
means Covered Software of a particular Contributor.
- .
+ .
1.4. "Covered Software"
means Source Code Form to which the initial Contributor has attached
the notice in Exhibit A, the Executable Form of such Source Code
Form, and Modifications of such Source Code Form, in each case
including portions thereof.
- .
+ .
1.5. "Incompatible With Secondary Licenses"
means
- .
+ .
(a) that the initial Contributor has attached the notice described
in Exhibit B to the Covered Software; or
- .
+ .
(b) that the Covered Software was made available under the terms of
version 1.1 or earlier of the License, but not also under the
terms of a Secondary License.
- .
+ .
1.6. "Executable Form"
means any form of the work other than Source Code Form.
- .
+ .
1.7. "Larger Work"
means a work that combines Covered Software with other material, in
a separate file or files, that is not Covered Software.
- .
+ .
1.8. "License"
means this document.
- .
+ .
1.9. "Licensable"
means having the right to grant, to the maximum extent possible,
whether at the time of the initial grant or subsequently, any and
all of the rights conveyed by this License.
- .
+ .
1.10. "Modifications"
means any of the following:
- .
+ .
(a) any file in Source Code Form that results from an addition to,
deletion from, or modification of the contents of Covered
Software; or
- .
+ .
(b) any new file in Source Code Form that contains any Covered
Software.
- .
+ .
1.11. "Patent Claims" of a Contributor
means any patent claim(s), including without limitation, method,
process, and apparatus claims, in any patent Licensable by such
@@ -83,16 +111,16 @@ License: MPL-2
License, by the making, using, selling, offering for sale, having
made, import, or transfer of either its Contributions or its
Contributor Version.
- .
+ .
1.12. "Secondary License"
means either the GNU General Public License, Version 2.0, the GNU
Lesser General Public License, Version 2.1, the GNU Affero General
Public License, Version 3.0, or any later versions of those
licenses.
- .
+ .
1.13. "Source Code Form"
means the form of the work preferred for making modifications.
- .
+ .
1.14. "You" (or "Your")
means an individual or a legal entity exercising rights under this
License. For legal entities, "You" includes any entity that
@@ -102,83 +130,83 @@ License: MPL-2
whether by contract or otherwise, or (b) ownership of more than
fifty percent (50%) of the outstanding shares or beneficial
ownership of such entity.
- .
+ .
2. License Grants and Conditions
--------------------------------
- .
+ .
2.1. Grants
- .
+ .
Each Contributor hereby grants You a world-wide, royalty-free,
non-exclusive license:
- .
+ .
(a) under intellectual property rights (other than patent or trademark)
Licensable by such Contributor to use, reproduce, make available,
modify, display, perform, distribute, and otherwise exploit its
Contributions, either on an unmodified basis, with Modifications, or
as part of a Larger Work; and
- .
+ .
(b) under Patent Claims of such Contributor to make, use, sell, offer
for sale, have made, import, and otherwise transfer either its
Contributions or its Contributor Version.
- .
+ .
2.2. Effective Date
- .
+ .
The licenses granted in Section 2.1 with respect to any Contribution
become effective for each Contribution on the date the Contributor first
distributes such Contribution.
- .
+ .
2.3. Limitations on Grant Scope
- .
+ .
The licenses granted in this Section 2 are the only rights granted under
this License. No additional rights or licenses will be implied from the
distribution or licensing of Covered Software under this License.
Notwithstanding Section 2.1(b) above, no patent license is granted by a
Contributor:
- .
+ .
(a) for any code that a Contributor has removed from Covered Software;
or
- .
+ .
(b) for infringements caused by: (i) Your and any other third party's
modifications of Covered Software, or (ii) the combination of its
Contributions with other software (except as part of its Contributor
Version); or
- .
+ .
(c) under Patent Claims infringed by Covered Software in the absence of
its Contributions.
- .
+ .
This License does not grant any rights in the trademarks, service marks,
or logos of any Contributor (except as may be necessary to comply with
the notice requirements in Section 3.4).
- .
+ .
2.4. Subsequent Licenses
- .
+ .
No Contributor makes additional grants as a result of Your choice to
distribute the Covered Software under a subsequent version of this
License (see Section 10.2) or under the terms of a Secondary License (if
permitted under the terms of Section 3.3).
- .
+ .
2.5. Representation
- .
+ .
Each Contributor represents that the Contributor believes its
Contributions are its original creation(s) or it has sufficient rights
to grant the rights to its Contributions conveyed by this License.
- .
+ .
2.6. Fair Use
- .
+ .
This License is not intended to limit any rights You have under
applicable copyright doctrines of fair use, fair dealing, or other
equivalents.
- .
+ .
2.7. Conditions
- .
+ .
Sections 3.1, 3.2, 3.3, and 3.4 are conditions of the licenses granted
in Section 2.1.
- .
+ .
3. Responsibilities
-------------------
- .
+ .
3.1. Distribution of Source Form
- .
+ .
All distribution of Covered Software in Source Code Form, including any
Modifications that You create or to which You contribute, must be under
the terms of this License. You must inform recipients that the Source
@@ -186,24 +214,24 @@ License: MPL-2
License, and how they can obtain a copy of this License. You may not
attempt to alter or restrict the recipients' rights in the Source Code
Form.
- .
+ .
3.2. Distribution of Executable Form
- .
+ .
If You distribute Covered Software in Executable Form then:
- .
+ .
(a) such Covered Software must also be made available in Source Code
Form, as described in Section 3.1, and You must inform recipients of
the Executable Form how they can obtain a copy of such Source Code
Form by reasonable means in a timely manner, at a charge no more
than the cost of distribution to the recipient; and
- .
+ .
(b) You may distribute such Executable Form under the terms of this
License, or sublicense it under different terms, provided that the
license for the Executable Form does not attempt to limit or alter
the recipients' rights in the Source Code Form under this License.
- .
+ .
3.3. Distribution of a Larger Work
- .
+ .
You may create and distribute a Larger Work under terms of Your choice,
provided that You also comply with the requirements of this License for
the Covered Software. If the Larger Work is a combination of Covered
@@ -214,17 +242,17 @@ License: MPL-2
the Larger Work may, at their option, further distribute the Covered
Software under the terms of either this License or such Secondary
License(s).
- .
+ .
3.4. Notices
- .
+ .
You may not remove or alter the substance of any license notices
(including copyright notices, patent notices, disclaimers of warranty,
or limitations of liability) contained within the Source Code Form of
the Covered Software, except that You may alter any license notices to
the extent required to remedy known factual inaccuracies.
- .
+ .
3.5. Application of Additional Terms
- .
+ .
You may choose to offer, and to charge a fee for, warranty, support,
indemnity or liability obligations to one or more recipients of Covered
Software. However, You may do so only on Your own behalf, and not on
@@ -235,10 +263,10 @@ License: MPL-2
indemnity or liability terms You offer. You may include additional
disclaimers of warranty and limitations of liability specific to any
jurisdiction.
- .
+ .
4. Inability to Comply Due to Statute or Regulation
---------------------------------------------------
- .
+ .
If it is impossible for You to comply with any of the terms of this
License with respect to some or all of the Covered Software due to
statute, judicial order, or regulation then You must: (a) comply with
@@ -248,10 +276,10 @@ License: MPL-2
Software under this License. Except to the extent prohibited by statute
or regulation, such description must be sufficiently detailed for a
recipient of ordinary skill to be able to understand it.
- .
+ .
5. Termination
--------------
- .
+ .
5.1. The rights granted under this License will terminate automatically
if You fail to comply with any of its terms. However, if You become
compliant, then the rights granted under this License from a particular
@@ -265,19 +293,19 @@ License: MPL-2
first time You have received notice of non-compliance with this License
from such Contributor, and You become compliant prior to 30 days after
Your receipt of the notice.
- .
+ .
5.2. If You initiate litigation against any entity by asserting a patent
infringement claim (excluding declaratory judgment actions,
counter-claims, and cross-claims) alleging that a Contributor Version
directly or indirectly infringes any patent, then the rights granted to
You by any and all Contributors for the Covered Software under Section
2.1 of this License shall terminate.
- .
+ .
5.3. In the event of termination under Sections 5.1 or 5.2 above, all
end user license agreements (excluding distributors and resellers) which
have been validly granted by You or Your distributors under this License
prior to termination shall survive termination.
- .
+ .
************************************************************************
* *
* 6. Disclaimer of Warranty *
@@ -296,7 +324,7 @@ License: MPL-2
* authorized under this License except under this disclaimer. *
* *
************************************************************************
- .
+ .
************************************************************************
* *
* 7. Limitation of Liability *
@@ -319,103 +347,75 @@ License: MPL-2
* limitation may not apply to You. *
* *
************************************************************************
- .
+ .
8. Litigation
-------------
- .
+ .
Any litigation relating to this License may be brought only in the
courts of a jurisdiction where the defendant maintains its principal
place of business and such litigation shall be governed by laws of that
jurisdiction, without reference to its conflict-of-law provisions.
Nothing in this Section shall prevent a party's ability to bring
cross-claims or counter-claims.
- .
+ .
9. Miscellaneous
----------------
- .
+ .
This License represents the complete agreement concerning the subject
matter hereof. If any provision of this License is held to be
unenforceable, such provision shall be reformed only to the extent
necessary to make it enforceable. Any law or regulation which provides
that the language of a contract shall be construed against the drafter
shall not be used to construe this License against a Contributor.
- .
+ .
10. Versions of the License
---------------------------
- .
+ .
10.1. New Versions
- .
+ .
Mozilla Foundation is the license steward. Except as provided in Section
10.3, no one other than the license steward has the right to modify or
publish new versions of this License. Each version will be given a
distinguishing version number.
- .
+ .
10.2. Effect of New Versions
- .
+ .
You may distribute the Covered Software under the terms of the version
of the License under which You originally received the Covered Software,
or under the terms of any subsequent version published by the license
steward.
- .
+ .
10.3. Modified Versions
- .
+ .
If you create software not governed by this License, and you want to
create a new license for such software, you may create and use a
modified version of this License if you rename the license and remove
any references to the name of the license steward (except to note that
such modified license differs from this License).
- .
+ .
10.4. Distributing Source Code Form that is Incompatible With Secondary
Licenses
- .
+ .
If You choose to distribute Source Code Form that is Incompatible With
Secondary Licenses under the terms of this version of the License, the
notice described in Exhibit B of this License must be attached.
- .
+ .
Exhibit A - Source Code Form License Notice
-------------------------------------------
- .
+ .
This Source Code Form is subject to the terms of the Mozilla Public
License, v. 2.0. If a copy of the MPL was not distributed with this
file, You can obtain one at http://mozilla.org/MPL/2.0/.
- .
+ .
If it is not possible or desirable to put the notice in a particular
file, then You may include the notice in a location (such as a LICENSE
file in a relevant directory) where a recipient would be likely to look
for such a notice.
- .
+ .
You may add additional accurate notices of copyright ownership.
- .
+ .
Exhibit B - "Incompatible With Secondary Licenses" Notice
---------------------------------------------------------
- .
+ .
This Source Code Form is "Incompatible With Secondary Licenses", as
defined by the Mozilla Public License, v. 2.0.
-
-License: LGPL-2.1+
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
-License: BSD-3-clause
- Redistribution and use in source and binary forms, with or without modification,
- are permitted provided that the following conditions are met:
- .
- * Redistributions of source code must retain the above copyright notice, this
- list of conditions and the following disclaimer.
- * Redistributions in binary form must reproduce the above copyright notice,
- this list of conditions and the following disclaimer in the documentation
- and/or other materials provided with the distribution.
- * Neither the name of Intel Corporation nor the names of its contributors may
- be used to endorse or promote products derived from this software without
- specific prior written permission.
- .
- THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND
- ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED
- WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
- DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR
- ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES
- (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
- LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND 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.
diff --git a/debian/patches/02_remove_buildtype_check.patch b/debian/patches/02_remove_buildtype_check.patch
index cd8992d..e0282b2 100644
--- a/debian/patches/02_remove_buildtype_check.patch
+++ b/debian/patches/02_remove_buildtype_check.patch
@@ -1,7 +1,6 @@
Description: Remove build type check in cmake
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-
Index: eigen-eigen-69d418c06999/CMakeLists.txt
===================================================================
--- eigen-eigen-69d418c06999.orig/CMakeLists.txt
diff --git a/debian/patches/04_remove_piwik.patch b/debian/patches/04_remove_piwik.patch
index 5e0ee42..f73a624 100644
--- a/debian/patches/04_remove_piwik.patch
+++ b/debian/patches/04_remove_piwik.patch
@@ -1,7 +1,6 @@
Description: remove piwik scripts.
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-16
-
Index: eigen-eigen-69d418c06999/doc/eigendoxy_footer.html.in
===================================================================
--- eigen-eigen-69d418c06999.orig/doc/eigendoxy_footer.html.in
diff --git a/debian/patches/05_remove_html_timestamp.patch b/debian/patches/05_remove_html_timestamp.patch
index 40db1fd..54653a7 100644
--- a/debian/patches/05_remove_html_timestamp.patch
+++ b/debian/patches/05_remove_html_timestamp.patch
@@ -1,7 +1,6 @@
Description: Do not set HTML_TIMESTAMP in documentation
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-17
-
Index: eigen-eigen-69d418c06999/doc/Doxyfile.in
===================================================================
--- eigen-eigen-69d418c06999.orig/doc/Doxyfile.in
diff --git a/debian/patches/06_remove_doc_matrix.patch b/debian/patches/06_remove_doc_matrix.patch
index 5a16c75..14a73a2 100644
--- a/debian/patches/06_remove_doc_matrix.patch
+++ b/debian/patches/06_remove_doc_matrix.patch
@@ -1,7 +1,6 @@
Description: Remove the line, which causes unreproducible builds
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-18
-
Index: eigen-eigen-69d418c06999/doc/snippets/Matrix_resize_int_int.cpp
===================================================================
--- eigen-eigen-69d418c06999.orig/doc/snippets/Matrix_resize_int_int.cpp
diff --git a/debian/patches/07_remove_compressed_doc.patch b/debian/patches/07_remove_compressed_doc.patch
index ce6b9d5..2233ca1 100644
--- a/debian/patches/07_remove_compressed_doc.patch
+++ b/debian/patches/07_remove_compressed_doc.patch
@@ -1,7 +1,6 @@
Description: Remove compressed doc
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-06-19
-
Index: eigen-eigen-69d418c06999/doc/CMakeLists.txt
===================================================================
--- eigen-eigen-69d418c06999.orig/doc/CMakeLists.txt
diff --git a/debian/patches/08_fix_path_FindEigen3.patch b/debian/patches/08_fix_path_FindEigen3.patch
index ee6a8b4..2c7163e 100644
--- a/debian/patches/08_fix_path_FindEigen3.patch
+++ b/debian/patches/08_fix_path_FindEigen3.patch
@@ -1,7 +1,6 @@
Description: fix installation path for cmake-files
Author: Anton Gladky <gladk at debian.org>
Last-Update: 2015-12-18
-
Index: eigen-eigen-69d418c06999/CMakeLists.txt
===================================================================
--- eigen-eigen-69d418c06999.orig/CMakeLists.txt
diff --git a/debian/patches/10_vectorization.patch b/debian/patches/10_vectorization.patch
index 4a1c087..49757e7 100644
--- a/debian/patches/10_vectorization.patch
+++ b/debian/patches/10_vectorization.patch
@@ -3,7 +3,7 @@
# Date 1469697667 -7200
# Node ID e35a38ad89fe4fba936bb39a5f02d667045fe8dd
# Parent 0b62bc896f8070c48214ffc447bc597c261933bc
-Vectorize more small product expressions by letting the general assignement logic decides on the sizes that are OK for vectorization.
+# Vectorize more small product expressions by letting the general assignement logic decides on the sizes that are OK for vectorization.
Index: eigen3/Eigen/src/Core/ProductEvaluators.h
===================================================================
diff --git a/debian/patches/12_grammer_tweak.patch b/debian/patches/12_grammer_tweak.patch
index 0dd9884..54cab31 100644
--- a/debian/patches/12_grammer_tweak.patch
+++ b/debian/patches/12_grammer_tweak.patch
@@ -1,6 +1,7 @@
-Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Description: Correct grammer error found by lintian which can leak into other
-projects.
+ .
+ projects.
+Author: Michael R. Crusoe <crusoe at ucdavis.edu>
Index: eigen3/Eigen/src/Core/DenseBase.h
===================================================================
--- eigen3.orig/Eigen/src/Core/DenseBase.h
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/eigen3.git
More information about the debian-science-commits
mailing list