[SCM] 2D CAD system branch, master, updated. debian/1.0.0_beta5+nolibs-1-16-gc106faf

[Lisandro Damián Nicanor Pérez Meyer]

The following commit has been merged in the master branch:
commit 5b7368a9ba69d351013e1f03fe236e46f7ef2209
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Fri Jun 17 13:45:17 2011 -0300

    Refresh debian-fparser.patch.

diff --git a/debian/changelog b/debian/changelog
index fc9fe3a..7946460 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,7 @@ librecad (1.0.0rc1-1) UNRELEASED; urgency=low
     - rs_debug.patch
     - bug#234340.patch
     - qcad-2.0.5.0-latin2.patch
+  * Refresh debian-fparser.patch.
 
   [Scott Howard]
   * Corrected spelling error s/plataform/platform/ in debian/control
diff --git a/debian/patches/debian-fparser.patch b/debian/patches/debian-fparser.patch
index acc0cbd..09c94e4 100644
--- a/debian/patches/debian-fparser.patch
+++ b/debian/patches/debian-fparser.patch
@@ -1,34 +1,36 @@
 Description: use debian packaged fparser
 Author: Scott Howard <showard at debian.org>
+Author: Lisandro Damián Nicanor Pérez Meyer
+Last-Update: 2011-06-17
 
-Index: librecad/librecad.pro
-===================================================================
---- librecad.orig/librecad.pro	2011-03-07 22:49:24.581912869 -0500
-+++ librecad/librecad.pro	2011-03-12 11:30:10.408107399 -0500
-@@ -65,9 +65,10 @@
- }
+
+diff --git a/librecad.pro b/librecad.pro
+index dcf737f..a22c8e2 100755
+--- a/librecad.pro
++++ b/librecad.pro
+@@ -62,8 +62,9 @@ win32 {
+ 
  
  # Additional libraries to load
 -# LIBS += \
+-# -Ldxflib/lib -ldxf \
 +LIBS += \
- # -Ldxflib/lib -ldxf \
--# -Lfparser/lib -lfparser
-+-lfparser \
-+-ldxflib
++ -lfparser \
++ -ldxflib
  # Store intermedia stuff somewhere else
  OBJECTS_DIR = intermediate/obj
  MOC_DIR = intermediate/moc
-@@ -77,8 +78,7 @@
- UI_HERADERS_DIR = intermediate/ui
+@@ -74,8 +75,7 @@ UI_HEADERS_DIR = intermediate/ui
  UI_SOURCES_DIR = intermediate/ui
  RESOURCES += res/extui/extui.qrc
+ 
 -INCLUDEPATH += dxflib/src \
--    fparser/src \
+-    fparser \
 +INCLUDEPATH += \
      src/cmd \
      src/lib/actions \
      src/lib/creation \
-@@ -100,17 +100,6 @@
+@@ -98,17 +98,6 @@ INCLUDEPATH += dxflib/src \
  # ################################################################################
  # Library
  HEADERS = \
@@ -42,17 +44,17 @@ Index: librecad/librecad.pro
 -    dxflib/src/dl_extrusion.h \
 -    dxflib/src/dl_writer.h \
 -    dxflib/src/dl_writer_ascii.h \
--    fparser/src/fparser.h \
+-    fparser/fparser.hh \
      src/lib/actions/rs_actioninterface.h \
      src/lib/actions/rs_preview.h \
      src/lib/actions/rs_previewactioninterface.h \
-@@ -214,9 +203,7 @@
-     src/lib/scripting/rs_script.h \
-     src/lib/scripting/rs_scriptlist.h \
+@@ -216,9 +205,7 @@ HEADERS = \
+     src/plugins/document_interface.h \
+     src/plugins/qc_plugininterface.h
  
 -SOURCES = dxflib/src/dl_dxf.cpp \
 -    dxflib/src/dl_writer_ascii.cpp \
--    fparser/src/fparser.cpp \
+-    fparser/fparser.cc \
 +SOURCES = \
      src/lib/actions/rs_actioninterface.cpp \
      src/lib/actions/rs_preview.cpp \

-- 
2D CAD system