~ubuntu-branches/ubuntu/natty/kipi-plugins/natty

Viewing all changes in revision 40.

  • Committer: Bazaar Package Importer
  • Author(s): Scott Kitterman
  • Date: 2010-12-21 21:00:46 UTC
  • mfrom: (1.1.16 upstream) (2.4.4 experimental)
  • Revision ID: james.westby@ubuntu.com-20101221210046-6913hu107k1vecpp
Tags: 1.7.0-1ubuntu1
* Merge from Debian Experimental.  Remaining Ubuntu changes:
 - export KUBUNTU_DESKTOP_POT in debian/rules
 - build-depend on the nogtk version of lib-gpod
 - Remove build-dep on libcv-dev, libcvaux-dev, libhighgui-dev, failed MIR
   http://launchpad.net/bugs/324523
 - Delete red eye reduction from package description (not built into Ubuntu
   package)
 - Adjust versions kipi-plugins-common Conflicts/Replaces
 - Move Debian Vcs-* fields to XS-Debian-Vcs-* and add Kubuntu Vcs-*
 - Switch order of imagemagick | graphicsmagick-imagemagick-compat
   Recommends because imagemagick is in Main
* Move hugin, enblend, enfuse from recommends to suggests
* Switched back to source format 1 to match debian
  - Added quilt back to build-dep and debian/rules

expand all expand all

Show diffs side-by-side

added added

removed removed

Lines of Context: