[SCM] 2D CAD system branch, master, updated. debian/1.0.0_rc1+nolibs-2-2-gbf8ffee

[Scott Howard]

The following commit has been merged in the master branch:
commit bf8ffee97fa3b56984c7c0105465387f00413e50
Author: Scott Howard <showard314 at gmail.com>
Date:   Sun Jun 19 13:31:16 2011 -0400

    Use libdxflib's new includedir to fix a FTBFS

diff --git a/debian/changelog b/debian/changelog
index 0ffcfaa..c7d66ac 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+librecad (1.0.0~rc1+nolibs-3) UNRELEASED; urgency=low
+
+  * Use libdxflib's new includedir to fix a FTBFS
+
+ -- Scott Howard <showard at debian.org>  Sun, 19 Jun 2011 13:30:18 -0400
+
 librecad (1.0.0~rc1+nolibs-2) unstable; urgency=low
 
   * Use upstreams new icons, .desktop, manpage, and mime info
diff --git a/debian/patches/debian-fparser.patch b/debian/patches/debian-fparser.patch
index 09c94e4..abd4fea 100644
--- a/debian/patches/debian-fparser.patch
+++ b/debian/patches/debian-fparser.patch
@@ -4,11 +4,11 @@ Author: Lisandro Damián Nicanor Pérez Meyer
 Last-Update: 2011-06-17
 
 
-diff --git a/librecad.pro b/librecad.pro
-index dcf737f..a22c8e2 100755
---- a/librecad.pro
-+++ b/librecad.pro
-@@ -62,8 +62,9 @@ win32 {
+Index: librecad/librecad.pro
+===================================================================
+--- librecad.orig/librecad.pro	2011-06-18 13:56:54.096310613 -0400
++++ librecad/librecad.pro	2011-06-19 13:30:04.995235471 -0400
+@@ -62,8 +62,10 @@
  
  
  # Additional libraries to load
@@ -16,11 +16,12 @@ index dcf737f..a22c8e2 100755
 -# -Ldxflib/lib -ldxf \
 +LIBS += \
 + -lfparser \
-+ -ldxflib
++ -ldxflib \
++ -L/usr/include/dxflib
  # Store intermedia stuff somewhere else
  OBJECTS_DIR = intermediate/obj
  MOC_DIR = intermediate/moc
-@@ -74,8 +75,7 @@ UI_HEADERS_DIR = intermediate/ui
+@@ -74,8 +76,7 @@
  UI_SOURCES_DIR = intermediate/ui
  RESOURCES += res/extui/extui.qrc
  
@@ -30,7 +31,7 @@ index dcf737f..a22c8e2 100755
      src/cmd \
      src/lib/actions \
      src/lib/creation \
-@@ -98,17 +98,6 @@ INCLUDEPATH += dxflib/src \
+@@ -98,17 +99,6 @@
  # ################################################################################
  # Library
  HEADERS = \
@@ -48,7 +49,7 @@ index dcf737f..a22c8e2 100755
      src/lib/actions/rs_actioninterface.h \
      src/lib/actions/rs_preview.h \
      src/lib/actions/rs_previewactioninterface.h \
-@@ -216,9 +205,7 @@ HEADERS = \
+@@ -216,9 +206,7 @@
      src/plugins/document_interface.h \
      src/plugins/qc_plugininterface.h
  

-- 
2D CAD system