r46454 - in /packages/cimg/trunk/debian: changelog cimg-doc.doc-base cimg-doc.doc-base_add-this-if-pdf-is-back patches/20_build_examples_using_libopencv.patch

[tille at users.alioth.debian.org]

Author: tille
Date: Wed Jan 15 13:39:28 2014
New Revision: 46454

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46454
Log:
Fixed doc-base;  Problems building new version - upstream is informed

Removed:
    packages/cimg/trunk/debian/cimg-doc.doc-base_add-this-if-pdf-is-back
Modified:
    packages/cimg/trunk/debian/changelog
    packages/cimg/trunk/debian/cimg-doc.doc-base
    packages/cimg/trunk/debian/patches/20_build_examples_using_libopencv.patch

Modified: packages/cimg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/changelog?rev=46454&op=diff
==============================================================================
--- packages/cimg/trunk/debian/changelog	(original)
+++ packages/cimg/trunk/debian/changelog	Wed Jan 15 13:39:28 2014
@@ -1,10 +1,12 @@
 cimg (1.5.7+dfsg-1) UNRELEASED; urgency=low
 
+  TODO: Build issue with libtiff - asked upstream for advise
   * debian/copyright: Exclude non-free image file
     Closes: #735342
   * debian/control:
      - cme fix dpkg-control
      - remove inactive Uploaders
+  * debian/cimg-doc.doc-base:  Readd PDF documentation
 
  -- Andreas Tille <tille at debian.org>  Wed, 15 Jan 2014 14:03:50 +0100
 

Modified: packages/cimg/trunk/debian/cimg-doc.doc-base
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/cimg-doc.doc-base?rev=46454&op=diff
==============================================================================
--- packages/cimg/trunk/debian/cimg-doc.doc-base	(original)
+++ packages/cimg/trunk/debian/cimg-doc.doc-base	Wed Jan 15 13:39:28 2014
@@ -11,3 +11,7 @@
 Format: html
 Files: /usr/share/doc/cimg-dev/html/*
 Index: /usr/share/doc/cimg-dev/html/index.shtml
+
+Format: pdf
+Files: /usr/share/doc/cimg-dev/html/CImg_reference.pdf
+

Modified: packages/cimg/trunk/debian/patches/20_build_examples_using_libopencv.patch
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/patches/20_build_examples_using_libopencv.patch?rev=46454&op=diff
==============================================================================
--- packages/cimg/trunk/debian/patches/20_build_examples_using_libopencv.patch	(original)
+++ packages/cimg/trunk/debian/patches/20_build_examples_using_libopencv.patch	Wed Jan 15 13:39:28 2014
@@ -2,9 +2,9 @@
 LastChanged: Fri, 22 Jun 2012 14:56:54 +0200
 Description: Fix OpenCV library names we nedd to link against
 
---- CImg-1.5.6.orig/examples/Makefile
-+++ CImg-1.5.6/examples/Makefile
-@@ -137,7 +137,7 @@
+--- a/examples/Makefile
++++ b/examples/Makefile
+@@ -137,7 +137,7 @@ endif
  
  # Flags to enable OpenCV support.
  CIMG_OPENCV_CFLAGS = -Dcimg_use_opencv -I/usr/include/opencv