Control: tag -1 + patch Hi,
Mattia Rizzolo wrote (08 Nov 2014 22:52:34 GMT) : > This bug caused ming being removed from soon-to-be-released testing (aka > jessie). > This cause a FTBFS on some package, and a package of mine too: > https://bugs.debian.org/768614 > I do hope someone want to do something for it (e.g. cherry-pick commits from > upstream). Done in the attached debdiff. However, as reported separately, the package FTBFS on current sid (but builds fine on Jessie), so I'm not NMU'ing as-is. Cheers, -- intrigeri
diff -u ming-0.4.5/debian/changelog ming-0.4.5/debian/changelog --- ming-0.4.5/debian/changelog +++ ming-0.4.5/debian/changelog @@ -1,3 +1,14 @@ +ming (1:0.4.5-1.3) unstable; urgency=medium + + * Non-maintainer upload. + * 10_Change_licence_of_PHP_wrapper.diff: new patch, cherry-picked from + upstream (Closes: #752629) + * debian/copyright: remove obsolete section about the license of + the PHP extension; it's now licensed under LGPL-2.1+ as (most of) + the rest of the code. + + -- intrigeri <intrig...@debian.org> Sun, 16 Nov 2014 16:45:41 +0100 + ming (1:0.4.5-1.2) unstable; urgency=medium * Non-maintainer upload with team member's permission. diff -u ming-0.4.5/debian/copyright ming-0.4.5/debian/copyright --- ming-0.4.5/debian/copyright +++ ming-0.4.5/debian/copyright @@ -52,87 +52,6 @@ GNU General Public License can be found in `/usr/share/common-licenses/GPL' and the Artistic Licence in `/usr/share/common-licenses/Artistic'. -The PHP extension code in php_ext is released under the PHP 3.01 license per -the following copyright: -/* - +----------------------------------------------------------------------+ - | PHP Version 5 | - +----------------------------------------------------------------------+ - | Copyright (c) 1997-2008 The PHP Group | - +----------------------------------------------------------------------+ - | This source file is subject to version 3.01 of the PHP license, | - | that is bundled with this package in the file LICENSE, and is | - | available through the world-wide-web at the following url: | - | http://www.php.net/license/3_01.txt | - | If you did not receive a copy of the PHP license and are unable to | - | obtain it through the world-wide-web, please send a note to | - | lice...@php.net so we can mail you a copy immediately. | - +----------------------------------------------------------------------+ - | Authors: Dave Hayden <d...@opaque.net> | - | Frank M. Kromann <f...@php.net> | - | Stuart R. Anderson <ander...@netsweng.com> | - | Klaus Rechert <kl...@rechert.de> | - +----------------------------------------------------------------------+ -*/ - -The text of the PHP licesne is: - --------------------------------------------------------------------- - The PHP License, version 3.01 -Copyright (c) 1999 - 2008 The PHP Group. All rights reserved. --------------------------------------------------------------------- - -Redistribution and use in source and binary forms, with or without -modification, is permitted provided that the following conditions -are met: - - 1. Redistributions of source code must retain the above copyright - notice, this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in - the documentation and/or other materials provided with the - distribution. - - 3. The name "PHP" must not be used to endorse or promote products - derived from this software without prior written permission. For - written permission, please contact gr...@php.net. - - 4. Products derived from this software may not be called "PHP", nor - may "PHP" appear in their name, without prior written permission - from gr...@php.net. You may indicate that your software works in - conjunction with PHP by saying "Foo for PHP" instead of calling - it "PHP Foo" or "phpfoo" - - 5. The PHP Group may publish revised and/or new versions of the - license from time to time. Each version will be given a - distinguishing version number. - Once covered code has been published under a particular version - of the license, you may always continue to use it under the terms - of that version. You may also choose to use such covered code - under the terms of any subsequent version of the license - published by the PHP Group. No one other than the PHP Group has - the right to modify the terms applicable to covered code created - under this License. - - 6. Redistributions of any form whatsoever must retain the following - acknowledgment: - "This product includes PHP software, freely available from - <http://www.php.net/software/>". - -THIS SOFTWARE IS PROVIDED BY THE PHP DEVELOPMENT TEAM ``AS IS'' AND -ANY EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, -THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A -PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE PHP -DEVELOPMENT TEAM OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, -INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -(INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR -SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) -HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, -STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED -OF THE POSSIBILITY OF SUCH DAMAGE. - -------------------------------------------------------------------- This software consists of voluntary contributions made by many diff -u ming-0.4.5/debian/patches/series ming-0.4.5/debian/patches/series --- ming-0.4.5/debian/patches/series +++ ming-0.4.5/debian/patches/series @@ -6,0 +7 @@ +10_Change_licence_of_PHP_wrapper.diff only in patch2: unchanged: --- ming-0.4.5.orig/debian/patches/10_Change_licence_of_PHP_wrapper.diff +++ ming-0.4.5/debian/patches/10_Change_licence_of_PHP_wrapper.diff @@ -0,0 +1,122 @@ +commit 85dcf3da54c84ddd1ae9d368467cbe1404be2dbe +Author: Sandro Santilli <s...@keybit.net> +Date: Thu Jun 26 19:06:24 2014 +0200 +Bug: https://github.com/libming/libming/issues/42 +Bug-Debian: https://bugs.debian.org/752629 +Origin: https://github.com/libming/libming/commit/85dcf3da54c84ddd1ae9d368467cbe1404be2dbe +Subject: Change licence of PHP wrapper back to LGPL-2.1+ + + This is a revival of a8bef56 + + Still reachable authors gave their approval here: + http://sourceforge.net/p/ming/mailman/message/32503963/ + + The change was needed to prevent Debian from moving the php wrapper + in the "nonfree" repository, and to fix an incompatibility in binary + packages. + + Closes #42 + +diff --git a/php_ext/ming.c b/php_ext/ming.c +index e9781f0..53f8074 100644 +--- a/php_ext/ming.c ++++ b/php_ext/ming.c +@@ -1,25 +1,27 @@ + /* +- +----------------------------------------------------------------------+ +- | PHP Version 5 | +- +----------------------------------------------------------------------+ +- | Copyright (c) 1997-2008 The PHP Group | +- +----------------------------------------------------------------------+ +- | This source file is subject to version 3.01 of the PHP license, | +- | that is bundled with this package in the file LICENSE, and is | +- | available through the world-wide-web at the following url: | +- | http://www.php.net/license/3_01.txt | +- | If you did not receive a copy of the PHP license and are unable to | +- | obtain it through the world-wide-web, please send a note to | +- | lice...@php.net so we can mail you a copy immediately. | +- +----------------------------------------------------------------------+ +- | Authors: Dave Hayden <d...@opaque.net> | +- | Frank M. Kromann <f...@php.net> | +- | Stuart R. Anderson <ander...@netsweng.com> | +- | Klaus Rechert <kl...@rechert.de> | +- +----------------------------------------------------------------------+ +-*/ ++ Ming, an SWF output library ++ ++ Copyright (C) 2004-2011 Sandro Santilli <s...@keybit.net> ++ Copyright (C) 2006-2013 Stuart R. Anderson <ander...@netsweng.com> ++ Copyright (C) 2004-2008 Klaus Rechert <kl...@rechert.de> ++ Copyright (C) 2008 Frank M. Kromann <f...@php.net> ++ Copyright (C) 2001-2002 Dave Hayden <d...@opaque.net> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. + +-/* $Id$ */ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++*/ + + #ifdef HAVE_CONFIG_H + #include "config.h" +diff --git a/php_ext/php_ming.h b/php_ext/php_ming.h +index 58c1078..499d8cc 100644 +--- a/php_ext/php_ming.h ++++ b/php_ext/php_ming.h +@@ -1,24 +1,27 @@ + /* +- +----------------------------------------------------------------------+ +- | PHP Version 5 | +- +----------------------------------------------------------------------+ +- | Copyright (c) 1997-2006 The PHP Group | +- +----------------------------------------------------------------------+ +- | This source file is subject to version 3.01 of the PHP license, | +- | that is bundled with this package in the file LICENSE, and is | +- | available through the world-wide-web at the following url: | +- | http://www.php.net/license/3_01.txt | +- | If you did not receive a copy of the PHP license and are unable to | +- | obtain it through the world-wide-web, please send a note to | +- | lice...@php.net so we can mail you a copy immediately. | +- +----------------------------------------------------------------------+ +- | Authors: Dave Hayden <d...@opaque.net> | +- | Frank M. Kromann <f...@php.net> | +- | Stuart R. Anderson <ander...@netsweng.com> | +- +----------------------------------------------------------------------+ +-*/ ++ Ming, an SWF output library ++ ++ Copyright (C) 2004-2011 Sandro Santilli <s...@keybit.net> ++ Copyright (C) 2006-2013 Stuart R. Anderson <ander...@netsweng.com> ++ Copyright (C) 2004-2008 Klaus Rechert <kl...@rechert.de> ++ Copyright (C) 2008 Frank M. Kromann <f...@php.net> ++ Copyright (C) 2001-2002 Dave Hayden <d...@opaque.net> ++ ++ This library is free software; you can redistribute it and/or ++ modify it under the terms of the GNU Lesser General Public ++ License as published by the Free Software Foundation; either ++ version 2.1 of the License, or (at your option) any later version. + +-/* $Id$ */ ++ This library is distributed in the hope that it will be useful, ++ but WITHOUT ANY WARRANTY; without even the implied warranty of ++ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU ++ Lesser General Public License for more details. ++ ++ You should have received a copy of the GNU Lesser General Public ++ License along with this library; if not, write to the Free Software ++ Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA ++ ++*/ + + #ifndef _PHP_MING_H + #define _PHP_MING_H
