[SCM] 2D CAD system branch, master, updated. upstream/1.0.0_beta4-8-g81e6e37

Scott Howard showard314 at gmail.com
Wed Dec 8 22:52:49 UTC 2010 

The following commit has been merged in the master branch:
commit f260c1a1fc9bba23b15b5e4069d96a3d629bd973
Author: Scott Howard <showard314 at gmail.com>
Date:   Mon Dec 6 19:49:10 2010 -0500

    updated debian/copyright to DEP-5 and new source

diff --git a/debian/copyright b/debian/copyright
index 58701c3..f1fe0a5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,22 +1,11 @@
-This work was packaged for Debian by:
-
-    Ruben Molina <rmolina at udea.edu.co> on Thu, 29 Oct 2009 10:07:25 -0500
-
-It was downloaded from:
-
-    http://sites.google.com/site/qcadfree/
-
-Upstream Authors:
-
-    Andrew Mustun <andrew at ribbonsoft.com>
-    Jani Frilander <j.frilander at gmail.com>
-
-Copyright:
-
-    Copyright (C) 2001-2003 RibbonSoft.
-
-License:
-
+Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Name: libreCAD
+Maintainer: Ries van Twisk <ries at vantwisk.nl>
+Source: http://www.caduntu.org/
+
+Copyright: 2001-2003, RibbonSoft GmbH <www.qcad.com>
+           2010, Ries van Twisk <ries at vantwisk.nl>
+License: GPL-2
     This package is free software; you can redistribute it and/or modify
     it under the terms of the GNU General Public License version 2 as
     published by the Free Software Foundation.
@@ -30,42 +19,82 @@ License:
     along with this package; if not, write to the Free Software
     Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301 USA
 
-On Debian systems, the complete text of the GNU General Public License 
-version 2 can be found in `/usr/share/common-licenses/GPL-2'.
-
-The Debian packaging is:
+    On Debian systems, the complete text of the GNU General Public License 
+    version 2 can be found in `/usr/share/common-licenses/GPL-2'.
 
-    Copyright (C) 2009 Ruben Molina <rmolina at udea.edu.co>
-
-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.
-
-./dxflib/test/test_creationclass.cpp:
-    Copyright (C) 2001 Andrew Mustun
-    Licensed under the GPL version 2, see above.
-
-./qcadlib/src/gui/rs_staticgraphicview.cpp are:
-    Copyright (C) 2001 Andrew Mustun
-    Licensed under the GPL version 2, see above.
-
-./dxflib/test/main.cpp is:
-    Copyright (C) 2000-2001 Andrew Mustun
-    Licensed under the GPL version 2, see above.
-
-./dxflib/src/dl_writer_ascii.cpp is:
-    Copyright (C) 2001-2003 RibbonSoft.
-    Copyright (C) 2001 Robert J. Campbell Jr.
-    Licensed under the GPL version 2, see above.
-
-./qcadactions/src/rs_actiondrawpolyline.cpp is:
-    Copyright (C) 2001-2003 RibbonSoft.
-    Copyright (C) 2009 Jani Frilander.
-    Licensed under the GPL version 2, see above.
+Files: ./dxflib/test/test_creationclass.h, ./dxflib/test/main.cpp, ./dxflib/test/test_creationclass.cpp
+Copyright: 2001, Andrew Mustun <andrew at ribbonsoft.com>
+License: LGPL
+    This program is free software; you can redistribute it and/or modify
+    it under the terms of the GNU Library General Public License as
+    published by the Free Software Foundation.
 
-./qcadlib/src/scripting/rs_python_wrappers.cpp is:
-    Copyright (C) 2003 Markus Meyer <meyer at mesw.de>
-    Permission to copy, use, modify, sell and distribute this file is 
-    granted provided this copyright notice is not removed or altered.
-    This software is provided "as is" without express or implied
-    warranty, and with no claim as to its suitability for any purpose.
+    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 Library General Public License for more details.
+
+    You should have received a copy of the GNU Library General Public License
+    along with this program; 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 Library General Public License 
+    version 2 can be found in `/usr/share/common-licenses/LGPL'.
+
+Files: fparser/*
+Copyright: 2003, Juha Nieminen
+           2003, Joel Yliluoma <warp at iki.fi>
+License: other
+  1. This library is free for non-commercial usage. You can do whatever you
+     like with it as long as you don't claim you made it yourself.
+
+  2. It is possible to use this library in a commercial program, but in this
+     case you MUST contact me first (warp at iki.fi) and ask express permission
+     for this. I want to know what type of program it is going to be, its
+     price and so on.
+       If you are making a free program or a shareware program with just a
+     nominal price (5 US dollars or less), you don't have to ask for
+     permission.
+       In any case, I DON'T WANT MONEY for the usage of this library. It is
+     free, period.
+
+  3. You can make any modifications you want to it so that it conforms your
+     needs. If you make modifications to it, you have, of course, credits for
+     the modified parts.
+
+  4. If you use this library in your own program, you don't have to provide
+     the source code if you don't want to (ie. the source code of your program
+     or this library).
+       If you DO include the source code for this library, this text file
+     must be included in its original intact form.
+
+  5. If you distribute a program which uses this library, and specially if you
+     provide the source code, proper credits MUST be included. Trying to
+     obfuscate the fact that this library is not made by you or that it is
+     free is expressly prohibited. When crediting the usage of this library,
+     it's enough to include my name and email address, that is:
+     "Juha Nieminen (warp at iki.fi)". Also a URL to the library download page
+     would be nice, although not required. The official URL is:
+       http://iki.fi/warp/FunctionParser/
+
+  6. And the necessary "lawyer stuff":
+
+     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: debian/*
+Copyright: 2009, Ruben Molina <rmolina at udea.edu.co>
+           2010, Scott Howard <showard314 at gmail.com>
+License: GPL-2+
+    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.

-- 
2D CAD system

More information about the debian-science-commits mailing list