r46903 - in /packages/cimg/trunk/debian: changelog copyright remove_privacy_violating_js_code

[tille at users.alioth.debian.org]

Author: tille
Date: Tue Sep 16 08:08:39 2014
New Revision: 46903

URL: http://svn.debian.org/wsvn/debian-science/?sc=1&rev=46903
Log:
Fix build using pkg-config; make sure all privacy violating chunks are stripped from documentation

Modified:
    packages/cimg/trunk/debian/changelog
    packages/cimg/trunk/debian/copyright
    packages/cimg/trunk/debian/remove_privacy_violating_js_code

Modified: packages/cimg/trunk/debian/changelog
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/changelog?rev=46903&op=diff
==============================================================================
--- packages/cimg/trunk/debian/changelog	(original)
+++ packages/cimg/trunk/debian/changelog	Tue Sep 16 08:08:39 2014
@@ -1,8 +1,13 @@
-cimg (1.5.9+dfsg-2) UNRELEASED; urgency=medium
+cimg (1.5.9+dfsg-1) unstable; urgency=medium
 
   * New upstream version (adapted patches)
   * d/rules: adapt uscan syntax
   * d/watch: enable uscan to use correct version
+  * d/patches/use_pkg-config.patch: Newer imagemagick version does not supply
+    Magick++-config command any more but pkg-config can be used instead
+    (thanks for the hint to Bastien ROUCARIES)
+    Closes: #761564
+  * d/copyright: change sequence of Files paragraphs to fit DEP5
 
  -- Andreas Tille <tille at debian.org>  Mon, 15 Sep 2014 17:16:57 +0200
 

Modified: packages/cimg/trunk/debian/copyright
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/copyright?rev=46903&op=diff
==============================================================================
--- packages/cimg/trunk/debian/copyright	(original)
+++ packages/cimg/trunk/debian/copyright	Tue Sep 16 08:08:39 2014
@@ -4,6 +4,11 @@
 Source: http://cimg.sourceforge.net/download.shtml
 Files-Excluded: html/img/project-support.jpg
 
+Files: *
+Copyright: © 2000-2003 David Tschumperlé - INRIA Sophia-Antipolis. Odyssée group.
+           © 2004-2014 David Tschumperlé - GREYC UMR CNRS 6072, Image group.
+License: CeCILL
+
 Files: debian/*
 Copyright: © 2004-2007 Sam Hocevar <sam at zoy.org>
            © 2007 Christophe Prud'homme <prudhomm at debian.org>
@@ -41,8 +46,8 @@
 License: CeCILL
 
 Files: CImg.h
-Copyright: © 2000-2003, David Tschumperlé - INRIA Sophia-Antipolis. Odyssée group.
-           © 2004-2012, David Tschumperlé - GREYC UMR CNRS 6072, Image group.
+Copyright: © 2000-2003 David Tschumperlé - INRIA Sophia-Antipolis. Odyssée group.
+           © 2004-2014 David Tschumperlé - GREYC UMR CNRS 6072, Image group.
 License: CeCILL
  The main library file 'CImg.h' is *dual-licensed* :
  It can be either distributed under the CeCILL-C or CeCILL license.
@@ -52,11 +57,6 @@
        (the 'CImg.h' file can thus be used in closed-source products under certain
        conditions, please read carefully the license file).
      * CeCILL is close to (and even compatible with) the GNU GPL license.
-
-Files: *
-Copyright: © 2000-2003, David Tschumperlé - INRIA Sophia-Antipolis. Odyssée group.
-           © 2004-2012, David Tschumperlé - GREYC UMR CNRS 6072, Image group.
-License: CeCILL
 
 License: CeCILL
                CeCILL FREE SOFTWARE LICENSE AGREEMENT

Modified: packages/cimg/trunk/debian/remove_privacy_violating_js_code
URL: http://svn.debian.org/wsvn/debian-science/packages/cimg/trunk/debian/remove_privacy_violating_js_code?rev=46903&op=diff
==============================================================================
--- packages/cimg/trunk/debian/remove_privacy_violating_js_code	(original)
+++ packages/cimg/trunk/debian/remove_privacy_violating_js_code	Tue Sep 16 08:08:39 2014
@@ -15,6 +15,8 @@
        -e '/<script type="text\/javascript">.*flattr_url/,/lattr_btn.*<\/script>/d' \
        -e '/<script src="http:\/\/api.flattr.com\/button\/load.js.*javascript"><\/script>/d' \
        -e '/<a href="http:\/\/sourceforge.net\/donate\/index.php?group_id=[0-9]\+"><img src="http:\/\/images.sourceforge.net\/images\/project-support.jpg".* alt="Support This Project".*a>/d' \
+       -e '/<link rel="shortcut icon" type="image\/x-icon" href="http:\/\/cimg.sourceforge.net\/favicon.ico"><\/link>/d' \
+       -e 's/<img src="http:\/\/sourceforge.net\/sflogo.php[^>]\+><\/img>/SourceForge/' \
     $1
 
 # use local logo