Package: release.debian.org Severity: normal User: release.debian....@packages.debian.org Usertags: unblock
Dear release team, Please unblock package elmerfem version 6.1.0.svn.5396.dfsg2-1. It fixes RC bug #687954. File in attachment was produced using command: $ debdiff elmerfem_6.1.0.svn.5396.dfsg-5.2.dsc elmerfem_6.1.0.svn.5396.dfsg2-1.dsc | \ filterdiff -x '*tetgen*' > elmerfem_6.1.0.svn.5396.dfsg-5.2:6.1.0.svn.5396.dfsg2-1.diff Thanks
diff -Nru elmerfem-6.1.0.svn.5396.dfsg/debian/changelog elmerfem-6.1.0.svn.5396.dfsg2/debian/changelog --- elmerfem-6.1.0.svn.5396.dfsg/debian/changelog 2012-05-26 01:53:42.000000000 +0300 +++ elmerfem-6.1.0.svn.5396.dfsg2/debian/changelog 2012-09-24 20:24:55.000000000 +0300 @@ -1,3 +1,20 @@ +elmerfem (6.1.0.svn.5396.dfsg2-1) unstable; urgency=low + + * Team upload. + * Delete non-free and unnecessary files from tarball: + - ElmerGUI/Application/plugins/tetgen.h + - misc/tetgen_plugin/* + (Closes: #687954) + * Add debian/patches/no-tetgen.patch: fix build without tetgen plugin. + * Add script debian/elmerfem_get-orig-source.sh. + * Add get-orig-source section in debian/rules. + * Update debian/copyright: + - update debian/copyright in according to Copyright format 1.0 + - add missed copyright holders and licenses + - add info how to repack orig tarball + + -- Boris Pek <tehnic...@mail.ru> Mon, 24 Sep 2012 20:21:17 +0300 + elmerfem (6.1.0.svn.5396.dfsg-5.2) unstable; urgency=low * Non-maintainer upload. diff -Nru elmerfem-6.1.0.svn.5396.dfsg/debian/copyright elmerfem-6.1.0.svn.5396.dfsg2/debian/copyright --- elmerfem-6.1.0.svn.5396.dfsg/debian/copyright 2011-05-04 21:40:34.000000000 +0300 +++ elmerfem-6.1.0.svn.5396.dfsg2/debian/copyright 2012-09-24 20:24:44.000000000 +0300 @@ -1,19 +1,28 @@ -Format-Specification: http://wiki.debian.org/Proposals/CopyrightFormat +Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ Debianized-By: Adam C. Powell, IV <hazel...@debian.org> Debianized-Date: Fri, 18 Jul 2008 13:01:45 -0400 -Upstream-Author: CSC -- IT Center for Science Ltd -Original-Source: http://www.csc.fi/elmer/ - -Notes: I removed the directories mathlibs, umfpack, elmergrid/src/metis, and - post/src/fonts/TrueType from the upstream tarball because they were either - non-free (metis) or redunadnt with other Debian packages (mathlibs and - umfpack; TrueType contains ttf-freefont files). I also removed the notes - about those packages from the quote below of the upstream copyright statement, - which you can see in full in the LICENSES file. And I removed the file - elmergrid/acx_metis.m4 because some consider the QPL non-free. +Upstream-Name: Elmer +Upstream-Contact: + CSC - IT Center for Science Ltd. (http://www.csc.fi/english/pages/elmer/contact) +Source: http://www.csc.fi/english/pages/elmer/sources + Directories mathlibs, umfpack, elmergrid/src/metis, and post/src/fonts/TrueType + were removed from the upstream tarball because they are either non-free (metis) + or redundant with other Debian packages (mathlibs and umfpack; TrueType + contains ttf-freefont files). Notes about these packages were also removed from + the quote below of the upstream copyright statement, which you can see in full + in the LICENSES file. File elmergrid/acx_metis.m4 was removed because some + consider the QPL non-free. Files misc/tetgen_plugin/plugin/tetgen.* and + ElmerGUI/Application/plugins/tetgen.h were removed because TetGen uses non-free + license (MIT license with exceptions regarding copyright attribution and + commercial use). + . + Also few unnecessary files were removed: */*.cache, post/src/*/*.cache and + misc/tetgen_plugin/*. + . + You can use script debian/elmerfem_get-orig-source.sh to repack orig tarball. Files: * -Copyright: Copyright (C) 1995- , CSC - IT Center for Science Ltd. +Copyright: 1995- , CSC - IT Center for Science Ltd. License: GPL-2+ Elmer - A finite elements software for multiphysical problems Copyright (C) 1995- , CSC - IT Center for Science Ltd. @@ -75,7 +84,7 @@ Version 2 (GPL-2) can be found in file "/usr/share/common-licenses/GPL-2". Files: elmergrid/* -Copyright: +Copyright: 1995- , CSC - IT Center for Science Ltd. License: GPL-2+ Elmer - A finite elements software for multiphysical problems Copyright (C) 1995- , CSC - IT Center for Science Ltd. @@ -119,12 +128,20 @@ Version 2 (GPL-2) can be found in file "/usr/share/common-licenses/GPL-2". Files: elmergrid/src/nrutil.* -Copyright: Numerical Recipes' uncopyrighted vector and matrix allocation and deallocation routines. -License: Public domain +Copyright: none +Comment: + Numerical Recipes' uncopyrighted vector and matrix allocation and deallocation + routines. +License: public-domain + No license required for any purpose; the work is not subject to copyright + in any jurisdiction. -Files: post/src/help/html_library-0.3/* -Copyright: Copyright (c) 1995 by Sun Microsystems -License: +Files: post/doc/help.tcl + post/src/help/help.tcl + post/doc/html_library-0.3/* + post/src/help/html_library-0.3/* +Copyright: 1995, Sun Microsystems +License: own Sun Microsystems, Inc. The following terms apply to all files associated with the software unless explicitly disclaimed in individual files. @@ -156,3 +173,167 @@ is subject to the restrictions as set forth in subparagraph (c) (1) (ii) of the Rights in Technical Data and Computer Software Clause as DFARS 252.227-7013 and FAR 52.227-19. + +Files: ElmerGUI/PythonQt/* +Copyright: 2006, MeVis Research GmbH (http://www.mevis.de) +License: LGPL-2.1+ + 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. + . + 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. + . + Further, this software is distributed without any warranty that it is + free of the rightful claim of any third person regarding infringement + or the like. Any license provided herein, whether implied or + otherwise, applies only to this software file. Patent licenses, if + any, provided herein do not apply to combinations of this program with + other software, or any other product whatsoever. + . + 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 + . + On Debian systems, the complete text of the GNU Lesser General Public License + can be found in `/usr/share/common-licenses/LGPL-2.1'. + +Files: post/src/glaux/* + post/src/glaux_mingw/src/* + post/src/include/glaux.h + post/src/tk/tkwndws.c +Copyright: 1993, Silicon Graphics Inc +License: own + Permission to use, copy, modify, and distribute this software for + any purpose and without fee is hereby granted, provided that the above + copyright notice appear in all copies and that both the copyright notice + and this permission notice appear in supporting documentation, and that + the name of Silicon Graphics, Inc. not be used in advertising + or publicity pertaining to distribution of the software without specific, + written prior permission. + . + THE MATERIAL EMBODIED ON THIS SOFTWARE IS PROVIDED TO YOU "AS-IS" + AND WITHOUT WARRANTY OF ANY KIND, EXPRESS, IMPLIED OR OTHERWISE, + INCLUDING WITHOUT LIMITATION, ANY WARRANTY OF MERCHANTABILITY OR + FITNESS FOR A PARTICULAR PURPOSE. IN NO EVENT SHALL SILICON + GRAPHICS, INC. BE LIABLE TO YOU OR ANYONE ELSE FOR ANY DIRECT, + SPECIAL, INCIDENTAL, INDIRECT OR CONSEQUENTIAL DAMAGES OF ANY + KIND, OR ANY DAMAGES WHATSOEVER, INCLUDING WITHOUT LIMITATION, + LOSS OF PROFIT, LOSS OF USE, SAVINGS OR REVENUE, OR THE CLAIMS OF + THIRD PARTIES, WHETHER OR NOT SILICON GRAPHICS, INC. HAS BEEN + ADVISED OF THE POSSIBILITY OF SUCH LOSS, HOWEVER CAUSED AND ON + ANY THEORY OF LIABILITY, ARISING OUT OF OR IN CONNECTION WITH THE + POSSESSION, USE OR PERFORMANCE OF THIS SOFTWARE. + . + US Government Users Restricted Rights + Use, duplication, or disclosure by the Government is subject to + restrictions set forth in FAR 52.227.19(c)(2) or subparagraph + (c)(1)(ii) of the Rights in Technical Data and Computer Software + clause at DFARS 252.227-7013 and/or in similar or successor + clauses in the FAR or the DOD or NASA FAR Supplement. + Unpublished-- rights reserved under the copyright laws of the + United States. Contractor/manufacturer is Silicon Graphics, + Inc., 2011 N. Shoreline Blvd., Mountain View, CA 94039-7311. + +Files: utils/ElmerClips/src/win32/* +Copyright: 2006-2008, Alexander Chemeris +License: BSD-3-clause + Redistribution and use in source and binary forms, with or without + modification, are 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 of the author may be used to endorse or promote products + derived from this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 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 AUTHOR 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. + +Files: post/src/include/gltk.h + post/src/tk/tk.h +Copyright: 1995, Brian Paul <bri...@ssec.wisc.edu> +License: LGPL-2+ + 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 of the License, or (at your option) any later version. + . + 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. + . + Further, this software is distributed without any warranty that it is + free of the rightful claim of any third person regarding infringement + or the like. Any license provided herein, whether implied or + otherwise, applies only to this software file. Patent licenses, if + any, provided herein do not apply to combinations of this program with + other software, or any other product whatsoever. + . + 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 + . + On Debian systems, the complete text of the GNU Lesser General Public License + can be found in `/usr/share/common-licenses/LGPL-2'. + +Files: ElmerGUI/netgen/libsrc/include/FlexLexer.h +Copyright: 1993, The Regents of the University of California +License: BSD-2-clause + Redistribution and use in source and binary forms, with or without + modification, are 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. + . + THIS SOFTWARE IS PROVIDED BY THE AUTHOR ``AS IS'' AND ANY EXPRESS 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 AUTHOR 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. + +Files: eio/include/old/* +Copyright: 1989-1994, Free Software Foundation, Inc +License: GPL-2+ + +Files: debian/* +Copyright: 2008-2012, Adam C. Powell, IV <hazel...@debian.org> + 2012, Tormod Volden <debian.tor...@gmail.com> + 2012, Boris Pek <tehnic...@mail.ru> +License: GPL-2+ + +License: GPL-2+ + This program is free software: you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation, either version 2 of the License, or (at your option) any later + version. + . + This program 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 General Public License for more details. + . + You should have received a copy of the GNU General Public License along with + this program. If not, see <http://www.gnu.org/licenses/>. + . + On Debian systems, the complete text of the GNU General Public License + can be found in `/usr/share/common-licenses/GPL-2'. diff -Nru elmerfem-6.1.0.svn.5396.dfsg/debian/elmerfem_get-orig-source.sh elmerfem-6.1.0.svn.5396.dfsg2/debian/elmerfem_get-orig-source.sh --- elmerfem-6.1.0.svn.5396.dfsg/debian/elmerfem_get-orig-source.sh 1970-01-01 03:00:00.000000000 +0300 +++ elmerfem-6.1.0.svn.5396.dfsg2/debian/elmerfem_get-orig-source.sh 2012-09-24 20:24:44.000000000 +0300 @@ -0,0 +1,46 @@ +#!/bin/bash + +# Examples of using: +# ./elmerfem_get-orig-source.sh +# ./elmerfem_get-orig-source.sh 5.5.0.svn.4499.dfsg +# ./elmerfem_get-orig-source.sh 6.1.0.svn.5396.dfsg2 + +PACKAGE=elmerfem +SRC_VERSION="${1}" +SVN_REPO="https://elmerfem.svn.sourceforge.net/svnroot/elmerfem/trunk" + +if [ -z "${SRC_VERSION}" ]; then + echo "Package version is not specified, last revision from SVN repo will be used." + SVN_REVISION=$(svn log "${SVN_REPO}" | head -n2 |grep "r[0-9]\+" | sed -e "s/^r\([0-9]\+\).*$/\1/") + if [ -z "${SVN_REVISION}" ]; then + echo "Failed to find last SVN revision." + exit 1 + fi + SRC_VERSION="6.1.0.svn.${SVN_REVISION}.dfsg" + echo "SVN_REVISION = ${SVN_REVISION}" + echo "SRC_VERSION = ${SRC_VERSION}" +else + SVN_REVISION=$(echo ${SRC_VERSION} | sed -e "s/^.*.svn.\([0-9]\+\).dfsg.*$/\1/") + if [ -z "${SVN_REVISION}" ]; then + echo "Failed to get SVN revision from package version." + exit 1 + fi + echo "SVN_REVISION = ${SVN_REVISION}" + echo "SRC_VERSION = ${SRC_VERSION}" +fi + +TARBALL="${PACKAGE}_${SRC_VERSION}.orig.tar.gz" + +rm -rf "${PACKAGE}-${SRC_VERSION}" "${TARBALL}" +svn export -r ${SVN_REVISION} "${SVN_REPO}" "${PACKAGE}-${SRC_VERSION}" || exit 1 + +cd "${PACKAGE}-${SRC_VERSION}" +rm -rf mathlibs umfpack elmergrid/src/metis post/src/fonts elmergrid/acx_metis.m4 +rm -rf */*.cache post/src/*/*.cache +rm -rf ElmerGUI/Application/plugins/tetgen.h misc/tetgen_plugin/* +cd .. + +GZIP='--best -n' tar -czf ${TARBALL} "${PACKAGE}-${SRC_VERSION}" || exit 1 +rm -rf "${PACKAGE}-${SRC_VERSION}" + +echo "${TARBALL} was created." diff -Nru elmerfem-6.1.0.svn.5396.dfsg/debian/patches/no-tetgen.patch elmerfem-6.1.0.svn.5396.dfsg2/debian/patches/no-tetgen.patch diff -Nru elmerfem-6.1.0.svn.5396.dfsg/debian/patches/series elmerfem-6.1.0.svn.5396.dfsg2/debian/patches/series --- elmerfem-6.1.0.svn.5396.dfsg/debian/patches/series 2012-05-26 01:48:25.000000000 +0300 +++ elmerfem-6.1.0.svn.5396.dfsg2/debian/patches/series 2012-09-24 20:24:44.000000000 +0300 @@ -8,3 +8,4 @@ elmer-revision.patch libav_071.patch glu.patch +no-tetgen.patch diff -Nru elmerfem-6.1.0.svn.5396.dfsg/debian/rules elmerfem-6.1.0.svn.5396.dfsg2/debian/rules --- elmerfem-6.1.0.svn.5396.dfsg/debian/rules 2011-10-17 18:32:21.000000000 +0300 +++ elmerfem-6.1.0.svn.5396.dfsg2/debian/rules 2012-09-24 20:24:44.000000000 +0300 @@ -2,6 +2,8 @@ # Made with the aid of debmake, by Christoph Lameter, # based on the sample debian/rules file for GNU hello by Ian Jackson. +DEB_VER = $(shell dpkg-parsechangelog | sed -ne 's/^Version: \(\([0-9]\+\):\)\?\(.*\)-[0-9]*/\3/p') + package=elmer # Support multiple makes at once @@ -222,3 +224,6 @@ binary: binary-arch binary-indep .PHONY: build binary-indep binary-arch binary + +get-orig-source: + $(CURDIR)/debian/elmerfem_get-orig-source.sh $(DEB_VER) diff -Nru elmerfem-6.1.0.svn.5396.dfsg/ElmerGUI/Application/plugins/tetgen.h elmerfem-6.1.0.svn.5396.dfsg2/ElmerGUI/Application/plugins/tetgen.h diff -Nru elmerfem-6.1.0.svn.5396.dfsg/misc/tetgen_plugin/plugin/ElmerAPI.cpp elmerfem-6.1.0.svn.5396.dfsg2/misc/tetgen_plugin/plugin/ElmerAPI.cpp diff -Nru elmerfem-6.1.0.svn.5396.dfsg/misc/tetgen_plugin/plugin/LICENSE elmerfem-6.1.0.svn.5396.dfsg2/misc/tetgen_plugin/plugin/LICENSE diff -Nru elmerfem-6.1.0.svn.5396.dfsg/misc/tetgen_plugin/plugin/plugin.pro elmerfem-6.1.0.svn.5396.dfsg2/misc/tetgen_plugin/plugin/plugin.pro diff -Nru elmerfem-6.1.0.svn.5396.dfsg/misc/tetgen_plugin/plugin/predicates.cxx elmerfem-6.1.0.svn.5396.dfsg2/misc/tetgen_plugin/plugin/predicates.cxx diff -Nru elmerfem-6.1.0.svn.5396.dfsg/misc/tetgen_plugin/plugin/README elmerfem-6.1.0.svn.5396.dfsg2/misc/tetgen_plugin/plugin/README diff -Nru elmerfem-6.1.0.svn.5396.dfsg/misc/tetgen_plugin/plugin/tetgen.cxx elmerfem-6.1.0.svn.5396.dfsg2/misc/tetgen_plugin/plugin/tetgen.cxx diff -Nru elmerfem-6.1.0.svn.5396.dfsg/misc/tetgen_plugin/plugin/tetgen.h elmerfem-6.1.0.svn.5396.dfsg2/misc/tetgen_plugin/plugin/tetgen.h diff -Nru elmerfem-6.1.0.svn.5396.dfsg/misc/tetgen_plugin/README elmerfem-6.1.0.svn.5396.dfsg2/misc/tetgen_plugin/README diff -Nru elmerfem-6.1.0.svn.5396.dfsg/misc/tetgen_plugin/testapp/example.poly elmerfem-6.1.0.svn.5396.dfsg2/misc/tetgen_plugin/testapp/example.poly diff -Nru elmerfem-6.1.0.svn.5396.dfsg/misc/tetgen_plugin/testapp/main.cpp elmerfem-6.1.0.svn.5396.dfsg2/misc/tetgen_plugin/testapp/main.cpp diff -Nru elmerfem-6.1.0.svn.5396.dfsg/misc/tetgen_plugin/testapp/testapp.pro elmerfem-6.1.0.svn.5396.dfsg2/misc/tetgen_plugin/testapp/testapp.pro diff -Nru elmerfem-6.1.0.svn.5396.dfsg/misc/tetgen_plugin/tetgen_plugin.pro elmerfem-6.1.0.svn.5396.dfsg2/misc/tetgen_plugin/tetgen_plugin.pro