[Pkg-gmagick-svn-commit] r59 - in branches/6.3.9.4.dfsg1-1: . debian debian/patches

[naoliv at alioth.debian.org]

Author: naoliv
Date: 2008-04-12 01:58:23 +0000 (Sat, 12 Apr 2008)
New Revision: 59

Added:
   branches/6.3.9.4.dfsg1-1/debian/patches/fix_index_links.patch
   branches/6.3.9.4.dfsg1-1/examples.jpg
Modified:
   branches/6.3.9.4.dfsg1-1/README
   branches/6.3.9.4.dfsg1-1/debian/changelog
Log:
Adding a new examples.jpg, with ImageMagick logo removed.
Better to add while recreating the tarball instead using a uuencoded version of it (the diff size would grow too much).



Modified: branches/6.3.9.4.dfsg1-1/README
===================================================================
--- branches/6.3.9.4.dfsg1-1/README	2008-04-11 20:06:27 UTC (rev 58)
+++ branches/6.3.9.4.dfsg1-1/README	2008-04-12 01:58:23 UTC (rev 59)
@@ -13,8 +13,8 @@
 2- Apply the orig.patches with quilt, and remove any copies of the
    non-DFSG-free logo.
    $ cd ImageMagick-x.y.z
-   $ rm images/configure.jpg images/logo.jpg images/logo.eps images/examples.jpg
- www/Magick++/ImageMagick.png
+   $ cp ../trunk/examples.jpg images/
+   $ rm images/configure.jpg images/logo.jpg images/logo.eps www/Magick++/ImageMagick.png
    $ env QUILT_PATCHES=../trunk/orig.patches quilt push
    $ rm -rf .pc
    $ cd ..

Modified: branches/6.3.9.4.dfsg1-1/debian/changelog
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/changelog	2008-04-11 20:06:27 UTC (rev 58)
+++ branches/6.3.9.4.dfsg1-1/debian/changelog	2008-04-12 01:58:23 UTC (rev 59)
@@ -1,9 +1,10 @@
-imagemagick (7:6.4.0.5.dfsg1-1) UNRELEASED; urgency=low
+imagemagick (7:6.4.0.7.dfsg1-1) UNRELEASED; urgency=low
 
   * New upstream release;
   * Fix libmagick++-dev dependency on libmagickwand-dev;
   * Fix EXIF regression when using identify (Closes: #473529);
   * Fix -fx image operator (Closes: #425782);
+  * Fix broken links in documentation (Closes: #475577);
 
  -- Nelson A. de Oliveira <naoliv at debian.org>  Sun, 06 Apr 2008 12:09:01 -0300
 

Added: branches/6.3.9.4.dfsg1-1/debian/patches/fix_index_links.patch
===================================================================
--- branches/6.3.9.4.dfsg1-1/debian/patches/fix_index_links.patch	                        (rev 0)
+++ branches/6.3.9.4.dfsg1-1/debian/patches/fix_index_links.patch	2008-04-12 01:58:23 UTC (rev 59)
@@ -0,0 +1,25 @@
+diff -ur imagemagick-6.4.0.7.dfsg1/www/index.html imagemagick-6.4.0.7.dfsg1.new/www/index.html
+--- imagemagick-6.4.0.7.dfsg1/www/index.html	2008-04-11 21:10:47.000000000 -0300
++++ imagemagick-6.4.0.7.dfsg1.new/www/index.html	2008-04-11 22:50:24.000000000 -0300
+@@ -29,10 +29,10 @@
+   <table id="titlebar" style="width: 100%;background-color: #f5f5f5" cellpadding="0" cellspacing="0" border="0" summary="ImageMagick">
+     <tbody>
+       <tr valign="top">
+-        <td align="left"><a href="../index.html"><img id="titlebar-west" src="../images/script.png" alt="[ImageMagick]" width="350" height="60" vspace="28" name="titlebar-west"/></a></td>
++        <td align="left"><a href="../www/index.html"><img id="titlebar-west" src="../images/script.png" alt="[ImageMagick]" width="350" height="60" vspace="28" name="titlebar-west"/></a></td>
+         <td align="left"><a href="https://secure.networkredux.com/affiliate/idevaffiliate.html?id=146" target="1083223680"><img id="titlebar-west" src="../images/networkredux.png" alt="[sponsor]" border="0" vspace="45" name="titlebar-west"/></a></td>
+         <td width="99%"><br /> </td>
+-        <td style="background-color: white" align="right"><a href="../index.html"><img src="../images/sprite.jpg" alt="" width="114" height="118" border="0" name="titlebar-east"/></a></td>
++        <td style="background-color: white" align="right"><a href="../www/index.html"><img src="../images/sprite.jpg" alt="" width="114" height="118" border="0" name="titlebar-east"/></a></td>
+         <td style="background-color: white" align="right"><a href="http://www.imagemagick.org/discourse-server/" target="1312114388"><img id="titlebar-east" src="../images/logo.jpg" alt="" width="114" height="118" border="0" name="titlebar-east"/></a></td>
+       </tr>
+     </tbody>
+@@ -46,7 +46,7 @@
+       <p><a href="#main">Skip to page contents</a></p>
+       <font size="-1">
+       <span>[</span>
+-      <a href="../index.html">About ImageMagick</a>
++      <a href="../www/index.html">About ImageMagick</a>
+   <span>]</span><br /><span>[</span>
+       <a href="../www/command-line-tools.html">Command-line Tools</a>
+       <a href="../www/command-line-processing.html" class="sub">Processing</a>

Added: branches/6.3.9.4.dfsg1-1/examples.jpg
===================================================================
(Binary files differ)


Property changes on: branches/6.3.9.4.dfsg1-1/examples.jpg
___________________________________________________________________
Name: svn:mime-type
   + application/octet-stream