Update servo-freetype-sys

diff --git a/src/servo-freetype-sys/debian/changelog b/src/servo-freetype-sys/debian/changelog
index 0bbae6cdb14abfd0fcd7d0b337cf872c6cdfd6c4..56decabef1d1168c6406e00dc4e8114e3c56728d 100644 (file)
--- a/src/servo-freetype-sys/debian/changelog
+++ b/src/servo-freetype-sys/debian/changelog
@@ -1,5 +1,5 @@
 rust-servo-freetype-sys (4.0.5-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
 
-  * Package servo-freetype-sys 4.0.5 from crates.io using debcargo 2.2.10
+  * Package servo-freetype-sys 4.0.5 from crates.io using debcargo 2.4.0
 
- -- Andrej Shadura <andrewsh@debian.org>  Sun, 21 Jul 2019 17:57:24 -0300
+ -- Andrej Shadura <andrewsh@debian.org>  Sat, 28 Dec 2019 12:45:29 +0100

diff --git a/src/servo-freetype-sys/debian/copyright b/src/servo-freetype-sys/debian/copyright
index d5be62ec4a64fe9c98fc6512ea394a2a621c3b63..076c0dd022621e7040307cc7009a582a1608116c 100644 (file)
--- a/src/servo-freetype-sys/debian/copyright
+++ b/src/servo-freetype-sys/debian/copyright
@@ -7,11 +7,22 @@ Files: *
 Copyright: 2014—2018 The Servo Project Developers
 License: FTL or GPL-2.0
 
+Files: build.rs
+Copyright: 2015—2018 The Servo Project Developers
+License: MPL-2.0
+ 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/.
+ .
+ On Debian GNU/Linux systems, the complete text of the Mozilla
+ Public License version 2.0 can be found in
+ `/usr/share/common-licenses/MPL-2.0'.
+
 Files: debian/*
 Copyright:
  2019 Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
  2019 Andrej Shadura <andrewsh@debian.org>
-License: FTL or GPL-2.0
+License: FTL or GPL-2+
 
 License: FTL
                     The FreeType Project LICENSE
@@ -180,26 +191,23 @@ License: FTL
   Our home page can be found at
  .
     https://www.freetype.org
- .
- .
-
 
-License: GPL-2.0
-  This program is free software; you can redistribute it and/or modify
-  it under the terms of the GNU General Public License as published by
-  the Free Software Foundation; either version 2 of the License, or
-  (at your option) any later version.
- .
-  This program is distributed in the hope that it will be useful,
-  but WITHOUT ANY WARRANTY; without even the implied warranty of
-  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-  GNU General Public License for more details.
- .
-  You should have received a copy of the GNU General Public License
-  along with this program;  if not, write to the Free Software
-  Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
-  MA 02110-1301, USA.
- .
-  On Debian GNU/Linux systems, the complete text of the GNU General
-  Public License version 2 can be found in
-  `/usr/share/common-licenses/GPL-2'.
+License: GPL-2+
+ This program is free software; you can redistribute it and/or modify
+ it under the terms of the GNU General Public License as published by
+ the Free Software Foundation; either version 2 of the License, or
+ (at your option) any later version.
+ .
+ This program is distributed in the hope that it will be useful,
+ but WITHOUT ANY WARRANTY; without even the implied warranty of
+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ GNU General Public License for more details.
+ .
+ You should have received a copy of the GNU General Public License
+ along with this program;  if not, write to the Free Software
+ Foundation, Inc., 51 Franklin St, Fifth Floor, Boston,
+ MA 02110-1301, USA.
+ .
+ On Debian GNU/Linux systems, the complete text of the GNU General
+ Public License version 2 can be found in
+ `/usr/share/common-licenses/GPL-2'.

diff --git a/src/servo-freetype-sys/debian/debcargo.toml b/src/servo-freetype-sys/debian/debcargo.toml
index d0ef76456ba00c4994e62a7473a1b4fbe328986c..a0cbd5c5ae3373fecba5ba6a8246908926bfa8a2 100644 (file)
--- a/src/servo-freetype-sys/debian/debcargo.toml
+++ b/src/servo-freetype-sys/debian/debcargo.toml
@@ -1,5 +1,5 @@
 overlay = "."
 uploaders = ["Andrej Shadura <andrewsh@debian.org>"]
 excludes = ["freetype2/**"]
-[source]
-build_depends = ["libfreetype6-dev"]
+[packages.lib]
+depends = ["libfreetype6-dev"]

diff --git a/src/servo-freetype-sys/debian/patches/dylib.patch b/src/servo-freetype-sys/debian/patches/dylib.patch
new file mode 100644 (file)
index 0000000..00c380f
--- /dev/null
+++ b/src/servo-freetype-sys/debian/patches/dylib.patch
@@ -0,0 +1,10 @@
+--- a/build.rs
++++ b/build.rs
+@@ -29,6 +29,6 @@
+         .build();
+     let out_dir = env::var("OUT_DIR").unwrap();
+     println!("cargo:rustc-link-search=native={}/lib", dst.display());
+-    println!("cargo:rustc-link-lib=static=freetype");
++    println!("cargo:rustc-link-lib=dylib=freetype");
+     println!("cargo:outdir={}", out_dir);
+ }

diff --git a/src/servo-freetype-sys/debian/patches/series b/src/servo-freetype-sys/debian/patches/series
new file mode 100644 (file)
index 0000000..e6726ad
--- /dev/null
+++ b/src/servo-freetype-sys/debian/patches/series
@@ -0,0 +1 @@
+dylib.patch