lp:~logan/ubuntu/raring/auctex/debian-merge
- Get this branch:
- bzr branch lp:~logan/ubuntu/raring/auctex/debian-merge
Branch merges
- Daniel Holbach (community): Approve
- Ubuntu branches: Pending requested
-
Diff: 20037 lines (+3440/-14776)122 files modified.pc/0001-Rationalize-HTML-documentation-targets-in-doc-Makefi.patch/doc/Makefile.in (+0/-199)
.pc/0002-Change-pdf-viewer-default-from-Evince-to-xpdf.patch/tex.el (+0/-5598)
.pc/0003-Fix-TeX-engine-alist-builtin-defvar.patch/tex.el (+0/-5598)
.pc/applied-patches (+8/-3)
.pc/use-firefox.patch/tex.el (+3/-3)
.pc/use-xdg-open.patch/tex.el (+3/-3)
context.el (+1/-1)
debian/+NOTE (+0/-6)
debian/+checks (+0/-1)
debian/=TODO (+0/-102)
debian/=TODO.org (+77/-0)
debian/COPYRIGHT (+18/-18)
debian/auctex.NEWS (+80/-0)
debian/auctex.README.Debian.eperl (+118/-0)
debian/auctex.bug-presubj.eperl (+29/-0)
debian/auctex.bug-script.eperl (+90/-0)
debian/auctex.config.eperl (+32/-0)
debian/auctex.dirs (+1/-0)
debian/auctex.doc-base.eperl (+55/-0)
debian/auctex.doc-base.preview-latex.eperl (+28/-0)
debian/auctex.docs (+7/-0)
debian/auctex.emacsen-install.eperl (+127/-0)
debian/auctex.emacsen-remove.eperl (+66/-0)
debian/auctex.emacsen-startup.eperl (+41/-0)
debian/auctex.info (+2/-0)
debian/auctex.install (+2/-0)
debian/auctex.links.eperl (+3/-0)
debian/auctex.lintian-overrides.eperl (+15/-0)
debian/auctex.manpages (+1/-0)
debian/auctex.postinst.eperl (+144/-0)
debian/auctex.postrm.eperl (+36/-0)
debian/auctex.preinst.eperl (+38/-0)
debian/auctex.templates (+21/-0)
debian/auctex.templates.eperl (+47/-0)
debian/auctex.triggers (+4/-0)
debian/auctex/NEWS (+0/-66)
debian/auctex/README.in (+0/-88)
debian/auctex/bug.presubj.in (+0/-27)
debian/auctex/bug.script.in (+0/-88)
debian/auctex/conffiles.in (+0/-10)
debian/auctex/config.in (+0/-51)
debian/auctex/cron.in (+0/-20)
debian/auctex/docbase.auctex.in (+0/-55)
debian/auctex/docbase.preview.in (+0/-28)
debian/auctex/install.in (+0/-132)
debian/auctex/lintian.in (+0/-20)
debian/auctex/lisp-startup.el.in (+0/-35)
debian/auctex/postinst.in (+0/-52)
debian/auctex/postrm.in (+0/-31)
debian/auctex/prerm.in (+0/-31)
debian/auctex/remove.in (+0/-61)
debian/auctex/templates (+0/-36)
debian/auctex/templates.in (+0/-56)
debian/auctex/update-auctex-elisp.8.in (+0/-68)
debian/auctex/update-auctex-elisp.in (+0/-32)
debian/auctex/update-auctex-install.8.in (+0/-69)
debian/auctex/update-auctex-install.in (+0/-29)
debian/changelog (+158/-0)
debian/compat (+1/-0)
debian/control (+8/-8)
debian/copyright (+51/-0)
debian/copyright.eperl (+42/-0)
debian/copyright.in (+0/-58)
debian/elcc.eperl (+54/-0)
debian/patches/0001-Rationalize-HTML-documentation-targets-in-doc-Makefi.patch (+0/-79)
debian/patches/0001-doc-Makefile.in-Rationalize-HTML-documentation-targe.patch (+79/-0)
debian/patches/0002-Change-pdf-viewer-default-from-Evince-to-xpdf.patch (+0/-25)
debian/patches/0002-doc-Makefile.in-Rationalize-dist-target.patch (+23/-0)
debian/patches/0003-Fix-TeX-engine-alist-builtin-defvar.patch (+0/-28)
debian/patches/0003-preview-latex-Makefile.in-Also-clean-PDF-docs.patch (+25/-0)
debian/patches/0004-Fix-ConTeXt-expand-options-defun.patch (+28/-0)
debian/patches/0005-Fix-preview-with-latest-ghostscript.patch (+54/-0)
debian/patches/0006-TeX-view-program-selection-Customize-for-Debian.patch (+33/-0)
debian/patches/0007-TeX-auto-global-Customize-for-Debian.patch (+23/-0)
debian/patches/0008-preview-image-type-Customize-for-Debian.patch (+27/-0)
debian/patches/series (+8/-3)
debian/po/POTFILES.in (+1/-1)
debian/po/cs.po (+42/-61)
debian/po/da.po (+112/-0)
debian/po/de.po (+48/-69)
debian/po/es.po (+72/-71)
debian/po/eu.po (+45/-61)
debian/po/fi.po (+44/-60)
debian/po/fr.po (+48/-70)
debian/po/gl.po (+44/-60)
debian/po/it.po (+44/-68)
debian/po/ja.po (+47/-53)
debian/po/ko.po (+129/-0)
debian/po/nl.po (+54/-127)
debian/po/pl.po (+95/-0)
debian/po/pt.po (+48/-69)
debian/po/pt_BR.po (+35/-57)
debian/po/ru.po (+47/-69)
debian/po/sk.po (+87/-0)
debian/po/sv.po (+49/-67)
debian/po/templates.pot (+13/-49)
debian/po/vi.po (+47/-53)
debian/preview-latex-style.README.Debian.eperl (+16/-0)
debian/preview-latex-style.bug-presubj.eperl (+29/-0)
debian/preview-latex-style.doc-base.eperl (+29/-0)
debian/preview-latex-style.docs (+2/-0)
debian/preview-latex-style.install (+1/-0)
debian/preview-latex-style.links (+1/-0)
debian/preview-latex-style/README.in (+0/-16)
debian/preview-latex-style/bug.presubj.in (+0/-28)
debian/preview-latex-style/docbase.in (+0/-29)
debian/preview-latex-style/lintian.in (+0/-10)
debian/preview-latex-style/postinst.in (+0/-29)
debian/preview-latex-style/postrm.in (+0/-29)
debian/preview-latex-style/prerm.in (+0/-26)
debian/rules (+98/-274)
debian/rules.eperl (+159/-0)
debian/rules.in (+0/-358)
debian/update-auctex-elisp.8.eperl (+78/-0)
debian/update-auctex-elisp.eperl (+139/-0)
debian/variables (+0/-77)
debian/watch (+2/-0)
doc/Makefile.in (+3/-3)
preview/latex/Makefile.in (+1/-1)
preview/preview.el (+15/-8)
tex-site.el.in (+1/-1)
tex.el (+4/-4)
Related bugs
Bug #987711: Please merge auctex 11.86-2.1 NMU (main) from Debian testing (main) | Undecided | Fix Released |
Related blueprints
Branch information
- Owner:
- Logan Rosen
- Status:
- Merged
Recent revisions
- 15. By Logan Rosen
-
* Merge from Debian unstable (LP: #987711). Remaining changes:
- Recommend xdg-utils.
- debian/patches/ use-xdg- open.patch: use xdg-open instead of hard-coded
xpdf.
- debian/patches/ use-firefox. patch: use firefox instead of hard-coded
'netscape'.
- debian/control: drop the "Vcs-Bzr" field as we're using
lp:ubuntu/auctex.
- Recommend evince (main) instead of xpdf (universe).
* [a55fbb7] Fix debian/control WRT emacs-snapshot.
Thanks to Luca Capello (Closes: #657761)
* [0ae74c4] Fix missing emacs-snapshot flavor trigger declaration of interest.
* [eeccc50] Fix incorrect space quoting.
Thanks to Baruch Siach, Michal Sojka (Closes: #675752)
* [2d0e039] Fix trigger iteration.
Thanks to Michal Sojka (Closes: #686366)
* [4678b5e] Update triggers for TeX Live >= 2012.
Thanks to Julian Gilbey, Norbert Preining (Closes: #681481)
* [6577f85] Update po/es.po.
Thanks to Omar Campagne
* [279ae72] Add po/sk.po.
Thanks to Ivan Masár
* [e4d9bca] Imported NMU: 11.86-10.1.
* Non-maintainer upload.
* Fix pending l10n issues. Debconf translations:
- Spanish; (Omar Campagne). Closes: #673627
- Slovak (Ivan Masár). Closes: #681530
* [04efbaa] Update po/da.po.
Thanks to Joe Dalton (Closes: #656684)
* [197365a] Add emacs-snapshot GNU Emacs flavor (again).
Thanks to Brendan Halpin, Rafael Laboissiere, Sven Joachim (Closes: #657761)
* [de265a9] Add po/pl.po.
Thanks to Michał Kułach (Closes: #664651)
* [7ba01cd] Upgrade po/cs.po.
Thanks to Miroslav Kure (Closes: #665364)
* [e18ef82] Upgrade Standards-Version to 3.9.3.
* [711871c] debian/auctex.docs: Remove 'ChangeLog*' entry.
* [e120e11] Add patch: preview-image-type: Customize for Debian.
(Closes: #276102) - thanks to Faheem Mitha
* [56dbf46] Explain how to use source specials rather than SyncTeX.
(Closes: #596684) - thanks to Alessandro Riggio
* [f395010] Move some preview docs from preview-latex-style to auctex.
* [6311a66] Replace patch: Fix ConTeXt expand options defun.
* [1352213] Replace patch: TeX-view-program- selection: Customize for
Debian.
* [04d9f33] debian/control: Switch from Conflicts to Breaks where
appropriate.
* [6fbed85] Format auctex.NEWS according to DDR 6.3.4.
* [b7abc18] Change ePerl source files suffix from ".in" to ".eperl".
* [b41ebfe] Update copyright.
* [30f9294] Use debhelper.
* [b40470b] Speed up build time by skipping Emacs byte-compilation.
* [2d91d94] update-auctex- elisp: Add daemon and no-act mode options.
* [094ab9a] Rewrite install-time code; thanks to Frank Küster, Alexei
Sheplyakov, Simon Pepping. (Closes: #370659, #413318, #478070)
* [1a1d022] debian/auctex. preinst: Protect dpkg-maintscrip t-helper
invocation.
* [3b1936f] debian/auctex. postinst: Clean old cruft: auto-loads.el~.
(Closes: #653212)
* [3e46ba1] Add a note to explain how to (partially) disable AUCTeX.
* [efb3fe8] Update po/nl.po; thanks to Jeroen Schot. (Closes: #654241)
* [a3d3630] Update po/pt.po; thanks to Pedro Ribeiro. (Closes: #654961)
* [33864b5] Update po/fr.po; thanks to Steve Petruzzello.
(Closes: #655062)
* [4513248] debian/auctex. triggers: Remove misplaced tree.
* [243b72b] debian/watch: Track new upstream sources.
* [4ca807c] Remove update-auctex- install and its references.
* [c15f329] Add patch: Rationalize dist target in doc/Makefile.in.
* [e625422] Add patch: TeX-auto-global: Customize for Debian.
* [8b2e941] Reorder the patch set.
* [819109c] Update po/sv.po; thanks to Martin Bagge. (Closes: #653560)
* [21140ef] Update po/de.po; thanks to Helge Kreutzmann.
(Closes: #653670)
* [e86103c] Update po/ru.po; thanks to Yuri Kozlov. (Closes: #653710)
* [925840e] Use dpkg triggers to parse new (La)TeX macros and style
files; thanks to Josh Triplett. (Closes: #478733)
* [3c6c060] Stop recommending doc-base; thanks to Jonathan Nieder.
(Closes: #610168)
* [99860b2] Clean up obsolete conffiles; thanks to Sven Joachim.
(Closes: #652962)
* [c238fc3] Don't install unneeded files; thanks to Sven Joachim.
(Closes: #652964)
* [5a6ba82] Drop emacs21, emacs22 and emacs-snapshot support.
* [cb09a98] Add debian/copyright to the source package.
* [0681817] Update po/nl.po; thanks to Jeroen Schot. (Closes: #652150)
* [76ae771] Upgrade Standards-Version to 3.9.2.
* [b669d50] Add po/ko.po; thanks to 강민지. (Closes: #631896)
* [f31efb1] Add patch: Also clean PDF docs; thanks to Matthias Kümmerer.
* [88f9ccc] Add patch: Fix preview with latest ghostscript; thanks to
Faheem Mitha.
* [adc29ae] Add language code to the Language field in po files missing it.
* [0a0c25b] Add po/da.po; thanks to Joe Dalton. (Closes: #619658)
* [f11007e] Imported NMU: 11.86-2.1.
* Non-maintainer upload.
* Add Patch: Remove preview/latex/preview. pdf in make clean
(Closes: #628787)
* Add Patch: Preview not working with new Ghostscript
(Patch from CVS) (Closes: #610714) - 13. By Reinhard Tartler
-
[ Lorenzo De Liso ]
* Merge from debian unstable (LP: #670942, #531680), remaining changes:
- Follow Ubuntu Maintainer spec.
- Recommend xdg-utils LP: #442467
* debian/patches/ use-xdg- open.patch: use xdg-open instead of hard-coded
xpdf, LP: #379874
* debian/patches/ use-firefox. patch: use firefox instead of hard-coded
'netscape'
* debian/control: drop the "Vcs-Bzr" field as we're using lp:ubuntu/auctex
* Dropped changes:
- drop dependency on texlive-base-bin. It was included for lp #148469, but
the current maintainer scripts no longer seem to use it: this change
was documented but never applied[ Reinhard Tartler ]
* Add patch documentation for use-xdg-open.patch and use-firefox.patch - 12. By Reinhard Tartler
-
* Merge from debian/squeeze. remaining changes:
- Follow Ubuntu Maintainer spec.
- use xdg-open instead of hard-coded xpdf, LP: #379874
- use firefox instead of hard-coded 'mozilla'
* drop dependency on texlive-base-bin. It was included for lp #148469, but
the current maintainer scripts no longer seem to use it.
* recommend xdg-utils instead of xdg-open, LP: #442467
* new upstream version fixes:
- "Preview of doc that includes PDF". LP: #439463
Closed based on information from bug submitter
- Some parsing defects. LP: #240135
At least the shown example does not show the defect anmore - 11. By Reinhard Tartler
-
* use xdg-open instead of hard-coded, LP: #379874
* add dependency alternative on emacs23, LP: #434688 - 10. By Martin Pitt
-
* Drop "xpdf-reader | pdf-viewer" recommends altogether. xpdf is in main,
and we already install a PDF viewer in all Ubuntu flavours.
* While I was at it, replace "gs-gpl | gs" with "ghostscript". - 8. By Michael Vogt
-
add missing depends on texlive-base-bin so that the postrm
does not fail on missing mktexlsr (LP: #148469) - 7. By Davide G. M. Salvetti <email address hidden>
-
* copyright.in, COPYRIGHT, variables: Update copyright.
* config.in, install.in, postinst.in, postrm.in, preinst.in, prerm.in,
remove.in: Linting.
* control (Build-Depends- Indep, Depends), install.in, remove.in,
rules.in, auctex/bug.script. in (FLAVORS), auctex/ conffiles. in,
auctex/update- auctex- elisp.in, auctex/ update- auctex- install. in: Added
"emacs22". (Closes: #425148, #426339, #432206, #432215)
* postinst.in, postrm.in, prerm.in: Check script arguments before calling
actions.
* variables (DINSTALL, DREMOVE): Check for "install-docs" in "${PATH}"
rather than by absolute location.* control (Build-
Depends- Indep): Dropped "tetex-bin".
(auctex/Recommends) : Dropped "tetex-base".
(preview-latex-style/ Depends) : Dropped "tetex-bin".
(Build-Depends- Indep): Replaced "texlive-base" (which should have been
"texlive-base-bin" ) by "texlive- latex-base" , which depends on
"texlive-base-bin" through "texlive-base" because LaTeX is needed by
"preview" at build time to build its documentation, and checked for by
"preview/configure" .
(auctex/Recommends) : Replaced "xpdf" by "xpdf-reader", since it is the
reader which is intended to be recommended.
(auctex/Depends, auctex/Recommends): Move "gs-gpl | gs" from "Depends"
to "Recommends", as it is not necessary at installation time and it is
only needed by "preview".
(preview-latex-style/ Recommends) : Added missing "doc-base"; note that
since "auctex" depends on "preview-latex-style" ), "doc-base" could be
safely removed from "auctex/Recommends" ; however, there's no harm
duplicating it there, for the sake of clearness.
(preview-latex-style/ Depends) : Replaced "texlive-base" by
"tex-common", following Debian TeX policy implementation to check if
"mktexlsr" has to be run.
(Build-Depends- Indep): Removed "ed", which is no more necessary.
(auctex/Depends): Removed "debianutils (>= 1.7)", which is no more
necessary (see #198778).
* auctex/install.in (do_install): Pass "LATEX=/bin/true",
"PDFLATEX=/bin/true" , and "TEX=/bin/true" to configure, in order to
skip the associated program-in-path test. This avoids an unnecessary
dependency on "texlive-latex-base" . (Closes: #408227, #428908) * install.in (do_install): Remove an extra space character in the
'setting-up' message.* po/pt_BR.po: Updated; thanks to André Luís Lopes. (Closes: #421529)
* po/ru.po: New file; thanks to Yuri Kozlov. (Closes: #434238)* auctex/
docbase. auctex. in, auctex/ docbase. preview. in: Remove
unsupported format "texinfo".* auctex/lintian.in, preview-
latex-style/ lintian. in: We do check for
"installdocs" existence.
* rules.in (DFILES, binary-indep-pls): Add "lintian" overrides for
"preview-latex-style" . * rules.in (clean): Test for "Makefile" existence before calling "make
distclean". - 6. By Reinhard Tartler
-
prefer emacs21 over emacs22 in build dependencies as discussed with
Martin Pitt <email address hidden>
Branch metadata
- Branch format:
- Branch format 7
- Repository format:
- Bazaar repository format 2a (needs bzr 1.16 or later)
- Stacked on:
- lp:ubuntu/raring/auctex