[SCM] 2D CAD system branch, 1.0-branch, updated. debian/1.0.1+nolibs-2-13-g7725789

[Scott Howard]

The following commit has been merged in the 1.0-branch branch:
commit 0f22f9b26998b4fc660851fe2b006fb792ff1ed9
Author: Scott Howard <showard at debian.org>
Date:   Mon Apr 16 10:15:21 2012 -0400

    Refreshed debian/patches/debian-fparser.patch

diff --git a/debian/changelog b/debian/changelog
index 9fdeb8d..493df5a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,8 +3,9 @@ librecad (1.0.2+nolibs-1) unstable; urgency=low
   * New upstream release.
   * Debian compat bumped to 9 for build hardening (Wheezy Release
     Goal)
+  * Refreshed debian/patches/debian-fparser.patch
 
- -- Scott Howard <showard at debian.org>  Mon, 16 Apr 2012 10:01:49 -0400
+ -- Scott Howard <showard at debian.org>  Mon, 16 Apr 2012 10:14:55 -0400
 
 librecad (1.0.1+nolibs-2) unstable; urgency=low
 
diff --git a/debian/patches/debian-fparser.patch b/debian/patches/debian-fparser.patch
index f6611ed..2bed505 100644
--- a/debian/patches/debian-fparser.patch
+++ b/debian/patches/debian-fparser.patch
@@ -6,9 +6,9 @@ Last-Update: 2011-08-05
 
 Index: librecad/librecad.pro
 ===================================================================
---- librecad.orig/librecad.pro	2012-02-12 12:30:21.637332723 -0500
-+++ librecad/librecad.pro	2012-02-12 12:31:31.949332384 -0500
-@@ -62,8 +62,9 @@
+--- librecad.orig/librecad.pro	2012-04-16 10:09:14.000000000 -0400
++++ librecad/librecad.pro	2012-04-16 10:13:08.048547917 -0400
+@@ -69,8 +69,9 @@
  
  
  # Additional libraries to load
@@ -20,17 +20,16 @@ Index: librecad/librecad.pro
  # Store intermedia stuff somewhere else
  OBJECTS_DIR = intermediate/obj
  MOC_DIR = intermediate/moc
-@@ -75,8 +76,7 @@
- RESOURCES += res/extui/extui.qrc
+@@ -84,7 +85,7 @@
+ LIBS += -lmuparser
  
  INCLUDEPATH += \
 -    dxflib/src \
--    fparser \
 +    /usr/include/dxflib \
      src/cmd \
      src/lib/actions \
      src/lib/creation \
-@@ -101,17 +101,6 @@
+@@ -109,16 +110,6 @@
  # ################################################################################
  # Library
  HEADERS = \
@@ -44,17 +43,15 @@ Index: librecad/librecad.pro
 -    dxflib/src/dl_extrusion.h \
 -    dxflib/src/dl_writer.h \
 -    dxflib/src/dl_writer_ascii.h \
--    fparser/fparser.hh \
      src/lib/actions/rs_actioninterface.h \
      src/lib/actions/rs_preview.h \
      src/lib/actions/rs_previewactioninterface.h \
-@@ -209,9 +198,6 @@
+@@ -216,8 +207,6 @@
      src/plugins/intern/qc_actiongetent.h
  
  SOURCES = \
 -    dxflib/src/dl_dxf.cpp \
 -    dxflib/src/dl_writer_ascii.cpp \
--    fparser/fparser.cc \
      src/lib/actions/rs_actioninterface.cpp \
      src/lib/actions/rs_preview.cpp \
      src/lib/actions/rs_previewactioninterface.cpp \

-- 
2D CAD system