Fix some more lintian warnings

- Update d/copyright for generated unicode-based files
- Add Suggests for the python scripts
- Add note about -C prefer-dynamic

diff --git a/debian/TODO.Debian b/debian/TODO.Debian
index 6f8b6d793f70e78cc2fc423fd0860a0aed163d98..5e74601635c697ba1e9ad31d4ddb246e3c6d955d 100644 (file)
--- a/debian/TODO.Debian
+++ b/debian/TODO.Debian
@@ -1,6 +1,7 @@
 - update d/copyright
 
 - later: experiment with -C prefer-dynamic
+  - see TODO in d/rules, need to update rustc
 - (possibly not needed, seems Windows-only):
   work around https://github.com/rust-lang/rust/issues/43449
 

diff --git a/debian/control b/debian/control
index d27b588e2dfad23ef7ad2afc4936dcce46d384ff..6f0025fa6bc1a5de7a3a6d8aa743b62c7161e5cd 100644 (file)
--- a/debian/control
+++ b/debian/control
@@ -39,7 +39,7 @@ Depends: ${shlibs:Depends}, ${misc:Depends},
          rustc (>= 1.1),
          binutils,
          gcc | clang | c-compiler
-Suggests: cargo-doc
+Suggests: cargo-doc, python3-minimal
 Description: Rust package manager
  Cargo is a tool that allows Rust projects to declare their various
  dependencies, and ensure that you'll always get a repeatable build.
@@ -54,7 +54,6 @@ Description: Rust package manager
  Cargo downloads your Rust project’s dependencies and compiles your
  project.
 
-
 Package: cargo-doc
 Section: doc
 Architecture: all

diff --git a/debian/copyright b/debian/copyright
index aca937279458e059cef338e235a7abe66936b028..69f129f962177e97ec7c135afe8ef6dda2e20bf7 100644 (file)
--- a/debian/copyright
+++ b/debian/copyright
@@ -148,43 +148,8 @@ License: MIT or Apache-2.0
 
 Files: vendor/idna-0*/src/IdnaMappingTable.txt
        vendor/idna-0*/tests/IdnaTest.txt
-       vendor/unicode-bidi-0*/src/BidiCharacterTest.txt
-       vendor/unicode-bidi-0*/src/BidiTest.txt
-       vendor/unicode-normalization-0*/src/DerivedNormalizationProps.txt
-       vendor/unicode-normalization-0*/src/ReadMe.txt
 Copyright: 1991-2017 Unicode, Inc
 License: Unicode-terms
- Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
- .
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of the Unicode data files and any associated documentation
- (the "Data Files") or Unicode software and any associated documentation
- (the "Software") to deal in the Data Files or Software
- without restriction, including without limitation the rights to use,
- copy, modify, merge, publish, distribute, and/or sell copies of
- the Data Files or Software, and to permit persons to whom the Data Files
- or Software are furnished to do so, provided that either
- (a) this copyright and permission notice appear with all copies
- of the Data Files or Software, or
- (b) this copyright and permission notice appear in associated
- Documentation.
- .
- THE DATA FILES AND SOFTWARE ARE 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 OF THIRD PARTY RIGHTS.
- IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
- NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
- DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
- DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
- TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
- PERFORMANCE OF THE DATA FILES OR SOFTWARE.
- .
- Except as contained in this notice, the name of a copyright holder
- shall not be used in advertising or otherwise to promote the sale,
- use or other dealings in these Data Files or Software without prior
- written authorization of the copyright holder.
-Comment: see http://www.unicode.org/copyright.html
 
 Files: vendor/lazy_static-0*
 Copyright: 2014-2016 Marvin Löbel <loebel.marvin@gmail.com>
@@ -267,6 +232,34 @@ Copyright: 2015-2017 erick.tryzelaar <erick.tryzelaar@gmail.com>
 License: MIT or Apache-2.0
 Comment: see https://github.com/unicode-rs/unicode-xid
 
