servo-fontconfig: Use collapse_features instead of a control overlay

diff --git a/src/servo-fontconfig/debian/control b/src/servo-fontconfig/debian/control
deleted file mode 100644 (file)
index 4b82d2e..0000000
--- a/src/servo-fontconfig/debian/control
+++ /dev/null
@@ -1,43 +0,0 @@
-Source: rust-servo-fontconfig
-Section: rust
-Priority: optional
-Build-Depends: debhelper (>= 11),
- dh-cargo (>= 18),
- cargo:native <!nocheck>,
- rustc:native <!nocheck>,
- libstd-rust-dev <!nocheck>,
- librust-libc-0.2+default-dev <!nocheck>,
- librust-servo-fontconfig-sys-5+default-dev (>= 5.1.0-~~) <!nocheck>
-Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-Uploaders:
- Fabio Rafael da Rosa <fdr@fabiodarosa.org>
-Standards-Version: 4.4.1
-Vcs-Git: https://salsa.debian.org/rust-team/debcargo-conf.git [src/servo-fontconfig]
-Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/servo-fontconfig
-
-Package: librust-servo-fontconfig-dev
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- librust-libc-0.2+default-dev,
- librust-servo-fontconfig-sys-5+default-dev (>= 5.1.0-~~),
- librust-servo-fontconfig-sys-5+force-system-lib-dev (>= 5.1.0-~~)
-Provides:
- librust-servo-fontconfig+default-dev (= ${binary:Version}),
- librust-servo-fontconfig-0-dev (= ${binary:Version}),
- librust-servo-fontconfig-0+default-dev (= ${binary:Version}),
- librust-servo-fontconfig-0.5-dev (= ${binary:Version}),
- librust-servo-fontconfig-0.5+default-dev (= ${binary:Version}),
- librust-servo-fontconfig-0.5.1-dev (= ${binary:Version}),
- librust-servo-fontconfig-0.5.1+default-dev (= ${binary:Version}),
- librust-servo-fontconfig+force-system-lib-dev (= ${binary:Version}),
- librust-servo-fontconfig-0+force-system-lib-dev (= ${binary:Version}),
- librust-servo-fontconfig-0.5+force-system-lib-dev (= ${binary:Version}),
- librust-servo-fontconfig-0.5.1+force-system-lib-dev (= ${binary:Version})
-Description: Rust bindings for fontconfig - Rust source code
- This package contains the source for the Rust servo-fontconfig crate, packaged
- by debcargo for use with cargo and dh-cargo.
- This metapackage also enables feature "force_system_lib" for the Rust servo-
- fontconfig crate, by pulling in any additional dependencies needed by
- that feature.

diff --git a/src/servo-fontconfig/debian/control.debcargo.hint b/src/servo-fontconfig/debian/control.debcargo.hint
deleted file mode 100644 (file)
index f55391a..0000000
--- a/src/servo-fontconfig/debian/control.debcargo.hint
+++ /dev/null
@@ -1,53 +0,0 @@
-Source: rust-servo-fontconfig
-Section: rust
-Priority: optional
-Build-Depends: debhelper (>= 11),
- dh-cargo (>= 18),
- cargo:native <!nocheck>,
- rustc:native <!nocheck>,
- libstd-rust-dev <!nocheck>,
- librust-libc-0.2+default-dev <!nocheck>,
- librust-servo-fontconfig-sys-5+default-dev (>= 5.1.0-~~) <!nocheck>
-Maintainer: Debian Rust Maintainers <pkg-rust-maintainers@alioth-lists.debian.net>
-Uploaders:
- Fabio Rafael da Rosa <fdr@fabiodarosa.org>
-Standards-Version: 4.4.1
-Vcs-Git: https://salsa.debian.org/rust-team/debcargo-conf.git [src/servo-fontconfig]
-Vcs-Browser: https://salsa.debian.org/rust-team/debcargo-conf/tree/master/src/servo-fontconfig
-
-Package: librust-servo-fontconfig-dev
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- librust-libc-0.2+default-dev,
- librust-servo-fontconfig-sys-5+default-dev (>= 5.1.0-~~)
-Suggests:
- librust-servo-fontconfig+force-system-lib-dev (= ${binary:Version})
-Provides:
- librust-servo-fontconfig+default-dev (= ${binary:Version}),
- librust-servo-fontconfig-0-dev (= ${binary:Version}),
- librust-servo-fontconfig-0+default-dev (= ${binary:Version}),
- librust-servo-fontconfig-0.5-dev (= ${binary:Version}),
- librust-servo-fontconfig-0.5+default-dev (= ${binary:Version}),
- librust-servo-fontconfig-0.5.1-dev (= ${binary:Version}),
- librust-servo-fontconfig-0.5.1+default-dev (= ${binary:Version})
-Description: Rust bindings for fontconfig - Rust source code
- This package contains the source for the Rust servo-fontconfig crate, packaged
- by debcargo for use with cargo and dh-cargo.
-
-Package: librust-servo-fontconfig+force-system-lib-dev
-Architecture: any
-Multi-Arch: same
-Depends:
- ${misc:Depends},
- librust-servo-fontconfig-dev (= ${binary:Version}),
- librust-servo-fontconfig-sys-5+force-system-lib-dev (>= 5.1.0-~~)
-Provides:
- librust-servo-fontconfig-0+force-system-lib-dev (= ${binary:Version}),
- librust-servo-fontconfig-0.5+force-system-lib-dev (= ${binary:Version}),
- librust-servo-fontconfig-0.5.1+force-system-lib-dev (= ${binary:Version})
-Description: Rust bindings for fontconfig - feature "force_system_lib"
- This metapackage enables feature "force_system_lib" for the Rust servo-
- fontconfig crate, by pulling in any additional dependencies needed by
- that feature.

diff --git a/src/servo-fontconfig/debian/debcargo.toml b/src/servo-fontconfig/debian/debcargo.toml
index a716ccf72235653024612eacfcfcd12ccff4adf9..fe2cda01bbb9d26bfb5fc10fd8bd0e8ca3c79ef2 100644 (file)
--- a/src/servo-fontconfig/debian/debcargo.toml
+++ b/src/servo-fontconfig/debian/debcargo.toml
@@ -1,2 +1,3 @@
 overlay = "."
 uploaders = ["Fabio Rafael da Rosa <fdr@fabiodarosa.org>"]
+collapse_features = true