[SCM] 2D CAD system branch, master, updated. debian/1.0.0_beta5-1-9-gc9aba6b
Scott Howard
showard314 at gmail.com
Tue Mar 8 03:32:00 UTC 2011
The following commit has been merged in the master branch:
commit c9aba6b627cb021bea44f585d90959ee91798f9a
Author: Scott Howard <showard314 at gmail.com>
Date: Mon Mar 7 22:31:38 2011 -0500
use new debian fparser package
diff --git a/debian/control b/debian/control
index 8b622f9..cda3468 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Section: graphics
Priority: optional
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
Uploaders: Scott Howard <showard at debian.org>, Ruben Molina <rmolina at udea.edu.co>
-Build-Depends: debhelper (>= 8), libqt4-dev
+Build-Depends: debhelper (>= 8), libqt4-dev, libfparser-4.3-dev
Standards-Version: 3.9.1
Homepage: http://www.librecad.org/
DM-Upload-Allowed: yes
diff --git a/debian/copyright b/debian/copyright
index ed6c4b4..472adb5 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -45,123 +45,6 @@ License: LGPL-2
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'.
-Files: fparser/*
-Copyright: 2003, Juha Nieminen
- 2003, Joel Yliluoma <warp at iki.fi>
-License: LGPL-2.1
- From personal correspondence with Scott Howard, this has been licensed LGPL-2.1
- .
- MIME-Version: 1.0
- Received: by 10.204.73.214 with HTTP; Mon, 31 Jan 2011 11:54:25 -0800 (PST)
- Date: Mon, 31 Jan 2011 14:54:25 -0500
- Delivered-To: showard314 at gmail.com
- Message-ID: <AANLkTi=j+az1ukWMH1CxPNTyi-tuHLHfacaBy8RhGJq+ at mail.gmail.com>
- Subject: fparser library license for LibreCAD project
- From: Scott Howard <showard314 at gmail.com>
- To: warp at iki.fi
- Cc: Ries van Twisk <ries at vantwisk.nl>
- Content-Type: text/plain; charset=ISO-8859-1
- Content-Transfer-Encoding: quoted-printable
- .
- Hello,
- .
- LibreCAD (www.librecad.org) is a new fork of QCad, updated for qt4. It
- is on track to be placed in Debian and Ubuntu 11.04 as the default CAD
- program for Edubuntu. LibreCAD, however, uses version 2.51 of fparser,
- which is not licensed under LGPL.
- .
- Would you be so kind as to give LibreCAD (and Debian) a license to
- version 2.51 under LGPL (version 2 or higher, preferably)? We prefer
- LGPL version 2.1 because it is compatible with GPL2 and GPL3 while
- LGPL3 is only compatible with GPL3. You just have to reply to this
- email saying you agree to the license below:
- .
- Thank you.
- .
- Cheers,
- Scott
- .
- http://www.gnu.org/licenses/lgpl-2.1.txt
- .
- GNU LESSER GENERAL PUBLIC LICENSE
- Version 2.1, February 1999
- .
- Copyright (C) 1991, 1999 Free Software Foundation, Inc.
- 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
- Everyone is permitted to copy and distribute verbatim copies
- of this license document, but changing it is not allowed.
- .
- [This is the first released version of the Lesser GPL. It also counts
- as the successor of the GNU Library Public License, version 2, hence
- the version number 2.1.]
- .
- [THE FULL TEXT OF THE LICENSE IS IN THE EMAIL BUT IS REMOVED FROM DEBIAN/COPYRIGHT]
- .
- .
- The reply:
- .
- Delivered-To: showard314 at gmail.com
- Received: by 10.204.73.214 with SMTP id r22cs31301bkj;
- Wed, 2 Feb 2011 12:53:05 -0800 (PST)
- Return-Path: <juha.nieminen at gmail.com>
- Received-SPF: pass (google.com: domain of juha.nieminen at gmail.com designates 10.204.62.209 as permitted sender) client-ip=10.204.62.209;
- Authentication-Results: mr.google.com; spf=pass (google.com: domain of juha.nieminen at gmail.com designates 10.204.62.209 as permitted sender) smtp.mail=juha.nieminen at gmail.com; dkim=pass header.i=juha.nieminen at gmail.com
- Received: from mr.google.com ([10.204.62.209])
- by 10.204.62.209 with SMTP id y17mr8592126bkh.98.1296679982753 (num_hops = 1);
- Wed, 02 Feb 2011 12:53:02 -0800 (PST)
- DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed;
- d=gmail.com; s=gamma;
- h=domainkey-signature:mime-version:in-reply-to:references:date
- :message-id:subject:from:to:content-type:content-transfer-encoding;
- bh=FZPGOHZA47DiNjMNzUDD/xai4VOCO/0AjxUeF1/vXyA=;
- b=Kim+8NB4J1H30XcBBBvb/l8ZrbjMWJi2iZImTYVoExETsBeKvaSO5nhVc9o2CSzAEj
- SnGXaQcNRUmy4hz6G0Ztupd8FHPrTWSWSKaWdjgG9NqF5zTDqLBZzGglPHXWvIjRKHFF
- rZ8DlUpSEuieziCKgGywyPXpmTgZQs3wAx/wg=
- DomainKey-Signature: a=rsa-sha1; c=nofws;
- d=gmail.com; s=gamma;
- h=mime-version:in-reply-to:references:date:message-id:subject:from:to
- :content-type:content-transfer-encoding;
- b=OBKWbszD8bC48hQxu+mn/ZjK69osC4T7F4maqrza0cGnzoHzpmUMj9E8KtjkGA8awU
- e6fSbnbxpqDXn+94oveyP+QXnkM191PsALPIAn57uyTi7f4DpH2YSMgEnQ170odF+ueO
- 8+2oDwi9uXRn+8SQiu9V06Tu5XHdc0jOKAH5o=
- MIME-Version: 1.0
- Received: by 10.204.62.209 with SMTP id y17mr8592126bkh.98.1296679982711; Wed,
- 02 Feb 2011 12:53:02 -0800 (PST)
- Received: by 10.204.69.66 with HTTP; Wed, 2 Feb 2011 12:53:02 -0800 (PST)
- In-Reply-To: <AANLkTi=j+az1ukWMH1CxPNTyi-tuHLHfacaBy8RhGJq+ at mail.gmail.com>
- References: <AANLkTi=j+az1ukWMH1CxPNTyi-tuHLHfacaBy8RhGJq+ at mail.gmail.com>
- Date: Wed, 2 Feb 2011 22:53:02 +0200
- Message-ID: <AANLkTinXLAwdNX51jU_YoJfs8DkUFeVi04xE-kabjo+L at mail.gmail.com>
- Subject: Re: fparser library license for LibreCAD project
- From: Juha Nieminen <juha.nieminen at gmail.com>
- To: Scott Howard <showard314 at gmail.com>
- Content-Type: text/plain; charset=ISO-8859-1
- Content-Transfer-Encoding: quoted-printable
- .
- Yes, you have my permission to use 2.51 of the function parser
- library under the LGPL 2 license. You can add a note to the library's
- documentation about this.
- .
- .
- .
- 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.
- .
- 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., 51 Franklin Street, Fifth Floor, Boston, MA
- 02110-1301 USA
- .
- On Debian systems, the complete text of the GNU Lesser General Public License
- version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
Files: debian/*
Copyright: 2009, Ruben Molina <rmolina at udea.edu.co>
2010, Scott Howard <showard314 at gmail.com>
diff --git a/debian/patches/debian-fparser.patch b/debian/patches/debian-fparser.patch
new file mode 100644
index 0000000..556e7f7
--- /dev/null
+++ b/debian/patches/debian-fparser.patch
@@ -0,0 +1,41 @@
+Description: use debian packaged fparser
+Author: Scott Howard <showard at debian.org>
+
+--- librecad-1.0.0~beta5.orig/librecad.pro
++++ librecad-1.0.0~beta5/librecad.pro
+@@ -65,9 +65,9 @@ win32 {
+ }
+
+ # Additional libraries to load
+-# LIBS += \
++LIBS += \
+ # -Ldxflib/lib -ldxf \
+-# -Lfparser/lib -lfparser
++-lfparser
+ # Store intermedia stuff somewhere else
+ OBJECTS_DIR = intermediate/obj
+ MOC_DIR = intermediate/moc
+@@ -78,7 +78,6 @@ UI_HERADERS_DIR = intermediate/ui
+ UI_SOURCES_DIR = intermediate/ui
+ RESOURCES += res/extui/extui.qrc
+ INCLUDEPATH += dxflib/src \
+- fparser/src \
+ src/cmd \
+ src/lib/actions \
+ src/lib/creation \
+@@ -110,7 +109,6 @@ HEADERS = \
+ dxflib/src/dl_extrusion.h \
+ dxflib/src/dl_writer.h \
+ dxflib/src/dl_writer_ascii.h \
+- fparser/src/fparser.h \
+ src/lib/actions/rs_actioninterface.h \
+ src/lib/actions/rs_preview.h \
+ src/lib/actions/rs_previewactioninterface.h \
+@@ -216,7 +214,6 @@ HEADERS = \
+
+ SOURCES = dxflib/src/dl_dxf.cpp \
+ dxflib/src/dl_writer_ascii.cpp \
+- fparser/src/fparser.cpp \
+ src/lib/actions/rs_actioninterface.cpp \
+ src/lib/actions/rs_preview.cpp \
+ src/lib/actions/rs_previewactioninterface.cpp \
diff --git a/debian/patches/series b/debian/patches/series
index 4cf4dc4..df40488 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
rs_debug.patch
bug#234340.patch
qcad-2.0.5.0-latin2.patch
+debian-fparser.patch
--
2D CAD system
More information about the debian-science-commits
mailing list