[SCM] FreeCAD packaging branch, master, updated. debian/0.11.4446-dfsg-1-5-g99a5593

Anton Gladky gladky.anton at gmail.com
Thu Sep 22 21:18:46 UTC 2011


The following commit has been merged in the master branch:
commit 99a55933b368b7c100d541f21b5880ba39fe49b3
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Sep 22 23:18:40 2011 +0200

    Update copyright-file according to DEP-5

diff --git a/debian/copyright b/debian/copyright
index 790cc15..1fb5570 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,36 +1,16 @@
-Format: http://dep.debian.net/deps/dep5/
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=173
 Upstream-Name: FreeCAD
 Upstream-Contact: Werner Mayer <wmayer at users.sourceforge.net>
 Source: http://sourceforge.net/projects/free-cad
-X-Packaged-By: Werner Mayer <wmayer at users.sourceforge.net>
-X-Packaged-Date: 2006-09-26_16:55:15+02:00
 
 Files: *
 Copyright: 2001-2010 Jürgen Riegel <juergen.riegel at web.de>,
  Werner Mayer <wmayer at users.sourceforge.net>
 License: LGPL-2+
- This package 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 package 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 package; if not, write to the Free Software
- Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301, US
- .
- On Debian systems, the complete text of the GNU Lesser General Public
- License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
 
 Files: m4/*
 Copyright: 1992-2009 Free Software Foundation, Inc.
 License: GPL-2+
- On Debian systems, the complete text of the GNU General Public License
- version 2 can be found in '/usr/share/common-licenses/GPL-2'.
 
 Files: m4/install-sh
 Copyright: 1994 X Consortium
@@ -152,9 +132,7 @@ License: other
  for any purpose and without fee is hereby granted.  This software
  is provided on an as is basis, without warranties of any kind.
 
-Files: src/Base/BoundBox.h, src/Base/Swap.*, src/Base/Vector3D.*,
- src/Base/ViewProj.h, src/Base/Matrix.*, src/Base/Tools2D.*,
- src/Mod/Mesh/App/Core/*
+Files: src/Base/BoundBox.h src/Base/Swap.* src/Base/Vector3D.* src/Base/ViewProj.h src/Base/Matrix.* src/Base/Tools2D.* src/Mod/Mesh/App/Core/*
 Copyright: 2005 Imetric 3D GmbH
 License: LGPL-2+
 
@@ -194,26 +172,6 @@ Files: src/Doc/Start_Page.html
 Copyright: 2009 John Resig
 License: GPL-2 or MIT
 
-License: MIT
- Permission is hereby granted, free of charge, to any person obtaining
- a copy of this software and associated documentation files (the
- "Software"), to deal in the Software without restriction, including
- without limitation the rights to use, copy, modify, merge, publish,
- distribute, sublicense, and/or sell copies of the Software, and to
- permit persons to whom the Software is furnished to do so, subject to
- the following conditions:
- .
- The above copyright notice and this permission notice shall be
- included in all copies or substantial portions of the Software.
- .
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND,
- EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF
- MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.
- IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY
- CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT,
- TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE
- SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
 Files: src/Doc/Start_Page.html
 Copyright: 2009 The Dojo Foundation, http://sizzlejs.com/
 License: GPL-2 or MIT or BSD
@@ -234,12 +192,11 @@ Files: src/Mod/Draft/importAirfoilDAT.py
 Copyright: 2010 Heiko Jakob <heiko.jakob at gediegos.de>
 License: GPL-2+
 
-Files: src/Mod/Mesh/App/Core/Projection.cpp, src/Mod/Mesh/App/Core/Projection.h,
- src/Mod/Mesh/App/Core/Triangulation.cpp, src/Mod/Mesh/App/Core/Triangulation.h
+Files: src/Mod/Mesh/App/Core/Projection.cpp src/Mod/Mesh/App/Core/Projection.h src/Mod/Mesh/App/Core/Triangulation.cpp src/Mod/Mesh/App/Core/Triangulation.h
 Copyright: 2005 Werner Mayer <werner.wm.mayer at gmx.de>
 License: LGPL-2+
 
-Files: src/Mod/Mesh/App/Core/Builder.h, src/Mod/Mesh/App/Core/SetOperations.*
+Files: src/Mod/Mesh/App/Core/Builder.h src/Mod/Mesh/App/Core/SetOperations.*
 Copyright: 2005 Berthold Grupp
 License: LGPL-2+
 
@@ -247,8 +204,7 @@ Files: src/Mod/Mesh/BuildRegularGeoms.py
 Copyright: 2005 Berthold Grupp
 License: LGPL
 
-Files: src/Mod/Image/App/ImageBase.*, src/Mod/Image/Gui/GLImageBox.*,
- src/Mod/Image/Gui/ImageView.*, src/Mod/Image/Gui/XpmImages.h
+Files: src/Mod/Image/App/ImageBase.* src/Mod/Image/Gui/GLImageBox.* src/Mod/Image/Gui/ImageView.* src/Mod/Image/Gui/XpmImages.h
 Copyright: 2004 Imetric 3D GmbH
 License: LGPL-2+
 
@@ -277,8 +233,6 @@ License: LGPL-2+
 Files: src/Mod/Sketcher/App/sketchflat/*
 Copyright: 2008 Jonathan Westhues
 License: GPL-3+
- On Debian systems, the complete text of the GNU General Public License
- version 3 can be found in '/usr/share/common-licenses/GPL-3'.
 
 Files: src/Mod/Sketcher/App/sketchsolve_cp/*
 Copyright: 2009 Jonathan George
@@ -302,7 +256,7 @@ License: PSF
  AND THERE IS NO OBLIGATION WHATSOEVER TO PROVIDE MAINTENANCE,
  SUPPORT, UPDATES, ENHANCEMENTS, OR MODIFICATIONS.
 
-Files: src/Mod/Part/MakeBottle.py, src/Tools/*
+Files: src/Mod/Part/MakeBottle.py src/Tools/*
 Copyright: 2002-2008 Jürgen Riegel <juergen.riegel at web.de>,
  Werner Mayer <wmayer at users.sourceforge.net>
 License: GPL-2+

-- 
FreeCAD packaging



More information about the debian-science-commits mailing list