[SCM] 2D CAD system branch, master, updated. debian/1.0.0_beta5-1-2-gde8517f

Scott Howard showard314 at gmail.com
Tue Feb 1 02:43:28 UTC 2011 

The following commit has been merged in the master branch:
commit de8517fc7fb30b9c635eb6bb5e59fd97eddba602
Author: Scott Howard <showard314 at gmail.com>
Date:   Mon Jan 31 21:43:14 2011 -0500

    cleaned up after a review by stefanor

diff --git a/debian/control b/debian/control
index 6f52e61..27a639c 100644
--- a/debian/control
+++ b/debian/control
@@ -14,7 +14,7 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/librecad.git
 Package: librecad
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, librecad-data (>= ${source:Version})
-Recommends: librecad-doc (>= ${source:Version})
+Recommends: librecad-doc (= ${source:Version})
 Description: Computer-aided design (CAD) system
  LibreCAD is an application for computer aided design (CAD) in two 
  dimensions (2D). With LibreCAD you can create technical drawings such as 
diff --git a/debian/copyright b/debian/copyright
index cd718bc..aa0b5dd 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,4 +1,8 @@
-Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135
+Format: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?rev=166
+Upstream-Name: LibreCAD
+Upstream-Contact: Ries van Twisk <ries at vantwisk.nl>
+Source: http://www.librecad.org/
+
 Name: libreCAD
 Maintainer: Ries van Twisk <ries at vantwisk.nl>
 Source: http://www.librecad.org/
@@ -9,17 +13,16 @@ 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.
-
+.
     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 General Public License for more details.
-
+.
     You should have received a copy of the GNU 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, 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'.
 
@@ -29,16 +32,16 @@ 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.
-
+.
     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 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 Library General Public License 
     version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
 
@@ -48,7 +51,7 @@ Copyright: 2003, Juha Nieminen
 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
@@ -58,17 +61,17 @@ License: other
      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
@@ -77,12 +80,12 @@ License: other
      "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.
@@ -90,7 +93,7 @@ License: other
      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>
@@ -99,3 +102,15 @@ 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.
+.
+    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 General Public License for more details.
+.
+    You should have received a copy of the GNU 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, 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'.
diff --git a/debian/librecad.1 b/debian/librecad.1
index dcacbbb..f8abb95 100644
--- a/debian/librecad.1
+++ b/debian/librecad.1
@@ -8,4 +8,4 @@ DXF-files. These DXF-files are the interface to many CAD-systems such as
 AutoCAD(R) and many others.
 
 LibreCAD has no special invocation parameters. You can find the useful
-docs in /usr/share/doc/libreCAD
+docs in /usr/share/doc/librecad
diff --git a/debian/librecad.desktop b/debian/librecad.desktop
index ef1e2b0..5222a16 100644
--- a/debian/librecad.desktop
+++ b/debian/librecad.desktop
@@ -7,5 +7,5 @@ Comment[es]=Un sistema CAD profesional
 TryExec=librecad
 Exec=librecad %F
 Icon=librecad
-Categories=Graphics;Engineering
+Categories=Graphics;Engineering;
 MimeType=image/vnd.dxf

-- 
2D CAD system

More information about the debian-science-commits mailing list