Changeset 7387


Ignore:
Timestamp:
04/07/12 21:33:23 (14 months ago)
Author:
cristy
Message:
 
Location:
ImageMagick/branches/ImageMagick-6
Files:
20 edited

Legend:

Unmodified
Added
Removed

  • ImageMagick/branches/ImageMagick-6/ImageMagick.spec

    r7386 r7387  
    33 
    44Name:           ImageMagick 
    5 Version:        %{VERSION} 
    6 Release:        %{Patchlevel} 
     5Version:        %{VERSION}.%{Patchlevel} 
     6Release:        3%{?dist} 
    77Summary:        Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats.  In addition resize, rotate, shear, distort and transform images. 
    88Group:          Applications/Multimedia 
    … …  
    7474however. 
    7575 
    76  
    77 %package doc 
    78 Summary: ImageMagick HTML documentation 
    79 Group: Documentation 
    80  
    81  
    8276%package djvu 
    8377Summary: DjVu plugin for ImageMagick 
    … …  
    8882This packages contains a plugin for ImageMagick which makes it possible to 
    8983save and load DjvU files from ImageMagick and libMagickCore using applications. 
     84 
     85 
     86%package doc 
     87Summary: ImageMagick HTML documentation 
     88Group: Documentation 
    9089 
    9190 
    … …  
    181180 
    182181make install DESTDIR=%{buildroot} INSTALL="install -p" 
    183 cp -a www/source %{buildroot}%{_datadir}/doc/%{name} 
     182cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VERSION} 
    184183rm %{buildroot}%{_libdir}/*.la 
    185184 
    … …  
    252251%{_libdir}/libMagickCore.so* 
    253252%{_libdir}/libMagickWand.so* 
     253%{_bindir}/[a-z]* 
    254254%{_libdir}/%{name}-%{VERSION} 
    255 %{_bindir}/[a-z]* 
    256255%{_sysconfdir}/%{name} 
    257256%{_libdir}/%{name}-%{VERSION} 
    … …  
    288287%files doc 
    289288%defattr(-,root,root,-) 
    290 %doc %{_datadir}/doc/%{name} 
     289%doc %{_datadir}/doc/%{name}-%{VERSION} 
    291290%doc LICENSE 
    292291 

  • ImageMagick/branches/ImageMagick-6/ImageMagick.spec.in

    r7158 r7387  
    33 
    44Name:           @PACKAGE_NAME@ 
    5 Version:        %{VERSION} 
    6 Release:        %{Patchlevel} 
     5Version:        %{VERSION}.%{Patchlevel} 
     6Release:        3%{?dist} 
    77Summary:        Use ImageMagick to convert, edit, or compose bitmap images in a variety of formats.  In addition resize, rotate, shear, distort and transform images. 
    88Group:          Applications/Multimedia 
    … …  
    7474however. 
    7575 
    76  
    77 %package doc 
    78 Summary: ImageMagick HTML documentation 
    79 Group: Documentation 
    80  
    81  
    8276%package djvu 
    8377Summary: DjVu plugin for ImageMagick 
    … …  
    8882This packages contains a plugin for ImageMagick which makes it possible to 
    8983save and load DjvU files from ImageMagick and libMagickCore using applications. 
     84 
     85 
     86%package doc 
     87Summary: ImageMagick HTML documentation 
     88Group: Documentation 
    9089 
    9190 
    … …  
    181180 
    182181make install DESTDIR=%{buildroot} INSTALL="install -p" 
    183 cp -a www/source %{buildroot}%{_datadir}/doc/%{name} 
     182cp -a www/source %{buildroot}%{_datadir}/doc/%{name}-%{VERSION} 
    184183rm %{buildroot}%{_libdir}/*.la 
    185184 
    … …  
    252251%{_libdir}/libMagickCore.so* 
    253252%{_libdir}/libMagickWand.so* 
     253%{_bindir}/[a-z]* 
    254254%{_libdir}/%{name}-%{VERSION} 
    255 %{_bindir}/[a-z]* 
    256255%{_sysconfdir}/%{name} 
    257256%{_libdir}/%{name}-%{VERSION} 
    … …  
    288287%files doc 
    289288%defattr(-,root,root,-) 
    290 %doc %{_datadir}/doc/%{name} 
     289%doc %{_datadir}/doc/%{name}-%{VERSION} 
    291290%doc LICENSE 
    292291 

  • ImageMagick/branches/ImageMagick-6/PerlMagick/Magick.pm

    r7059 r7387  
    123123A web page has been set up for this extension. See: 
    124124 
    125          file:///usr/local/share/doc/ImageMagick//www/perl-magick.html 
     125         file:///usr/local/share/doc/ImageMagick-6.7.6/www/perl-magick.html 
    126126         http://www.imagemagick.org/script/perl-magick.php 
    127127 

  • ImageMagick/branches/ImageMagick-6/config/configure.xml

    r7386 r7387  
    1919  <configure name="CONFIGURE_PATH" value="/usr/local/etc/ImageMagick/"/> 
    2020  <configure name="SHARE_PATH" value="/usr/local/share/ImageMagick-6.7.6"/> 
    21   <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick/"/> 
     21  <configure name="DOCUMENTATION_PATH" value="/usr/local/share/doc/ImageMagick-6.7.6"/> 
    2222  <configure name="EXECUTABLE_PATH" value="/usr/local/bin"/> 
    2323  <configure name="LIBRARY_PATH" value="/usr/local/lib/ImageMagick-6.7.6"/> 

  • ImageMagick/branches/ImageMagick-6/configure

    r7386 r7387  
    42444244eval "eval DATA_DIR=$datadir" 
    42454245 
    4246 eval "eval DOC_DIR=$docdir" 
     4246eval "eval DOC_DIR=$datadir/doc" 
    42474247 
    42484248eval "eval SYSCONF_DIR=$sysconfdir" 
    … …  
    3262732627# 
    3262832628# Path to ImageMagick documentation files 
    32629 DOCUMENTATION_RELATIVE_PATH="" 
     32629DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" 
    3263032630DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" 
    3263132631DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" 

  • ImageMagick/branches/ImageMagick-6/configure.ac

    r7386 r7387  
    193193eval "eval DATA_DIR=$datadir" 
    194194AC_SUBST(DATA_DIR) 
    195 eval "eval DOC_DIR=$docdir" 
     195eval "eval DOC_DIR=$datadir/doc" 
    196196AC_SUBST(DOC_DIR) 
    197197eval "eval SYSCONF_DIR=$sysconfdir" 
    … …  
    29742974# 
    29752975# Path to ImageMagick documentation files 
    2976 DOCUMENTATION_RELATIVE_PATH="" 
     2976DOCUMENTATION_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" 
    29772977DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}" 
    29782978DEFINE_DOCUMENTATION_PATH="${DOC_DIR}/${DOCUMENTATION_RELATIVE_PATH}/" 

  • ImageMagick/branches/ImageMagick-6/magick/magick-config.h

    r7386 r7387  
    6161/* Directory where ImageMagick documents live. */ 
    6262#ifndef MAGICKCORE_DOCUMENTATION_PATH 
    63 #define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick//" 
     63#define MAGICKCORE_DOCUMENTATION_PATH "/usr/local/share/doc/ImageMagick-6.7.6/" 
    6464#endif 
    6565 

  • ImageMagick/branches/ImageMagick-6/magick/version.h

    r7386 r7387  
    5959#endif 
    6060#define MagickFeatures MagickOpenMPFeature MagickOpenCLFeature MagickHDRIFeature MagickZeroConfigurationFeature 
    61 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick//index.html" 
     61#define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.7.6/index.html" 
    6262#if (MAGICKCORE_QUANTUM_DEPTH == 8) 
    6363#define MagickQuantumDepth  "Q8" 

  • ImageMagick/branches/ImageMagick-6/utilities/ImageMagick.1

    r6227 r7387  
    6868interprets and executes scripts written in the Magick Scripting Language (MSL). 
    6969.PP 
    70 For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick//index.html or http://www.imagemagick.org/. 
     70For more information about the ImageMagick, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.6/index.html or http://www.imagemagick.org/. 
    7171.SH SEE ALSO 
    7272convert(1), identify(1), composite(1), montage(1), compare(1), display(1), animate(1), import(1), conjure(1), quantize(5), miff(4) 
    7373 
    7474.SH COPYRIGHT 
    75 \fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP 
     75\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.6/www/license.html or http://www.imagemagick.org/script/license.php\fP 

  • ImageMagick/branches/ImageMagick-6/utilities/animate.1

    r6227 r7387  
    88The \fBanimate\fP program is a member of the ImageMagick(1) suite of tools.  Use it to animate an image or image sequence on any X server. 
    99 
    10 For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick//www/animate.html or http://www.imagemagick.org/script/animate.php. 
     10For more information about the animate command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.6/www/animate.html or http://www.imagemagick.org/script/animate.php. 
    1111.SH DESCRIPTION 
    1212Image Settings: 
    … …  
    9494.SH COPYRIGHT 
    9595 
    96 \fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP 
     96\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.6/www/license.html or http://www.imagemagick.org/script/license.php\fP 

  • ImageMagick/branches/ImageMagick-6/utilities/compare.1

    r6227 r7387  
    88The \fBcompare\fP program is a member of the ImageMagick(1) suite of tools.  Use it to mathematically and visually annotate the difference between an image and its reconstruction. 
    99 
    10 For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick//www/compare.html or http://www.imagemagick.org/script/compare.php. 
     10For more information about the compare command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.6/www/compare.html or http://www.imagemagick.org/script/compare.php. 
    1111.SH DESCRIPTION 
    1212Image Settings: 
    … …  
    6767.SH COPYRIGHT 
    6868 
    69 \fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP 
     69\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.6/www/license.html or http://www.imagemagick.org/script/license.php\fP 

  • ImageMagick/branches/ImageMagick-6/utilities/composite.1

    r6227 r7387  
    88The \fBcomposite\fP program is a member of the ImageMagick(1) suite of tools.  Use it to overlap one image over another. 
    99 
    10 For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick//www/composite.html or http://www.imagemagick.org/script/composite.php. 
     10For more information about the composite command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.6/www/composite.html or http://www.imagemagick.org/script/composite.php. 
    1111.SH DESCRIPTION 
    1212Image Settings: 
    … …  
    104104.SH COPYRIGHT 
    105105 
    106 \fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP 
     106\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.6/www/license.html or http://www.imagemagick.org/script/license.php\fP 

  • ImageMagick/branches/ImageMagick-6/utilities/conjure.1

    r6227 r7387  
    88The \fBconjure\fP program is a member of the ImageMagick(1) suite of tools.  Use it to process a Magick Scripting Language (MSL) script. The Magick scripting language (MSL) will primarily benefit those that want to accomplish custom image processing tasks but do not wish to program, or those that do not have access to a Perl interpreter or a compiler. 
    99 
    10 For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick//www/conjure.html or http://www.imagemagick.org/script/conjure.php. 
     10For more information about the conjure command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.6/www/conjure.html or http://www.imagemagick.org/script/conjure.php. 
    1111.SH DESCRIPTION 
    1212Image Settings: 
    … …  
    3232.SH COPYRIGHT 
    3333 
    34 \fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP 
     34\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.6/www/license.html or http://www.imagemagick.org/script/license.php\fP 

  • ImageMagick/branches/ImageMagick-6/utilities/convert.1

    r6261 r7387  
    88The \fBconvert\fP program is a member of the ImageMagick(1) suite of tools.  Use it to convert between image formats as well as resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more.   
    99 
    10 For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick//www/convert.html or http://www.imagemagick.org/script/convert.php. 
     10For more information about the convert command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.6/www/convert.html or http://www.imagemagick.org/script/convert.php. 
    1111.SH DESCRIPTION 
    1212Image Settings: 
    … …  
    269269 
    270270.SH COPYRIGHT 
    271 \fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP 
     271\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.6/www/license.html or http://www.imagemagick.org/script/license.php\fP 

  • ImageMagick/branches/ImageMagick-6/utilities/display.1

    r6227 r7387  
    88The \fBdisplay\fP program is a member of the ImageMagick(1) suite of tools.  Use it to display an image or image sequence on any X server. 
    99 
    10 For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick//www/display.html or http://www.imagemagick.org/script/display.php. 
     10For more information about the display command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.6/www/display.html or http://www.imagemagick.org/script/display.php. 
    1111.SH DESCRIPTION 
    1212Image Settings: 
    … …  
    126126.SH COPYRIGHT 
    127127 
    128 \fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP 
     128\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.6/www/license.html or http://www.imagemagick.org/script/license.php\fP 

  • ImageMagick/branches/ImageMagick-6/utilities/identify.1

    r6227 r7387  
    88The \fBidentify\fP program is a member of the ImageMagick(1) suite of tools.  It describes the format and characteristics of one or more image files. It also reports if an image is incomplete or corrupt. The information returned includes the image number, the file name, the width and height of the image, whether the image is colormapped or not, the number of colors in the image (by default off use \fI-define unique=true\fP option), the number of bytes in the image, the format of the image (JPEG, PNM, etc.), and finally the number of seconds it took to read and process the image. Many more attributes are available with the verbose option. 
    99 
    10 For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick//www/identify.html or http://www.imagemagick.org/script/identify.php. 
     10For more information about the identify command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.6/www/identify.html or http://www.imagemagick.org/script/identify.php. 
    1111.SH DESCRIPTION 
    1212Image Settings: 
    … …  
    6262.SH COPYRIGHT 
    6363 
    64 \fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP 
     64\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.6/www/license.html or http://www.imagemagick.org/script/license.php\fP 

  • ImageMagick/branches/ImageMagick-6/utilities/import.1

    r6708 r7387  
    88The \fBimport\fP program is a member of the ImageMagick(1) suite of tools.  Use it to capture some or all of an X server screen and save the image to a file. 
    99 
    10 For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick//www/import.html or http://www.imagemagick.org/script/import.php. 
     10For more information about the import command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.6/www/import.html or http://www.imagemagick.org/script/import.php. 
    1111.SH DESCRIPTION 
    1212Image Settings: 
    … …  
    9595.SH COPYRIGHT 
    9696 
    97 \fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP 
     97\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.6/www/license.html or http://www.imagemagick.org/script/license.php\fP 

  • ImageMagick/branches/ImageMagick-6/utilities/mogrify.1

    r6227 r7387  
    88The \fBmogrify\fP program is a member of the ImageMagick(1) suite of tools.  Use it to resize an image, blur, crop, despeckle, dither, draw on, flip, join, re-sample, and much more. This tool is similar to convert(1) except the original image file is overwritten with any changes you request. 
    99 
    10 For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick//www/mogrify.html or http://www.imagemagick.org/script/mogrify.php. 
     10For more information about the mogrify command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.6/www/mogrify.html or http://www.imagemagick.org/script/mogrify.php. 
    1111.SH DESCRIPTION 
    1212Image Settings: 
    … …  
    269269.SH COPYRIGHT 
    270270 
    271 \fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP 
     271\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.6/www/license.html or http://www.imagemagick.org/script/license.php\fP 

  • ImageMagick/branches/ImageMagick-6/utilities/montage.1

    r6227 r7387  
    88The \fBmontage\fP program is a member of the ImageMagick(1) suite of tools.  Use it to create a composite image by combining several separate images. The images are tiled on the composite image optionally adorned with a border, frame, image name, and more. 
    99 
    10 For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick//www/montage.html or http://www.imagemagick.org/script/montage.php. 
     10For more information about the montage command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.6/www/montage.html or http://www.imagemagick.org/script/montage.php. 
    1111.SH DESCRIPTION 
    1212Image Settings: 
    … …  
    132132.SH COPYRIGHT 
    133133 
    134 \fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP 
     134\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.6/www/license.html or http://www.imagemagick.org/script/license.php\fP 

  • ImageMagick/branches/ImageMagick-6/utilities/stream.1

    r6227 r7387  
    88\fBStream\fP is a lightweight tool to stream one or more pixel components of the image or portion of the image to your choice of storage formats.  It writes the pixel components as they are read from the input image a row at a time making \fBstream\fP desirable when working with large images or when you require raw pixel components. 
    99 
    10 For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick//www/stream.html or http://www.imagemagick.org/script/stream.php. 
     10For more information about the stream command, point your browser to file:///usr/local/share/doc/ImageMagick-6.7.6/www/stream.html or http://www.imagemagick.org/script/stream.php. 
    1111.SH DESCRIPTION 
    1212Image Settings: 
    … …  
    5555.SH COPYRIGHT 
    5656 
    57 \fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick//www/license.html or http://www.imagemagick.org/script/license.php\fP 
     57\fBCopyright (C) 1999-2012 ImageMagick Studio LLC. Additional copyrights and licenses apply to this software, see file:///usr/local/share/doc/ImageMagick-6.7.6/www/license.html or http://www.imagemagick.org/script/license.php\fP 
Note: See TracChangeset for help on using the changeset viewer.