dia: new changes from Debian require merging

[Scott James Remnant (Canonical)]

New changes from Debian require merging into Ubuntu.

Some, if not all, of this work has been done automatically;
however the changes should be reviewed before signing and
uploading.

The new source package, along with various patches to aid
your review are available at:

        http://people.ubuntu.com/~scott/ongoing-merge/dia/

In particular see the REPORT file for details.

If this is the first time you have received one of these
bugs, or are just unsure what to do, see:

        http://people.ubuntu.com/~scott/ongoing-merge/README

 -- Your friendly neighbourhood Merge-O-Matic.

[Matt Zimmerman (mdz)]

*** Bug 11459 has been marked as a duplicate of this bug. ***

[Michael Vogt (mvo)]

No need to merge. The dia_0.94.0-4ubuntu1.diff.gz changes the build-depends
from python2.3-dev to python-dev. We have it to python2.4-dev and a merge will
not get us anything (and we are in upstream version freeze).

[Michael Vogt (mvo)]

no merge required, only the build-depends changed (and we have updated
build-depends already)