[SCM] 2D CAD system branch, master, updated. debian/1.0.0-rc1+nolibs-4-8-g40b9f44

[Lisandro Damián Nicanor Pérez Meyer]

The following commit has been merged in the master branch:
commit d98c52f202c208a0ce09914d1695804b0200019c
Author: Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>
Date:   Mon Sep 5 22:59:33 2011 -0300

    Refresh debian-fparser.patch.

diff --git a/debian/changelog b/debian/changelog
index e38dfa0..d6a131d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ librecad (1.0.0~rc2+nolibs-1) unstable; urgency=low
 
   * New upstream release.
     - Fixes rounded values (Closes: #640390).
+  * Refresh debian-fparser.patch.
 
  -- Lisandro Damián Nicanor Pérez Meyer <perezmeyer at gmail.com>  Mon, 05 Sep 2011 22:42:41 -0300
 
diff --git a/debian/patches/debian-fparser.patch b/debian/patches/debian-fparser.patch
index d00e155..82ab29f 100644
--- a/debian/patches/debian-fparser.patch
+++ b/debian/patches/debian-fparser.patch
@@ -1,13 +1,11 @@
 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
+Last-Update: 2011-08-05
 
 
-Index: librecad/librecad.pro
-===================================================================
---- librecad.orig/librecad.pro	2011-06-20 16:10:42.523841702 -0400
-+++ librecad/librecad.pro	2011-06-20 16:11:39.680264958 -0400
+--- a/librecad.pro
++++ b/librecad.pro
 @@ -62,8 +62,9 @@
  
  
@@ -20,18 +18,16 @@ Index: librecad/librecad.pro
  # Store intermedia stuff somewhere else
  OBJECTS_DIR = intermediate/obj
  MOC_DIR = intermediate/moc
-@@ -74,8 +75,8 @@
- UI_SOURCES_DIR = intermediate/ui
+@@ -75,8 +76,6 @@
  RESOURCES += res/extui/extui.qrc
  
--INCLUDEPATH += dxflib/src \
+ INCLUDEPATH += \
+-    dxflib/src \
 -    fparser \
-+INCLUDEPATH += \
-+    /usr/include/dxflib \
      src/cmd \
      src/lib/actions \
      src/lib/creation \
-@@ -98,17 +99,6 @@
+@@ -99,17 +98,6 @@
  # ################################################################################
  # Library
  HEADERS = \
@@ -49,14 +45,13 @@ Index: librecad/librecad.pro
      src/lib/actions/rs_actioninterface.h \
      src/lib/actions/rs_preview.h \
      src/lib/actions/rs_previewactioninterface.h \
-@@ -216,9 +206,7 @@
-     src/plugins/document_interface.h \
-     src/plugins/qc_plugininterface.h
+@@ -206,9 +194,6 @@
+     src/plugins/intern/qc_actiongetent.h
  
--SOURCES = dxflib/src/dl_dxf.cpp \
+ SOURCES = \
+-    dxflib/src/dl_dxf.cpp \
 -    dxflib/src/dl_writer_ascii.cpp \
 -    fparser/fparser.cc \
-+SOURCES = \
      src/lib/actions/rs_actioninterface.cpp \
      src/lib/actions/rs_preview.cpp \
      src/lib/actions/rs_previewactioninterface.cpp \

-- 
2D CAD system