lp:~logan/ubuntu/raring/auctex/debian-merge

Created by Logan Rosen and last modified
Get this branch:
bzr branch lp:~logan/ubuntu/raring/auctex/debian-merge
Only Logan Rosen can upload to this branch. If you are Logan Rosen please log in for upload directions.

Branch merges

Related bugs

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-maintscript-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)

14. By Matthias Klose

Recommend evince (main) instead of xpdf (universe).

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".

9. By Reinhard Tartler

Upload to hardy. Freeze exception granted in LP: #103631

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
This branch contains Public information 
Everyone can see this information.

Subscribers