Please merge drupal6 6.14-1 (universe) from Debian testing (main)

[Artur Rona]

Binary package hint: drupal6

 drupal6 (6.14-1) unstable; urgency=low

   * New upstream release
     - Removed security patches integrate upstream
       + 20_SA-CORE-2009-007
     - Fixes multiple vulnerabilities (Ref: SA-CORE-2009-008)
       (Closes: #547140)

   * debian/control
     - Bumped Standard-Version to 3.8.3, no change needed

   * debian/compat
     - Switch debhelper compatibility to 7

   * debian/copyright
     - Added reference to copyright file with version

 -- Luigi Gangitano <email address hidden> Sun, 20 Sep 2009 04:57:57 +0200
drupal6 (6.13-1) UNRELEASED; urgency=low

   * New upstream release

 -- Luigi Gangitano <email address hidden> Mon, 13 Jul 2009 19:42:38 +0200

[Artur Rona (ari-tczew)]

Built fine on my-ppa.
https://edge.launchpad.net/~ari-tczew/+archive/drupal/+build/1335448/+files/buildlog_ubuntu-lucid-i386.drupal6_6.14-1ubuntu1~ppa0_FULLYBUILT.txt.gz

[Artur Rona (ari-tczew)]

Refreshed debdiff. Built fine on my-ppa.

[Bhavani Shankar (bhavi)]

I think this is a sync and not a merge.. Previous to your changes there was this one

6.12-1.1
Superseded in karmic-release on 2009-10-16

drupal6 (6.12-1.1) unstable; urgency=high

  * Non-maintainer upload by the Security Team.
  * Apply upstream patch to fix:
    - XSS in the forum module
    - Input format access bypass via signatures
    - Password leakage via URLs
    (no CVE id yet; SA-CORE-2009-007; Closes: #535435).

 -- Michael Bienia < <email address hidden>> Thu, 09 Jul 2009 00:21:04 +0100

which suggests that it was a sync

see bug no 479906 for the sync request

Regards

[Fabrice Coutadeur (fabricesp)]

Hi,

In the actual state, this is not a merge, as the changes made in Ubuntu has been integrated in upstream.

I'll invalidate this bug report: if you fix a bug, please report it in the changelog, and post the debdiff in the fixed bug, and do not open a new one.

Thanks,
Fabrice