document-features: work around #1023413

diff --git a/src/document-features/debian/changelog b/src/document-features/debian/changelog
index f305006d4cd940e3c07e7c8c68a5aace4779cc2a..0cab047991360234644b05b7cfd19b33d2c361a8 100644 (file)
--- a/src/document-features/debian/changelog
+++ b/src/document-features/debian/changelog
@@ -1,4 +1,11 @@
-rust-document-features (0.2.6-1) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+rust-document-features (0.2.6-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Package document-features 0.2.6 from crates.io using debcargo 2.5.0
+  * Work around #1023413 in a more principled fashion
+
+ -- Daniel Kahn Gillmor <dkg@fifthhorseman.net>  Wed, 02 Nov 2022 17:44:26 -0400
+
+rust-document-features (0.2.6-1) UNRELEASED; urgency=medium
 
   * Package document-features 0.2.6 from crates.io using debcargo 2.5.0
 

diff --git a/src/document-features/debian/patches/add-comment.patch b/src/document-features/debian/patches/add-comment.patch
deleted file mode 100644 (file)
index 8da33b8..0000000
--- a/src/document-features/debian/patches/add-comment.patch
+++ /dev/null
@@ -1,12 +0,0 @@
-Description: restore comment to Cargo.toml for internal tests
-Author: Daniel Kahn Gillmor <dkg@fifthhorseman.net>
-Forwarded: https://github.com/slint-ui/document-features/issues/15
-
---- a/Cargo.toml
-+++ b/Cargo.toml
-@@ -37,4 +37,5 @@
- 
- [features]
- default = []
-+## Internal feature used only for the tests, don't enable
- self-test = []

diff --git a/src/document-features/debian/patches/series b/src/document-features/debian/patches/series
deleted file mode 100644 (file)
index 51afcad..0000000
--- a/src/document-features/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-add-comment.patch

diff --git a/src/document-features/debian/rules b/src/document-features/debian/rules
new file mode 100755 (executable)
index 0000000..3868d48
--- /dev/null
+++ b/src/document-features/debian/rules
@@ -0,0 +1,9 @@
+#!/usr/bin/make -f
+%:
+       dh $@ --buildsystem cargo
+
+override_dh_auto_test:
+       dh_auto_test -- test --all
+
+override_dh_clean:
+       dh_clean -XCargo.toml.orig

diff --git a/src/document-features/debian/rules.debcargo.hint b/src/document-features/debian/rules.debcargo.hint
new file mode 100755 (executable)
index 0000000..92c239b
--- /dev/null
+++ b/src/document-features/debian/rules.debcargo.hint
@@ -0,0 +1,6 @@
+#!/usr/bin/make -f
+%:
+       dh $@ --buildsystem cargo
+
+override_dh_auto_test:
+       dh_auto_test -- test --all