[Debian-ha-maintainers] Bug#959655: drbd-doc: diff for NMU version 8.4~20151102-1.1

[Sudip Mukherjee]

Control: tags 959655 + patch
Control: tags 959655 + pending


Dear maintainer,

I've prepared an NMU for drbd-doc (versioned as 8.4~20151102-1.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.

--
Regards
Sudip

diff -Nru drbd-doc-8.4~20151102/debian/changelog drbd-doc-8.4~20151102/debian/changelog
--- drbd-doc-8.4~20151102/debian/changelog	2016-03-15 18:03:58.000000000 +0000
+++ drbd-doc-8.4~20151102/debian/changelog	2020-06-26 23:21:19.000000000 +0100
@@ -1,3 +1,10 @@
+drbd-doc (8.4~20151102-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * Fix FTBFS. (Closes: #959655)
+
+ -- Sudip Mukherjee <sudipm.mukherjee at gmail.com>  Fri, 26 Jun 2020 23:21:19 +0100
+
 drbd-doc (8.4~20151102-1) unstable; urgency=medium
 
   * Import upstream changes up to commit 0d6393f.
diff -Nru drbd-doc-8.4~20151102/debian/patches/fix_inkscape.patch drbd-doc-8.4~20151102/debian/patches/fix_inkscape.patch
--- drbd-doc-8.4~20151102/debian/patches/fix_inkscape.patch	1970-01-01 01:00:00.000000000 +0100
+++ drbd-doc-8.4~20151102/debian/patches/fix_inkscape.patch	2020-06-26 23:15:09.000000000 +0100
@@ -0,0 +1,45 @@
+Description: Fix arguments to inkscape
+
+Author: Sudip Mukherjee <sudipm.mukherjee at gmail.com>
+Bug-Debian: https://bugs.debian.org/959655
+
+---
+
+--- drbd-doc-8.4~20151102.orig/makedoc/Makefile.am
++++ drbd-doc-8.4~20151102/makedoc/Makefile.am
+@@ -341,7 +341,7 @@ endif
+ # Generated images: Encapsulated PostScript from SVG
+ if USE_INKSCAPE
+ %.eps: %.svg
+-	$(INKSCAPE) --file=$< --export-area-drawing --export-eps=$@
++	$(INKSCAPE) --export-area-drawing --export-type=eps --export-filename=$@ $<
+ endif
+ 
+ # Generated images: PNG from SVG
+@@ -349,7 +349,7 @@ endif
+ if RENDER_SVG
+ %.png: %.svg
+ if USE_INKSCAPE
+-	$(INKSCAPE) --file=$< --export-dpi=90 --export-area-drawing --export-png=$@
++	$(INKSCAPE) --export-dpi=90 --export-area-drawing --export-type=png --export-filename=$@ $<
+ endif
+ if USE_RSVG
+ 	$(RSVG) --dpi-x=90 --dpi-y=90 --format=png $< $@
+@@ -358,7 +358,7 @@ endif
+ # Half-size SVG (from PNG)
+ %-small.png: %.svg
+ if USE_INKSCAPE
+-	$(INKSCAPE) --file=$< --export-dpi=45 --export-area-drawing --export-png=$@
++	$(INKSCAPE) --export-dpi=45 --export-area-drawing --export-type=png --export-filename=$@ $<
+ endif
+ if USE_RSVG
+ 	$(RSVG) --dpi-x=45 --dpi-y=45 --format=png $< $@
+@@ -367,7 +367,7 @@ endif
+ # Double-size SVG (from PNG)
+ %-large.png: %.svg
+ if USE_INKSCAPE
+-	$(INKSCAPE) --file=$< --export-dpi=180 --export-area-drawing --export-png=$@
++	$(INKSCAPE) --export-dpi=180 --export-area-drawing --export-type=png --export-filename=$@ $<
+ endif
+ if USE_RSVG
+ 	$(RSVG) --dpi-x=180 --dpi-y=180 --format=png $< $@
diff -Nru drbd-doc-8.4~20151102/debian/patches/series drbd-doc-8.4~20151102/debian/patches/series
--- drbd-doc-8.4~20151102/debian/patches/series	2016-03-15 17:51:28.000000000 +0000
+++ drbd-doc-8.4~20151102/debian/patches/series	2020-06-26 23:14:08.000000000 +0100
@@ -1,3 +1,4 @@
 drop-manpages.patch
 css-enhancements.patch
 mention-drbd.conf.5.patch
+fix_inkscape.patch