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

[Scott Howard]

The following commit has been merged in the master branch:
commit 9ea9ab8c2de780a415569e7be51d5651251b985a
Author: Scott Howard <showard314 at gmail.com>
Date:   Mon Jun 20 17:03:24 2011 -0400

    fixed dxflib ftbfs

diff --git a/debian/changelog b/debian/changelog
index dd529a4..53ef3c0 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,11 @@
 librecad (1.0.0~rc1+nolibs-4) UNRELEASED; urgency=low
 
-  * Install qt compiled help files debian/librcad-doc.install
+  * debian/librcad-doc.install
+    - Install qt compiled help files
+  * debian/patches/debian_fparser.patch
+    - Use libdxflib's new includedir to fix a FTBFS
 
- -- Scott Howard <showard at debian.org>  Mon, 20 Jun 2011 16:59:08 -0400
+ -- Scott Howard <showard at debian.org>  Mon, 20 Jun 2011 17:01:23 -0400
 
 librecad (1.0.0~rc1+nolibs-3) unstable; urgency=low
 
diff --git a/debian/librecad-doc.doc-base b/debian/librecad-doc.doc-base
deleted file mode 100644
index 0e11a23..0000000
--- a/debian/librecad-doc.doc-base
+++ /dev/null
@@ -1,10 +0,0 @@
-Document: librecad
-Title: QCAD (libreCAD) Manual
-Author: Andrew Mustun
-Abstract: This manual describes the usage of QCad (LibreCAD).
-Section: Graphics
-
-Format: HTML
-Index: /usr/share/doc/librecad/doc/index.html
-Files: /usr/share/doc/librecad/doc/*.html
-
diff --git a/debian/patches/debian-fparser.patch b/debian/patches/debian-fparser.patch
index abd4fea..d00e155 100644
--- a/debian/patches/debian-fparser.patch
+++ b/debian/patches/debian-fparser.patch
@@ -6,9 +6,9 @@ Last-Update: 2011-06-17
 
 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 @@
+--- librecad.orig/librecad.pro	2011-06-20 16:10:42.523841702 -0400
++++ librecad/librecad.pro	2011-06-20 16:11:39.680264958 -0400
+@@ -62,8 +62,9 @@
  
  
  # Additional libraries to load
@@ -16,18 +16,18 @@ Index: librecad/librecad.pro
 -# -Ldxflib/lib -ldxf \
 +LIBS += \
 + -lfparser \
-+ -ldxflib \
-+ -L/usr/include/dxflib
++ -ldxflib
  # Store intermedia stuff somewhere else
  OBJECTS_DIR = intermediate/obj
  MOC_DIR = intermediate/moc
-@@ -74,8 +76,7 @@
+@@ -74,8 +75,8 @@
  UI_SOURCES_DIR = intermediate/ui
  RESOURCES += res/extui/extui.qrc
  
 -INCLUDEPATH += dxflib/src \
 -    fparser \
 +INCLUDEPATH += \
++    /usr/include/dxflib \
      src/cmd \
      src/lib/actions \
      src/lib/creation \

-- 
2D CAD system