← Back to branch summary

~laney/ubuntu/quantal/emacs23/merge-23.4

Viewing all changes in revision 17.

  • Committer: Bazaar Package Importer
  • Author(s): Steve Langasek
  • Date: 2011-05-28 05:57:27 UTC
  • mfrom: (1.2.2 upstream) (4.1.11 sid)
  • Revision ID: james.westby@ubuntu.com-20110528055727-8fi47krcuac0kgvs
Tags: 23.3+1-1ubuntu1
* Merge from Debian unstable; remaining changes:
  - debian/patches/no_cpp_multiarch_dir_mangling.diff: make sure cpp
    doesn't mangle our multiarch include path due to a built-in macro
    matching the architecture name.
  - debian/control.in:
    - Conflict and Replace emacs23-common-non-dfsg, since we provide
      all of its features.
    - Do not suggest emacs23-common-non-dfsg.
    - Replace use of Source-Version with source:Version.
  - debian/copyright.in:
    - Remove text about removed files.
  - debian/emacsVER-common.{postinst,prerm}: Don't install info files to
    info/dir.  This happens automatically now.
  - debian/patches:
    - -Remove-files-that-appear-to-be-incompatible-with-the.patch: Remove.
    - ubuntu-restore-nondfsg-files.diff: New patch that reintroduces
      the non-DFSG files, with the exception of .elc files and info
      files, which use special characters and thus can't be easily
      represented in patch form.  These will be regenerated at build
      time.
  - debian/rules:
    - Do not install replacements for non-DFSG files.
    - Install all info files, not just efaq.
    - Avoid uselessly building info files a 2nd time.
* Dropped changes:
  - debian/patches/fix-ftbfs-xft-fontconfig.diff: merged in Debian.
  - debian/patches/fix-menus.diff: present upstream.
  - Require autotools-dev (>= 20100122.1) in Build-Depends: don't use
    versioned build-depends to work around buggy versions.
  - debian/patches/fix-decimal-point-in-font-size.diff: no documentation in
    the changelog for this change, from an upstream bug report but not
    upstreamed.
* debian/patches/no_cpp_multiarch_dir_mangling.diff: only include i386
  here; if the toolchain triplet matches the multiarch path, this is
  already handled in configure.in.

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: