[SCM] 2D CAD system branch, master, updated. debian/1.0.0_beta5-1-13-gdcc1364

[Scott Howard]

The following commit has been merged in the master branch:
commit dcc1364ca74bdbdebd51d26a50680ae8202495bf
Author: Scott Howard <showard314 at gmail.com>
Date:   Sat Mar 12 11:33:54 2011 -0500

    removed dxflib

diff --git a/debian/patches/debian-fparser.patch b/debian/patches/debian-fparser.patch
index 556e7f7..acc0cbd 100644
--- a/debian/patches/debian-fparser.patch
+++ b/debian/patches/debian-fparser.patch
@@ -1,9 +1,11 @@
 Description: use debian packaged fparser
 Author: Scott Howard <showard at debian.org>
 
---- librecad-1.0.0~beta5.orig/librecad.pro
-+++ librecad-1.0.0~beta5/librecad.pro
-@@ -65,9 +65,9 @@ win32 {
+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 @@
  }
  
  # Additional libraries to load
@@ -11,31 +13,47 @@ Author: Scott Howard <showard at debian.org>
 +LIBS += \
  # -Ldxflib/lib -ldxf \
 -# -Lfparser/lib -lfparser
-+-lfparser
++-lfparser \
++-ldxflib
  # Store intermedia stuff somewhere else
  OBJECTS_DIR = intermediate/obj
  MOC_DIR = intermediate/moc
-@@ -78,7 +78,6 @@ UI_HERADERS_DIR = intermediate/ui
+@@ -77,8 +78,7 @@
+ UI_HERADERS_DIR = intermediate/ui
  UI_SOURCES_DIR = intermediate/ui
  RESOURCES += res/extui/extui.qrc
- INCLUDEPATH += dxflib/src \
+-INCLUDEPATH += dxflib/src \
 -    fparser/src \
++INCLUDEPATH += \
      src/cmd \
      src/lib/actions \
      src/lib/creation \
-@@ -110,7 +109,6 @@ HEADERS = \
-     dxflib/src/dl_extrusion.h \
-     dxflib/src/dl_writer.h \
-     dxflib/src/dl_writer_ascii.h \
+@@ -100,17 +100,6 @@
+ # ################################################################################
+ # Library
+ HEADERS = \
+-    dxflib/src/dl_attributes.h \
+-    dxflib/src/dl_codes.h \
+-    dxflib/src/dl_creationadapter.h \
+-    dxflib/src/dl_creationinterface.h \
+-    dxflib/src/dl_dxf.h \
+-    dxflib/src/dl_entities.h \
+-    dxflib/src/dl_exception.h \
+-    dxflib/src/dl_extrusion.h \
+-    dxflib/src/dl_writer.h \
+-    dxflib/src/dl_writer_ascii.h \
 -    fparser/src/fparser.h \
      src/lib/actions/rs_actioninterface.h \
      src/lib/actions/rs_preview.h \
      src/lib/actions/rs_previewactioninterface.h \
-@@ -216,7 +214,6 @@ HEADERS = \
+@@ -214,9 +203,7 @@
+     src/lib/scripting/rs_script.h \
+     src/lib/scripting/rs_scriptlist.h \
  
- SOURCES = dxflib/src/dl_dxf.cpp \
-     dxflib/src/dl_writer_ascii.cpp \
+-SOURCES = dxflib/src/dl_dxf.cpp \
+-    dxflib/src/dl_writer_ascii.cpp \
 -    fparser/src/fparser.cpp \
++SOURCES = \
      src/lib/actions/rs_actioninterface.cpp \
      src/lib/actions/rs_preview.cpp \
      src/lib/actions/rs_previewactioninterface.cpp \
diff --git a/debian/rules b/debian/rules
index 4e1e8ad..efd0d94 100755
--- a/debian/rules
+++ b/debian/rules
@@ -20,6 +20,6 @@ get-orig-source:
 	mkdir librecad-${VERSION} && \
 	cp -a librecad/trunk/* librecad-${VERSION} && \
 	rm -rf librecad-${VERSION}/dxflib/config.* \
-	       librecad-${VERSION}/fparser && \
+	       librecad-${VERSION}/fparser librecad-${VERSION}/dxflib && \
 	tar -czf librecad_${VERSION}.orig.tar.gz librecad-${VERSION} && \
 	rm -r librecad/ librecad-${VERSION}/

-- 
2D CAD system