~ubuntu-branches/ubuntu/karmic/kxstitch/karmic

Viewing all changes in revision 10.

  • Committer: Bazaar Package Importer
  • Author(s): Ilya Barygin
  • Date: 2009-06-20 10:58:28 UTC
  • mfrom: (1.1.3 upstream) (2.1.3 squeeze)
  • Revision ID: james.westby@ubuntu.com-20090620105828-kb6fd4ex7ba60hf6
Tags: 0.8.3.1-1ubuntu1
* Merge from Debian unstable (LP: #389803), remaining changes:
  - Add --without-arts to ./configure params
  - Add dh_icons
* Dropped Ubuntu changes:
  - debian/control: Replace build-depends on libmagick++9-dev with
    graphicsmagick-libmagick-dev-compat
    (upstream code now compiles with libmagick++-dev)
  - Add --with-extra-includes=/usr/include/GraphicsMagick to ./configure
    (Debian package adds /usr/include/ImageMagick)
  - debian/patches/gcc_minmax.patch: Fix FTBFS when building with gcc 4.2
    (fixed upstream)
  - Add quilt support, build-depend on quilt
    (added in Debian package)

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: