[Pkg-octave-commit] [SCM] Debian packaging for octave-image branch, master, updated. 2a33af7f881f52ceee040f929e4823ecea4342c7

[Rafael Laboissiere]

The following commit has been merged in the master branch:
commit 49e99b9282ee3e9dd9703e4a19dcaea7a4cd1d97
Author: Rafael Laboissiere <rafael at laboissiere.net>
Date:   Sun Mar 11 12:10:50 2012 +0100

    Drop Conflicts on graphicsmagick-imagemagick-compat
    
    The package seems to work fine with Graphics, but I just did some minimal
    tests.  Let us see what happens and whether we need to introduce again the
    conflict relationship.

diff --git a/debian/control b/debian/control
index a80f4f9..3070be0 100644
--- a/debian/control
+++ b/debian/control
@@ -13,7 +13,6 @@ Vcs-Browser: http://git.debian.org/?p=pkg-octave/octave-image.git
 Package: octave-image
 Architecture: any
 Depends: ${misc:Depends}, ${shlibs:Depends}, ${octave:Depends}, imagemagick
-Conflicts: graphicsmagick-imagemagick-compat
 Description: image manipulation for Octave
  This package provides functions for reading, writing, and processing
  images to Octave, a numerical computation software. The package
@@ -22,8 +21,4 @@ Description: image manipulation for Octave
  statistics, spatial and geometric transformations, morphological
  operations, linear filtering, and much more.
  .
- Note that this package only works with ImageMagick and not with
- GraphicsMagick, even when the compatibility layer is installed.  This
- is why this package conflicts with graphicsmagick-imagemagick-compat.
- .
  This Octave add-on package is part of the Octave-Forge project.

-- 
Debian packaging for octave-image