dockerfile - fix build with the docinclude feature.

diff --git a/src/dockerfile/debian/changelog b/src/dockerfile/debian/changelog
index c53ecef54f904d984912973d25d4fa134930f981..6b72fe67adb6a65467aa678b006b91dbd97592b4 100644 (file)
--- a/src/dockerfile/debian/changelog
+++ b/src/dockerfile/debian/changelog
@@ -1,3 +1,11 @@
+rust-dockerfile (0.2.1-2) UNRELEASED-FIXME-AUTOGENERATED-DEBCARGO; urgency=medium
+
+  * Team upload.
+  * Package dockerfile 0.2.1 from crates.io using debcargo 2.6.0
+  * Fix build with the "docinclude" feature (Closes: #1030543)
+
+ -- Peter Michael Green <plugwash@debian.org>  Sun, 05 Feb 2023 00:03:11 +0000
+
 rust-dockerfile (0.2.1-1) unstable; urgency=medium
 
   * Package dockerfile 0.2.1 from crates.io using debcargo 2.6.0

diff --git a/src/dockerfile/debian/copyright.debcargo.hint b/src/dockerfile/debian/copyright.debcargo.hint
index 97b914a0aca23d8f3947686ec59abab53174e196..5de68beecb6f576ff9284b9396e675fa596c15fe 100644 (file)
--- a/src/dockerfile/debian/copyright.debcargo.hint
+++ b/src/dockerfile/debian/copyright.debcargo.hint
@@ -12,7 +12,7 @@ Comment:
  be correct information so you should review and fix this before uploading to
  the archive.
 
-Files: ./LICENSE
+Files: LICENSE
 Copyright: 2017 Anthony Josiah Dodd
 License: UNKNOWN-LICENSE; FIXME (overlay)
 Comment:

diff --git a/src/dockerfile/debian/patches/fix-build-docinclude-feature.patch b/src/dockerfile/debian/patches/fix-build-docinclude-feature.patch
new file mode 100644 (file)
index 0000000..15982a7
--- /dev/null
+++ b/src/dockerfile/debian/patches/fix-build-docinclude-feature.patch
@@ -0,0 +1,11 @@
+Index: dockerfile/src/lib.rs
+===================================================================
+--- dockerfile.orig/src/lib.rs
++++ dockerfile/src/lib.rs
+@@ -1,5 +1,4 @@
+-#![cfg_attr(feature="docinclude", feature(external_doc))]
+-#![cfg_attr(feature="docinclude", doc(include="../README.md"))]
++#![cfg_attr(feature="docinclude", doc = include_str!("../README.md"))]
+ 
+ mod builder;
+ mod instructions;

diff --git a/src/dockerfile/debian/patches/series b/src/dockerfile/debian/patches/series
new file mode 100644 (file)
index 0000000..e97007c
--- /dev/null
+++ b/src/dockerfile/debian/patches/series
@@ -0,0 +1 @@
+fix-build-docinclude-feature.patch