updates for auctex, planned NMU
Dear Davide, dear Makoto,
I have updated auctex to fix the following problems, and I am planning
to do an NMU in due time, but first I want to hear your opinion:
* preview.pdf is not found by texdoc, because it is installed into
/usr/share/doc/texmf
instead of
/usr/share/texmf/doc
(newer versions of tex-common/texlive don't use /u/s/doc/texmf anymore)
attached patch:
0001-install-preview-latex.pdf-into-u-s-texmf-doc-do-not-.patch
* lintian error: build-depends-on-obsolete-package texi2html
I have replaced texi2html with 'makeinfo --html' and have adapted
the build system as well as the dependencies
attached patch:
0002-fix-building-with-texinfo-5-makeinfo-html.patch
* lintian warning: debian standards version bump to 3.9.6
Only necessary change was removing the dependency on
dpkg (>= 1.15..) | install-info
since all this is now done via install-info triggers
attached patch:
0003-bump-standards-version-remove-dep-on-dpkg-install-in.patch
I have my private git repo I used to develop the patches, and used
git format-patch, so you can use git am 000*
I hope to hear from you soon, and let me know if I can help anything
more!
All the best
Norbert
------------------------------------------------------------------------
PREINING, Norbert http://www.preining.info
JAIST, Japan TeX Live & Debian Developer
GPG: 0x860CDC13 fp: F7D8 A928 26E3 16A1 9FA0 ACF0 6CAC A448 860C DC13
------------------------------------------------------------------------
>From 8a7b0d5a246b116a87a9c987b830d261a7a7d006 Mon Sep 17 00:00:00 2001
From: Norbert Preining <preining@debian.org>
Date: Fri, 10 Oct 2014 12:02:54 +0900
Subject: [PATCH 1/3] install preview-latex.pdf into /u/s/texmf/doc, do not
compress it
---
debian/changelog | 10 ++++++++++
debian/control | 2 +-
debian/preview-latex-style.doc-base.eperl | 2 +-
debian/rules | 4 ++++
debian/rules.eperl | 4 ++++
5 files changed, 20 insertions(+), 2 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index dbc957e..7670a09 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+auctex (11.87-1.1) UNRELEASED; urgency=medium
+
+ * Non-maintainer upload.
+ * build-depends on tex-common >= 4.01
+ * do not compress pdf documentation for texdoc searchability
+ * link docs into /usr/share/texmf/doc/
+ * preview-latex-style.doc-base.eperl: adjust link to pdf instead of pdf.gz
+
+ -- Norbert Preining <preining@debian.org> Fri, 10 Oct 2014 12:02:07 +0900
+
auctex (11.87-1) unstable; urgency=low
* [f416315] debian/auctex.postinst (triggered): Fix trigger iteration.
diff --git a/debian/control b/debian/control
index d8bde72..0fdfc2d 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: tex
Maintainer: Davide G. M. Salvetti <salve@debian.org>
Uploaders: OHURA Makoto <ohura@debian.org>
Standards-Version: 3.9.4
-Build-Depends-Indep: debhelper (>= 8), emacs23 | emacs24 | emacs-snapshot, eperl, ghostscript, po-debconf, tex-common, texlive-latex-base, texinfo, texi2html (>=1.76)
+Build-Depends-Indep: debhelper (>= 8), emacs23 | emacs24 | emacs-snapshot, eperl, ghostscript, po-debconf, tex-common (>= 4.01), texlive-latex-base, texinfo, texi2html (>=1.76)
Homepage: http://www.gnu.org/software/auctex/
Package: auctex
diff --git a/debian/preview-latex-style.doc-base.eperl b/debian/preview-latex-style.doc-base.eperl
index 81754e3..ec1d041 100644
--- a/debian/preview-latex-style.doc-base.eperl
+++ b/debian/preview-latex-style.doc-base.eperl
@@ -15,7 +15,7 @@ Abstract: The main purpose of this package is the extraction of certain
Section: Editors
Format: PDF
-Files: /usr/share/doc/preview-latex-style/preview.pdf.gz
+Files: /usr/share/doc/preview-latex-style/preview.pdf
<:
# local variables:
diff --git a/debian/rules b/debian/rules
index ef16499..318bf94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -84,6 +84,10 @@ override_dh_installdocs:
override_dh_installtex:
dh_installtex --package=preview-latex-style
+.PHONY: override_dh_compress
+override_dh_compress:
+ dh_compress -X.pdf
+
debian/po/templates.pot: debian/auctex.templates debian/po/*.po
umask 0022 && debconf-updatepo --verbose --podir=debian/po
@touch $@
diff --git a/debian/rules.eperl b/debian/rules.eperl
index 601c8b3..28620c4 100644
--- a/debian/rules.eperl
+++ b/debian/rules.eperl
@@ -78,6 +78,10 @@ override_dh_installdocs:
override_dh_installtex:
dh_installtex --package=preview-latex-style
+.PHONY: override_dh_compress
+override_dh_compress:
+ dh_compress -X.pdf
+
debian/po/templates.pot: debian/auctex.templates debian/po/*.po
umask 0022 && debconf-updatepo --verbose --podir=debian/po
@touch $@
--
2.1.1
>From d97def4c39edba7ebfee65ebdce3e5311fea7a30 Mon Sep 17 00:00:00 2001
From: Norbert Preining <preining@debian.org>
Date: Fri, 10 Oct 2014 12:05:47 +0900
Subject: [PATCH 2/3] fix building with texinfo (>= 5) makeinfo --html
---
debian/auctex.links.eperl | 3 --
debian/changelog | 5 ++--
debian/control | 2 +-
...e.in-Rationalize-HTML-documentation-targe.patch | 35 ++++++++++++----------
...2-doc-Makefile.in-Rationalize-dist-target.patch | 10 +++----
debian/preview-latex-style.links | 2 +-
debian/rules | 4 +--
debian/rules.eperl | 4 +--
8 files changed, 33 insertions(+), 32 deletions(-)
delete mode 100644 debian/auctex.links.eperl
diff --git a/debian/auctex.links.eperl b/debian/auctex.links.eperl
deleted file mode 100644
index bffe1ce..0000000
--- a/debian/auctex.links.eperl
+++ /dev/null
@@ -1,3 +0,0 @@
-<: $HTML="/usr/share/doc/auctex/HTML" :>//
-<:=$HTML:>/auctex/auctex.html <:=$HTML:>/auctex/index.html
-<:=$HTML:>/preview-latex/preview-latex.html <:=$HTML:>/preview-latex/index.html
diff --git a/debian/changelog b/debian/changelog
index 7670a09..9e890cc 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,12 +1,13 @@
-auctex (11.87-1.1) UNRELEASED; urgency=medium
+auctex (11.87-1.1) UNRELEASED; urgency=low
* Non-maintainer upload.
* build-depends on tex-common >= 4.01
* do not compress pdf documentation for texdoc searchability
* link docs into /usr/share/texmf/doc/
* preview-latex-style.doc-base.eperl: adjust link to pdf instead of pdf.gz
+ * fix building with latest makeinfo --html
- -- Norbert Preining <preining@debian.org> Fri, 10 Oct 2014 12:02:07 +0900
+ -- Norbert Preining <preining@debian.org> Fri, 10 Oct 2014 12:05:43 +0900
auctex (11.87-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index 0fdfc2d..d220a97 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Section: tex
Maintainer: Davide G. M. Salvetti <salve@debian.org>
Uploaders: OHURA Makoto <ohura@debian.org>
Standards-Version: 3.9.4
-Build-Depends-Indep: debhelper (>= 8), emacs23 | emacs24 | emacs-snapshot, eperl, ghostscript, po-debconf, tex-common (>= 4.01), texlive-latex-base, texinfo, texi2html (>=1.76)
+Build-Depends-Indep: debhelper (>= 8), emacs23 | emacs24 | emacs-snapshot, eperl, ghostscript, po-debconf, tex-common (>= 4.01), texlive-latex-base, texinfo (>= 5)
Homepage: http://www.gnu.org/software/auctex/
Package: auctex
diff --git a/debian/patches/0001-doc-Makefile.in-Rationalize-HTML-documentation-targe.patch b/debian/patches/0001-doc-Makefile.in-Rationalize-HTML-documentation-targe.patch
index b5947ee..5de938c 100644
--- a/debian/patches/0001-doc-Makefile.in-Rationalize-HTML-documentation-targe.patch
+++ b/debian/patches/0001-doc-Makefile.in-Rationalize-HTML-documentation-targe.patch
@@ -18,19 +18,26 @@ Subject: doc/Makefile.in: Rationalize HTML documentation targets
- Update references in extradist, html-docs, and clean targets.
---
- doc/Makefile.in | 23 ++++++++++++-----------
- 1 file changed, 12 insertions(+), 11 deletions(-)
+ doc/Makefile.in | 23 +++++++++++------------
+ 1 file changed, 11 insertions(+), 12 deletions(-)
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index d2be29e..32e77b9 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -72,18 +72,17 @@ install-man:
+--- auctex-debian.git.orig/doc/Makefile.in
++++ auctex-debian.git/doc/Makefile.in
+@@ -35,7 +35,7 @@
+ INSTALL=@INSTALL@
+ INSTALL_DATA=@INSTALL_DATA@
+ DESTDIR=
+-TEXI2HTML=@TEXI2HTML@
++TEXI2HTML=@MAKEINFO@ --html
+ TEXI2DVI=@TEXI2DVI@
+ TEXI2PDF=@TEXI2PDF@
+ MKINSTALLDIRS = ../mkinstalldirs
+@@ -72,18 +72,16 @@
dist: $(DISTTEXTS) preview-latex.info auctex.info tex-ref.pdf
-extradist: html/auctex_toc.html auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
-+extradist: auctex.htmls/auctex.html auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
++extradist: auctex.htmls/index.html auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
.PHONY: all info dvi dist install-auctex disttexts clean distclean \
maintainer-clean install-preview install-man html-docs extradist
@@ -42,32 +49,30 @@ index d2be29e..32e77b9 100644
- mkdir html
- cd html && $(TEXI2HTML) -split_node -I .. ../auctex.texi && \
- test ! -d auctex || { mv auctex/* . && rm -rf auctex ; }
-+auctex.htmls/auctex.html: $(AUCTEXTEXIFILES)
++auctex.htmls/index.html: $(AUCTEXTEXIFILES)
+ rm -rf auctex.htmls/
+ $(TEXI2HTML) --output=auctex.htmls --split=chapter auctex.texi
-+ ln -s auctex.html auctex.htmls/index.html
tex-ref.dvi: tex-ref.tex
$(TEX) tex-ref
-@@ -128,11 +127,13 @@ install-auctex: auctex.info tex-ref.pdf
+@@ -128,11 +126,12 @@
# preview
-preview-latex/index.html: $(PREVIEWTEXIFILES)
- rm -f preview-latex/*
- $(TEXI2HTML) preview-latex.texi
-+preview-latex.htmls/preview-latex.html: $(PREVIEWTEXIFILES)
++preview-latex.htmls/index.html: $(PREVIEWTEXIFILES)
+ rm -rf preview-latex.htmls/
+ $(TEXI2HTML) --output=preview-latex.htmls \
+ --split=chapter preview-latex.texi
-+ ln -s preview-latex.html preview-latex.htmls/index.html
-html-docs: preview-latex/index.html
-+html-docs: preview-latex.htmls/preview-latex.html
++html-docs: preview-latex.htmls/index.html
preview-dtxdoc.texi: ../preview/latex/preview.dtx preview-dtxdoc.pl
-$(PERL) preview-dtxdoc.pl ../preview/latex/preview.dtx \
-@@ -189,7 +190,7 @@ clean:
+@@ -189,7 +188,7 @@
rm -f *.dvi *.ps *.pdf *.aux *.cp *.fn *.ky *.log *~ \#*\# \
*.tp *.vr *.pg *.toc *.tp *.bak *.cps *.kys *.tps \
*.fns *.vrs *.pgs *.tmp *.html
diff --git a/debian/patches/0002-doc-Makefile.in-Rationalize-dist-target.patch b/debian/patches/0002-doc-Makefile.in-Rationalize-dist-target.patch
index f86e88a..0eb7eb5 100644
--- a/debian/patches/0002-doc-Makefile.in-Rationalize-dist-target.patch
+++ b/debian/patches/0002-doc-Makefile.in-Rationalize-dist-target.patch
@@ -7,16 +7,14 @@ Depend on the info target instead of on the individual info manuals.
doc/Makefile.in | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
-diff --git a/doc/Makefile.in b/doc/Makefile.in
-index 32e77b9..c3c4656 100644
---- a/doc/Makefile.in
-+++ b/doc/Makefile.in
-@@ -70,7 +70,7 @@ install-man:
+--- auctex-debian.git.orig/doc/Makefile.in
++++ auctex-debian.git/doc/Makefile.in
+@@ -70,7 +70,7 @@
done ; \
}
-dist: $(DISTTEXTS) preview-latex.info auctex.info tex-ref.pdf
+dist: $(DISTTEXTS) info tex-ref.pdf
- extradist: auctex.htmls/auctex.html auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
+ extradist: auctex.htmls/index.html auctex.ps auctex.pdf tex-ref.ps tex-ref.pdf
diff --git a/debian/preview-latex-style.links b/debian/preview-latex-style.links
index 3801b75..a7942a8 100644
--- a/debian/preview-latex-style.links
+++ b/debian/preview-latex-style.links
@@ -1 +1 @@
-/usr/share/doc/preview-latex-style/preview.pdf /usr/share/doc/texmf/latex/preview/preview.pdf
+/usr/share/doc/preview-latex-style/preview.pdf /usr/share/texmf/doc/latex/preview/preview.pdf
diff --git a/debian/rules b/debian/rules
index 318bf94..9fe8de2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -46,8 +46,8 @@ override_dh_auto_build:
rm --force auto-loads.el
$(MAKE) auto-loads.el
$(MAKE) tex-site.el
- cd doc && $(MAKE) auctex.htmls/auctex.html
- cd doc && $(MAKE) preview-latex.htmls/preview-latex.html
+ cd doc && $(MAKE) auctex.htmls/index.html
+ cd doc && $(MAKE) preview-latex.htmls/index.html
%:
dh $@ --exclude .eperl --with tex
diff --git a/debian/rules.eperl b/debian/rules.eperl
index 28620c4..2221e33 100644
--- a/debian/rules.eperl
+++ b/debian/rules.eperl
@@ -39,8 +39,8 @@ override_dh_auto_build:
$(MAKE) auto-loads.el
<: # tex-site.el depends on auto-loads.el :>//
$(MAKE) tex-site.el
- cd doc && $(MAKE) auctex.htmls/auctex.html
- cd doc && $(MAKE) preview-latex.htmls/preview-latex.html
+ cd doc && $(MAKE) auctex.htmls/index.html
+ cd doc && $(MAKE) preview-latex.htmls/index.html
%:
dh $@ --exclude .eperl --with tex
--
2.1.1
>From 94fef1478c35650b9964ce24f3326ad6a55edbe1 Mon Sep 17 00:00:00 2001
From: Norbert Preining <preining@debian.org>
Date: Fri, 10 Oct 2014 12:09:05 +0900
Subject: [PATCH 3/3] bump standards version - remove dep on dpkg |
install-info
---
debian/changelog | 3 ++-
debian/control | 4 ++--
2 files changed, 4 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 9e890cc..43ce2cf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,8 +6,9 @@ auctex (11.87-1.1) UNRELEASED; urgency=low
* link docs into /usr/share/texmf/doc/
* preview-latex-style.doc-base.eperl: adjust link to pdf instead of pdf.gz
* fix building with latest makeinfo --html
+ * bump standards version to 3.9.6: remove dep on dpkg | install-info
- -- Norbert Preining <preining@debian.org> Fri, 10 Oct 2014 12:05:43 +0900
+ -- Norbert Preining <preining@debian.org> Fri, 10 Oct 2014 12:08:39 +0900
auctex (11.87-1) unstable; urgency=low
diff --git a/debian/control b/debian/control
index d220a97..b9b78e2 100644
--- a/debian/control
+++ b/debian/control
@@ -3,13 +3,13 @@ Priority: optional
Section: tex
Maintainer: Davide G. M. Salvetti <salve@debian.org>
Uploaders: OHURA Makoto <ohura@debian.org>
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
Build-Depends-Indep: debhelper (>= 8), emacs23 | emacs24 | emacs-snapshot, eperl, ghostscript, po-debconf, tex-common (>= 4.01), texlive-latex-base, texinfo (>= 5)
Homepage: http://www.gnu.org/software/auctex/
Package: auctex
Architecture: all
-Depends: emacs23 | emacs24 | emacs-snapshot, preview-latex-style, dpkg (>= 1.15.4) | install-info, ${misc:Depends}
+Depends: emacs23 | emacs24 | emacs-snapshot, preview-latex-style, ${misc:Depends}
Recommends: ghostscript, texlive-latex-recommended, xpdf | evince | evince-gtk
Suggests: catdvi, dvipng, lacheck
Breaks: emacspeak (<= 17.0-1)
--
2.1.1
Reply to: