[Sync request] Sync nxml-mode (20041004-7) from Debian unstable (main)

[Michael Olson]

Binary package hint: nxml-mode

nxml-mode (20041004-6ubuntu1) gutsy; urgency=low

  * debian/control:
    - (Build-Depends): Add dpatch.
    - (Build-Depends-Indep): Add emacs22.
    - (Maintainer): Set to Ubuntu MOTU.
    - (XSBC-Original-Maintainer): Set to Debian maintainer.
    - (Build-Conflicts): Remove.
    - (Depends): Add emacs22.
  * debian/emacsen-install:
    - Fix bashism.
    - Support Emacs 22.
    - Install symlinks to .el files.
    - Install symlinks to char-name and schema directories. This is much
      easier than patching rng-auto.el to DTRT.
  * debian/emacsen-startup:
    - Handle case where package is removed but not purged.
    - Don't include the shared site-lisp directory, since this causes
      problems when using `find-function' and `find-library'.
  * debian/patches:
    - debian-use-siteflag.dpatch: New patch that causes the build process
      to skip loading site files and user settings.
    - Turn all other Debian modifications into separate patches.
  * debian/rules:
    - Include dpatch support.
    - (clean): Fix lintian warning.
    - (binary-indep): Call dh_installemacsen for emacs22 as well.
      Provide --noscripts to later calls to dh_installemacsen so
      that the postinst scripts don't get called three times.

 -- Michael W. Olson (GNU address) <email address hidden> Wed, 04 Jul 2007 18:11:37 -0400

[Michael Olson (mwolson)]

New version of the debdiff. This one fixes a re-introduced problem where compilation was being called three times instead of once.

[Michael Bienia (geser)]

As this debdiff got included in the Debian package for nxml-mode, I'm just requesting a sync for it.

Changelog:

nxml-mode (20041004-7) unstable; urgency=low

  * Apply patches below from Michael Olson for Emacs 22 support.
    (Closes: #424773)
  [ Michael Olson ]
  * debian/control:
    - (Build-Depends): Add dpatch.
    - (Build-Depends-Indep): Add emacs22.
    - (Build-Conflicts): Remove.
    - (Depends): Add emacs22.
  * debian/emacsen-install:
    - Fix bashism.
    - Support Emacs 22.
    - Install symlinks to .el files.
    - Install symlinks to char-name and schema directories. This is much
      easier than patching rng-auto.el to DTRT.
  * debian/emacsen-startup:
    - Handle case where package is removed but not purged.
    - Don't include the shared site-lisp directory, since this causes
      problems when using `find-function' and `find-library'.
  * debian/patches:
    - debian-use-siteflag.dpatch: New patch that causes the build process
      to skip loading site files and user settings.
    - Turn all other Debian modifications into separate patches.
  * debian/rules:
    - Include dpatch support.
    - (clean): Fix lintian warning.
    - (binary-indep): Call dh_installemacsen for emacs22 as well.
      Provide --noscripts to later calls to dh_installemacsen so
      that the postinst scripts don't get called three times.

 -- Chris Lawrence <email address hidden> Sat, 14 Jul 2007 22:05:03 -0500

[Martin Pitt (pitti)]

Synced.