Please merge emacs 23.2+1-7 (main) from Debian unstable (main)

Bug #705383 reported by Hajime Mizuno
8
This bug affects 1 person
Affects Status Importance Assigned to Milestone
emacs23 (Ubuntu)
Fix Released
Wishlist
Michael Vogt

Bug Description

Binary package hint: emacs23

Please merge emacs 23.2+1-7 from Debian unstable:

emacs23 (23.2+1-7ubuntu1) natty; urgency=low

  [ Hajime Mizuno ]
  * Merge from debian unstable(LP:#705383). Remaining changes:
  * debian/control.in:
    - Change Maintainer to Ubuntu Core Developers, per Ubuntu policy.
    - 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.
    - Require autotools-dev (>= 20100122.1) in Build-Depends, since
      the version in Karmic will fail due to a missing Perl module.
  * debian/control: Regenerate.
  * debian/copyright.in:
    - Remove text about removed files.
  * debian/copyright: Regenerate.
  * debian/emacsVER-common.postinst:
    - Don't install info files to info/dir. This happens
      automatically now.
  * debian/emacsVER-common.prerm:
    - Don't remove info files from info/dir. This happens
      automatically now.
  * debian/emacsVER-common.prerm:
    - Don't remove info files from info/dir. This happens
      automatically now.
  * debian/patches:
    - handle-dfsg-split.diff: 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.
  * fix-ftbfs-xft-fontconfig.diff to avoid FTBFS.
  * debian/patches/fix-menus.diff: Fix http://debbugs.gnu.org/6499
    (Emacs gets stuck waiting for menu input). (LP: #569914)

 -- Hajime Mizuno <email address hidden> Sun, 12 Dec 2010 11:24:28 +0000

emacs23 (23.2+1-7) unstable; urgency=low

  * Don't initialize the terminal twice. Previously a console-mode
    Emacs would send the escape sequence to switch to the alternate
    screen twice. At a minimum, this caused problems with screen.
    Thanks to Courtney Bane <email address hidden> for the
    report and the patch. (closes: #599463)

  * Fix the value for RIPEMD-160 in epg-digest-algorithm-alist
    according to RFC 4880. Thanks to Daniel Kahn Gillmor
    <email address hidden> for the report and the fix.
    (closes: #594510)

 -- Rob Browning <email address hidden> Sat, 11 Dec 2010 11:00:07 -0600

emacs23 (23.2+1-6) unstable; urgency=low

  * Build-depend on "bsd-mailx | mailx" rather than just "mailx" since
    the latter is a virtual package. Thanks to Cyril Brulebois
    <email address hidden> for the report, and thanks to Mehdi Dogguy
    <email address hidden> for the 23.2+1-5.1 NMU. (closes: #600826)

 -- Rob Browning <email address hidden> Fri, 26 Nov 2010 11:34:32 -0600

emacs23 (23.2+1-5) unstable; urgency=low

  * Apply upstream patches to prevent the string and unibyte-string
    functions from overflowing the stack
    (prevent-string-stack-overflow.diff,
    prevent-let-eval-apply-stack-overflow.diff, and
    use-safe-alloca-lisp-in-let-eval-apply-apply_lambda.diff). Thanks
    to Carl Worth <email address hidden> and Sven Joachim
    <email address hidden> for finding the patches (closes: #586459).

  * Apply upstream patch to prevent mail destined for
    mail-archive-file-name from being lost
    (fix-gnus-output-to-mail-with-live-rmail-buffers.diff). Thanks to
    Jeroen Nijhof <email address hidden> for the report and Sven
    Joachim <email address hidden> for tracking down the patch.
    (closes: #597255)

  * Remove debian-adjust-mail-from-addresses-patch.diff to stop
    adjusting the message-sendmail-f-is-evil default. Match the
    behavior of the Debian gnus package, Emacs upstream, and
    emacs-snapshot. Thanks to Artem Chuprina <email address hidden>
    for the report. (closes: #397757)

  * Apply upstream patch to fix the computation of the width of
    dual-width fonts (fix-fc-dual-font-width-calculation.diff).
    Thanks to mizuno hajime <email address hidden> for the report
    and Sven Joachim <email address hidden> for tracking down the
    patch. (closes: #588808)

 -- Rob Browning <email address hidden> Mon, 18 Oct 2010 00:17:56 -0500

Revision history for this message
Reinhard Tartler (siretart) wrote : Re: [Bug 705383] [NEW] Sync emacs 23.2+1-7 from Debian unstable

this needs to be a merge instead of a sync, we don't want to drop local ubuntu changes
--
Gruesse/greetings,
Reinhard Tartler, KeyID 945348A4

Revision history for this message
Hajime Mizuno (mizuno-as) wrote : Re: Sync emacs 23.2+1-7 from Debian unstable

thank you for response.

Can this be merged with the package of natty.
Are another request/report necessary for merge?

Revision history for this message
Hajime Mizuno (mizuno-as) wrote :

Please merge new Debian revision:

summary: - Sync emacs 23.2+1-7 from Debian unstable
+ Please merge emacs 23.2+1-7 (main) from Debian unstable (main)
Changed in emacs23 (Ubuntu):
status: New → Confirmed
description: updated
Revision history for this message
Artur Rona (ari-tczew) wrote :

Thank you for your work!

Could you create and attach debdiff between 23.2+1-7.dsc -> 23.2+1-7ubuntu1?

Revision history for this message
Hajime Mizuno (mizuno-as) wrote :

I tried debdiff between 23.2+1-7.dsc and 23.2+1-7ubuntu1.
but, debdiff is very large. It is because the Natty package contains ubuntu-restore-nondfsg-files.diff patch.

Artur Rona (ari-tczew)
Changed in emacs23 (Ubuntu):
importance: Undecided → Wishlist
Revision history for this message
Benjamin Drung (bdrung) wrote :

Please add a space in the LP number, otherwise it doesn't get recognized: "LP:#705383" -> "LP: #705383"

Michael Vogt (mvo)
Changed in emacs23 (Ubuntu):
assignee: nobody → Michael Vogt (mvo)
Michael Vogt (mvo)
Changed in emacs23 (Ubuntu):
status: Confirmed → In Progress
Revision history for this message
Launchpad Janitor (janitor) wrote :
Download full text (4.0 KiB)

This bug was fixed in the package emacs23 - 23.2+1-7ubuntu1

---------------
emacs23 (23.2+1-7ubuntu1) natty; urgency=low

  [ Hajime Mizuno ]
  * Merge from debian unstable(LP: #705383). Remaining changes:
  * debian/control.in:
    - Change Maintainer to Ubuntu Core Developers, per Ubuntu policy.
    - 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.
    - Require autotools-dev (>= 20100122.1) in Build-Depends, since
      the version in Karmic will fail due to a missing Perl module.
  * debian/control: Regenerate.
  * debian/copyright.in:
    - Remove text about removed files.
  * debian/copyright: Regenerate.
  * debian/emacsVER-common.postinst:
    - Don't install info files to info/dir. This happens
      automatically now.
  * debian/emacsVER-common.prerm:
    - Don't remove info files from info/dir. This happens
      automatically now.
  * debian/emacsVER-common.prerm:
    - Don't remove info files from info/dir. This happens
      automatically now.
  * debian/patches:
    - handle-dfsg-split.diff: 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.
  * fix-ftbfs-xft-fontconfig.diff to avoid FTBFS.
  * debian/patches/fix-menus.diff: Fix http://debbugs.gnu.org/6499
    (Emacs gets stuck waiting for menu input). (LP: #569914)

emacs23 (23.2+1-7) unstable; urgency=low

  * Don't initialize the terminal twice. Previously a console-mode
    Emacs would send the escape sequence to switch to the alternate
    screen twice. At a minimum, this caused problems with screen.
    Thanks to Courtney Bane <email address hidden> for the
    report and the patch. (closes: #599463)

  * Fix the value for RIPEMD-160 in epg-digest-algorithm-alist
    according to RFC 4880. Thanks to Daniel Kahn Gillmor
    <email address hidden> for the report and the fix.
    (closes: #594510)

emacs23 (23.2+1-6) unstable; urgency=low

  * Build-depend on "bsd-mailx | mailx" rather than just "mailx" since
    the latter is a virtual package. Thanks to Cyril Brulebois
    <email address hidden> for the report, and thanks to Mehdi Dogguy
    <email address hidden> for the 23.2+1-5.1 NMU. (closes: #600826)

emacs23 (23.2+1-5) unstable; urgency=low

  * Apply upstream patches to prevent the string and unibyte-string
    functions from overflowing the stack
    (prevent-string-stack-overflow.diff,
    prevent-let-eval-apply-stack-overflow.diff, and
    use-safe-alloca-lisp-in-let-eval-apply-apply_lambda.diff). Thanks
    to Carl Worth <email address hidden> and Sven Joachim
    <email address hidden> for finding the patches (closes: #586459).

  * Apply upstream patch to prevent mail destined for
    mail-archive-file-name from ...

Read more...

Changed in emacs23 (Ubuntu):
status: In Progress → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.