+Files: vendor/unicode-bidi-0*/tools/generate.py
+       vendor/unicode-normalization-0*/scripts/unicode.py
+       vendor/unicode-xid-0*/scripts/unicode.py
+Copyright: 2011-2015 The Rust Project Developers
+           2015 The Servo Project Developers
+License: MIT or Apache-2.0
+
+Files: vendor/unicode-bidi-0*/src/char_data/tables.rs
+       vendor/unicode-normalization-0*/src/tables.rs
+       vendor/unicode-normalization-0*/src/testdata.rs
+       vendor/unicode-xid-0*/src/tables.rs
+Copyright: 2011-2015 The Rust Project Developers
+           2015 The Servo Project Developers
+License: MIT or Apache-2.0, and Unicode-terms
+Comment:
+ These files are generated using python scripts, as indicated below, from
+ Unicode data files which are licensed under the Unicode-terms. In Debian these
+ data files are available in the unicode-data package.
+ .
+ $ git grep -i generated --  vendor/unicode-* ':(exclude)*LICENSE*'
+ vendor/unicode-bidi-0.3.3/src/char_data/tables.rs:// The following code was generated by "tools/generate.py". do not edit directly
+ vendor/unicode-bidi-0.3.3/tools/generate.py:// The following code was generated by "tools/generate.py". do not edit directly
+ vendor/unicode-normalization-0.1.4/scripts/unicode.py:// NOTE: The following code was generated by "scripts/unicode.py", do not edit directly
+ vendor/unicode-normalization-0.1.4/src/tables.rs:// NOTE: The following code was generated by "scripts/unicode.py", do not edit directly
+ vendor/unicode-normalization-0.1.4/src/testdata.rs:// NOTE: The following code was generated by "scripts/unicode.py", do not edit directly
+ vendor/unicode-xid-0.0.4/scripts/unicode.py:// NOTE: The following code was generated by "scripts/unicode.py", do not edit directly
+ vendor/unicode-xid-0.0.4/src/tables.rs:// NOTE: The following code was generated by "scripts/unicode.py", do not edit directly
+
 Files: vendor/unreachable-0*
        vendor/void-1.*
 Copyright: 2015-2017 Jonathan Reem <jonathan.reem@gmail.com>
@@ -367,3 +360,36 @@ License: Unlicense
  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.
+
+License: Unicode-terms
+ Distributed under the Terms of Use in http://www.unicode.org/copyright.html.
+ .
+ Permission is hereby granted, free of charge, to any person obtaining
+ a copy of the Unicode data files and any associated documentation
+ (the "Data Files") or Unicode software and any associated documentation
+ (the "Software") to deal in the Data Files or Software
+ without restriction, including without limitation the rights to use,
+ copy, modify, merge, publish, distribute, and/or sell copies of
+ the Data Files or Software, and to permit persons to whom the Data Files
+ or Software are furnished to do so, provided that either
+ (a) this copyright and permission notice appear with all copies
+ of the Data Files or Software, or
+ (b) this copyright and permission notice appear in associated
+ Documentation.
+ .
+ THE DATA FILES AND SOFTWARE ARE 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 OF THIRD PARTY RIGHTS.
+ IN NO EVENT SHALL THE COPYRIGHT HOLDER OR HOLDERS INCLUDED IN THIS
+ NOTICE BE LIABLE FOR ANY CLAIM, OR ANY SPECIAL INDIRECT OR CONSEQUENTIAL
+ DAMAGES, OR ANY DAMAGES WHATSOEVER RESULTING FROM LOSS OF USE,
+ DATA OR PROFITS, WHETHER IN AN ACTION OF CONTRACT, NEGLIGENCE OR OTHER
+ TORTIOUS ACTION, ARISING OUT OF OR IN CONNECTION WITH THE USE OR
+ PERFORMANCE OF THE DATA FILES OR SOFTWARE.
+ .
+ Except as contained in this notice, the name of a copyright holder
+ shall not be used in advertising or otherwise to promote the sale,
+ use or other dealings in these Data Files or Software without prior
+ written authorization of the copyright holder.
+Comment: see http://www.unicode.org/copyright.html

diff --git a/debian/rules b/debian/rules
index 44259ea512c91ec9d547a86443610b74efed50d5..81ecff56df5cec6952507e87c0b2f4f6481b3f43 100755 (executable)
--- a/debian/rules
+++ b/debian/rules
@@ -9,7 +9,11 @@ include /usr/share/rustc/architecture.mk
 export PKG_CONFIG = $(DEB_HOST_GNU_TYPE)-pkg-config
 export PKG_CONFIG_ALLOW_CROSS = 1
 RUSTFLAGS += -C linker=$(DEB_HOST_GNU_TYPE)-gcc
-RUSTFLAGS += -C prefer-dynamic
+# TODO: we cannot enable this until dh_shlibdeps works correctly; atm we get:
+# dpkg-shlibdeps: warning: can't extract name and version from library name 'libstd-XXXXXXXX.so'
+# and the resulting cargo.deb does not depend on the correct version of libstd-rust-1.XX
+# We probably need to add override_dh_makeshlibs to d/rules of rustc
+#RUSTFLAGS += -C prefer-dynamic
 
 # Pass on dpkg-buildflags stuff
 RUSTFLAGS += $(foreach flag,$(LDFLAGS),-C link-arg=$(flag))