r47081 - in /packages/cimg/trunk/debian: changelog cimg-doc.links control copyright

[tille at users.alioth.debian.org]

Author: tille
Date: Tue Jul 14 05:58:16 2015
New Revision: 47081

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=47081
Log:
Remove some unneeded paragraphs in d/copyright and upload to unstable

Added:
    packages/cimg/trunk/debian/cimg-doc.links
Modified:
    packages/cimg/trunk/debian/changelog
    packages/cimg/trunk/debian/control
    packages/cimg/trunk/debian/copyright

Modified: packages/cimg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/changelog?rev=47081&op=diff
==============================================================================
--- packages/cimg/trunk/debian/changelog	(original)
+++ packages/cimg/trunk/debian/changelog	Tue Jul 14 05:58:16 2015
@@ -1,4 +1,4 @@
-cimg (1.6.4+dfsg-1) UNRELEASED; urgency=medium
+cimg (1.6.4+dfsg-1) unstable; urgency=medium
 
   * adapted d/watch to new upstream location at Github
   * Remove non-free example file via Files-Excluded
@@ -7,7 +7,7 @@
   * Add needed Build-Depends from libcurl
   * Recreate docs with doxygen
 
- -- Andreas Tille <tille at debian.org>  Thu, 09 Jul 2015 16:40:53 +0200
+ -- Andreas Tille <tille at debian.org>  Mon, 13 Jul 2015 21:19:38 +0200
 
 cimg (1.5.9+dfsg-1) unstable; urgency=medium
 

Added: packages/cimg/trunk/debian/cimg-doc.links
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/cimg-doc.links?rev=47081&op=file
==============================================================================
--- packages/cimg/trunk/debian/cimg-doc.links	(added)
+++ packages/cimg/trunk/debian/cimg-doc.links	Tue Jul 14 05:58:16 2015
@@ -0,0 +1,2 @@
+/usr/share/javascript/jquery/jquery.js	/usr/share/doc/cimg-dev/html/jquery.js
+

Modified: packages/cimg/trunk/debian/control
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/control?rev=47081&op=diff
==============================================================================
--- packages/cimg/trunk/debian/control	(original)
+++ packages/cimg/trunk/debian/control	Tue Jul 14 05:58:16 2015
@@ -58,7 +58,7 @@
 Architecture: all
 Section: doc
 Depends: ${misc:Depends},
-         ${js:Depends}
+         libjs-jquery
 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=47081&op=diff
==============================================================================
--- packages/cimg/trunk/debian/copyright	(original)
+++ packages/cimg/trunk/debian/copyright	Tue Jul 14 05:58:16 2015
@@ -12,7 +12,7 @@
 
 Files: *
 Copyright: © 2000-2003 David Tschumperlé - INRIA Sophia-Antipolis. Odyssée group.
-           © 2004-2014 David Tschumperlé - GREYC UMR CNRS 6072, Image group.
+           © 2004-2015 David Tschumperlé - GREYC UMR CNRS 6072, Image group.
 License: CeCILL
 
 Files: debian/*
@@ -24,20 +24,6 @@
 Files: plugins/add_fileformat.h plugins/loop_macros.h
 Copyright: © 2007-2009 David Tschumperlé <David.Tschumperle at greyc.ensicaen.fr>
 License: CeCILL
-
-Files: plugins/cimg_ipl.h
-Copyright: © 2009  Hon-Kwok Fung <oldfung at graduate.hku.hk>
-License: CeCILL
-
-Files: plugins/cimgIPL.h
-Copyright: © 2008-2009 newleft <haibo.zheng at gmail.com>
-License: CeCILL
-
-Files: plugins/cimgmatlab.h
-Copyright: © 2004-2008 Francois Lauze
-License: LGPL
- On Debian systems, the complete text of the GNU Lesser General
- Public License can be found in `/usr/share/common-licenses/LGPL-3'.
 
 Files: plugins/draw_gradient.h plugins/nlmeans.h
 Copyright: © 2006-2009 Jerome Boulanger
@@ -55,9 +41,10 @@
 Copyright: © 2000-2003 David Tschumperlé - INRIA Sophia-Antipolis. Odyssée group.
            © 2004-2014 David Tschumperlé - GREYC UMR CNRS 6072, Image group.
 License: CeCILL
+Comment:
  The main library file 'CImg.h' is *dual-licensed* :
  It can be either distributed under the CeCILL-C or CeCILL license.
-Comment: 
+ .
      * CeCILL-C is adapted to the distribution of
        library components, and is close in its terms to the well known GNU LGPL license
        (the 'CImg.h' file can thus be used in closed-source products under certain