r47078 - in /packages/cimg/trunk/debian: changelog cimg-doc.install control copyright rules

[tille at users.alioth.debian.org]

Author: tille
Date: Sun Jul 12 19:36:30 2015
New Revision: 47078

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47078
Log:
Recreate docs using doxygen

Modified:
    packages/cimg/trunk/debian/changelog
    packages/cimg/trunk/debian/cimg-doc.install
    packages/cimg/trunk/debian/control
    packages/cimg/trunk/debian/copyright
    packages/cimg/trunk/debian/rules

Modified: packages/cimg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/changelog?rev=47078&op=diff
==============================================================================
--- packages/cimg/trunk/debian/changelog	(original)
+++ packages/cimg/trunk/debian/changelog	Sun Jul 12 19:36:30 2015
@@ -4,8 +4,10 @@
   * Remove non-free example file via Files-Excluded
     Closes: #791399
   * cme fix dpkg-control
-
- -- Andreas Tille <tille at debian.org>  Thu, 09 Jul 2015 16:36:02 +0200
+  * Add needed Build-Depends from libcurl
+  * Recreate docs with doxygen
+
+ -- Andreas Tille <tille at debian.org>  Thu, 09 Jul 2015 16:40:53 +0200
 
 cimg (1.5.9+dfsg-1) unstable; urgency=medium
 

Modified: packages/cimg/trunk/debian/cimg-doc.install
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/cimg-doc.install?rev=47078&op=diff
==============================================================================
--- packages/cimg/trunk/debian/cimg-doc.install	(original)
+++ packages/cimg/trunk/debian/cimg-doc.install	Sun Jul 12 19:36:30 2015
@@ -1,2 +1,2 @@
-html/*html html/img html/reference html/*.pdf html/*.png	usr/share/doc/cimg-dev/html
-debian/CImgLogo2.jpg						usr/share/doc/cimg-dev/html
+html/latex/refman.pdf	usr/share/doc/cimg-dev
+debian/CImgLogo2.jpg	usr/share/doc/cimg-dev/html

Modified: packages/cimg/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/control?rev=47078&op=diff
==============================================================================
--- packages/cimg/trunk/debian/control	(original)
+++ packages/cimg/trunk/debian/control	Sun Jul 12 19:36:30 2015
@@ -14,7 +14,10 @@
                      libhighgui-dev,
                      libminc-dev,
                      libtiff5-dev,
-                     libtiffxx5
+                     libtiffxx5,
+                     libcurl4-gnutls-dev | libcurl4-dev,
+                     texlive-latex-extra,
+                     texlive-fonts-recommended
 Standards-Version: 3.9.6
 Vcs-Browser: http://anonscm.debian.org/viewvc/debian-science/packages/cimg/trunk/
 Vcs-Svn: svn://anonscm.debian.org/debian-science/packages/cimg/trunk/
@@ -54,7 +57,8 @@
 Package: cimg-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
+Depends: ${misc:Depends},
+         ${js:Depends}
 Enhances: cimg-dev
 Description: documentation of cimg-dev imaging library
  The CImg Library is a C++ toolkit providing simple classes and functions

Modified: packages/cimg/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/copyright?rev=47078&op=diff
==============================================================================
--- packages/cimg/trunk/debian/copyright	(original)
+++ packages/cimg/trunk/debian/copyright	Sun Jul 12 19:36:30 2015
@@ -4,6 +4,11 @@
 Source: http://cimg.sourceforge.net/download.shtml
 Files-Excluded: html/img/project-support.jpg
                 examples/img/lena.pgm
+                html/jquery-*.min.js
+                html/*.pdf
+                html/doxygen_sqlite3.db
+                html/cimgmenu
+                
 
 Files: *
 Copyright: © 2000-2003 David Tschumperlé - INRIA Sophia-Antipolis. Odyssée group.

Modified: packages/cimg/trunk/debian/rules
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/rules?rev=47078&op=diff
==============================================================================
--- packages/cimg/trunk/debian/rules	(original)
+++ packages/cimg/trunk/debian/rules	Sun Jul 12 19:36:30 2015
@@ -34,6 +34,16 @@
 CHANGEFILES=gaussian_fit1d.cpp \
             use_RGBclass.cpp
 
+override_dh_clean:
+	dh_clean
+	rm -rf html/latex html/reference html/doxygen_sqlite3.db
+
+override_dh_auto_build:
+	dh_auto_build
+	cd html && doxygen CImg.doxygen && cd latex && make || true
+	# autogenerated makefile lacks a final pdflatex call to get references right (that's why the above '|| true')
+	cd html/latex && pdflatex refman
+
 override_dh_install:
 	dh_install
 	# In gaussian_fit1d.cpp the files is included into itself and thus the current directory needs to be in include path
@@ -42,6 +52,7 @@
 	    for file in $(CHANGEFILES) ; do \
 		sed -i "s?#define cimg_plugin \"examples/$$file\"?#define cimg_plugin \"$$file\"?" $$file ; \
 	    done
+	mv html/reference debian/$(doc)/usr/share/doc/cimg-dev/html
 
 override_dh_auto_clean:
 	-cd examples && $(MAKE) clean