control: tags -1 +patch +pending

Hi,

 Attached patch fix this FTBFS (and also lintian error that prevent to
 create .deb file), please check and consider to apply it.

 Also, I'll upload it to 10-delayed queue. If you don't want it, please
 tell me.


-- 
Regards,

 Hideki Yamane     henrich @ debian.or.jp/org
 http://wiki.debian.org/HidekiYamane
diff -Nru proofgeneral-4.3~pre130510/debian/changelog proofgeneral-4.3~pre130510/debian/changelog
--- proofgeneral-4.3~pre130510/debian/changelog	2013-05-18 15:57:05.000000000 +0900
+++ proofgeneral-4.3~pre130510/debian/changelog	2014-02-15 21:08:59.000000000 +0900
@@ -1,3 +1,19 @@
+proofgeneral (4.3~pre130510-1.1) unstable; urgency=medium
+
+  * Non-maintainer upload.
+  * debian/control
+    - add "Build-Depends: texlive-fonts-recommended" to fix FTBFS
+     (Closes: #738392)
+    - remove unnecessary "Build-Depends: texi2html" due to transtion
+      (see https://wiki.debian.org/Texi2htmlTransition)
+  * debian/patches
+    - add transition_to_makeinfo.patch to use makeinfo, instead of texi2html.
+      It eliminates lintian error.
+  * also update debian/proofgeneral-doc.doc-base to deal with changes with
+    above
+
+ -- Hideki Yamane <henr...@debian.org>  Sat, 15 Feb 2014 19:57:15 +0900
+
 proofgeneral (4.3~pre130510-1) unstable; urgency=low
 
   * New upstream release (Closes: #707331)
diff -Nru proofgeneral-4.3~pre130510/debian/control proofgeneral-4.3~pre130510/debian/control
--- proofgeneral-4.3~pre130510/debian/control	2013-05-18 15:57:05.000000000 +0900
+++ proofgeneral-4.3~pre130510/debian/control	2014-02-15 20:18:36.000000000 +0900
@@ -2,7 +2,7 @@
 Section: editors
 Priority: optional
 Maintainer: Hendrik Tews <hend...@askra.de>
-Build-Depends: debhelper (>= 9), texinfo, texlive-latex-recommended, texlive-generic-recommended, texi2html, emacs23-nox | emacs23 | emacs23-lucid | emacs24-nox | emacs24 | emacs24-lucid
+Build-Depends: debhelper (>= 9), texinfo, texlive-latex-recommended, texlive-generic-recommended, texlive-fonts-recommended, emacs23-nox | emacs23 | emacs23-lucid | emacs24-nox | emacs24 | emacs24-lucid
 Standards-Version: 3.9.4
 Homepage: http://proofgeneral.inf.ed.ac.uk
 
diff -Nru proofgeneral-4.3~pre130510/debian/patches/series proofgeneral-4.3~pre130510/debian/patches/series
--- proofgeneral-4.3~pre130510/debian/patches/series	2013-05-18 15:57:05.000000000 +0900
+++ proofgeneral-4.3~pre130510/debian/patches/series	2014-02-15 20:18:20.000000000 +0900
@@ -9,3 +9,4 @@
 fix-texinfo-5-1-bug.patch
 pg-image-bug.patch
 smartly-enable-prooftree.patch
+transition_to_makeinfo.patch
diff -Nru proofgeneral-4.3~pre130510/debian/patches/transition_to_makeinfo.patch proofgeneral-4.3~pre130510/debian/patches/transition_to_makeinfo.patch
--- proofgeneral-4.3~pre130510/debian/patches/transition_to_makeinfo.patch	1970-01-01 09:00:00.000000000 +0900
+++ proofgeneral-4.3~pre130510/debian/patches/transition_to_makeinfo.patch	2014-02-15 20:58:54.000000000 +0900
@@ -0,0 +1,27 @@
+Description: use makeinfo, instead of obsolete texi2html
+Author: Hideki Yamane <henr...@debian.org>
+Forwarded: no
+Last-Update: 2014-02-15
+
+Index: proofgeneral-4.3~pre130510/doc/Makefile.doc
+===================================================================
+--- proofgeneral-4.3~pre130510.orig/doc/Makefile.doc	2014-02-15 20:18:20.000000000 +0900
++++ proofgeneral-4.3~pre130510/doc/Makefile.doc	2014-02-15 20:49:28.388819142 +0900
+@@ -18,7 +18,7 @@
+ 
+ MAKE = make -f Makefile.doc 
+ MAKEINFO = makeinfo
+-TEXI2HTML = texi2html -expandinfo -number -split_chapter --noheader --css-include proofgen.css
++TEXI2HTML = makeinfo --html --ifinfo --number-sections --split=chapter --no-headers --css-include=proofgen.css
+ # `texinfo-tex' package contains texi2pdf
+ TEXI2PDF = texi2pdf
+ # `dviutils' package contains these useful utilities.
+@@ -50,7 +50,7 @@
+ 	$(TEXI2PDF) $< 
+ 
+ .texi.html:	
+-	$(TEXI2HTML) --output $* $< 
++	$(TEXI2HTML) $< 
+ 
+ default: doc
+ 
diff -Nru proofgeneral-4.3~pre130510/debian/proofgeneral-doc.doc-base proofgeneral-4.3~pre130510/debian/proofgeneral-doc.doc-base
--- proofgeneral-4.3~pre130510/debian/proofgeneral-doc.doc-base	2012-01-10 21:45:03.000000000 +0900
+++ proofgeneral-4.3~pre130510/debian/proofgeneral-doc.doc-base	2014-02-15 21:04:11.000000000 +0900
@@ -8,5 +8,5 @@
 Files: /usr/share/doc/proofgeneral-doc/proofgeneral.pdf
 
 Format: HTML
-Index: /usr/share/doc/proofgeneral-doc/html/ProofGeneral.html
+Index: /usr/share/doc/proofgeneral-doc/html/index.html
 Files: /usr/share/doc/proofgeneral-doc/html/*.html

Reply via email to