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

[Scott Howard]

The following commit has been merged in the master branch:
commit b31b8c15e4230a5d4de3b52ff0d84414ed0d17f7
Author: Scott Howard <showard314 at gmail.com>
Date:   Sat Jun 18 13:57:16 2011 -0400

    popping patches

diff --git a/desktop/graphics_icons_and_splash/Icon LibreCAD/Icon_Librecad.svg b/desktop/graphics_icons_and_splash/Icon LibreCAD/Icon_Librecad.svg
index 61df798..8dee71f 100644
--- a/desktop/graphics_icons_and_splash/Icon LibreCAD/Icon_Librecad.svg	
+++ b/desktop/graphics_icons_and_splash/Icon LibreCAD/Icon_Librecad.svg	
@@ -9,11 +9,11 @@
    xmlns="http://www.w3.org/2000/svg"
    xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
    xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
-   width="99.999725"
-   height="100.00037"
+   width="744.09448819"
+   height="1052.3622047"
    id="svg2"
    version="1.1"
-   inkscape:version="0.48.1 r9760"
+   inkscape:version="0.48.0 r9654"
    sodipodi:docname="Icon_Librecad.svg">
   <title
      id="title3808">LibreCAD Icon</title>
@@ -37,20 +37,16 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="6.1060241"
-     inkscape:cx="53.295482"
-     inkscape:cy="49.04802"
+     inkscape:cx="282.85714"
+     inkscape:cy="564.28571"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
-     inkscape:window-width="1440"
-     inkscape:window-height="876"
+     inkscape:window-width="1680"
+     inkscape:window-height="942"
      inkscape:window-x="0"
-     inkscape:window-y="24"
-     inkscape:window-maximized="1"
-     fit-margin-top="0"
-     fit-margin-left="0"
-     fit-margin-right="0"
-     fit-margin-bottom="0" />
+     inkscape:window-y="0"
+     inkscape:window-maximized="0" />
   <metadata
      id="metadata7">
     <rdf:RDF>
@@ -99,8 +95,7 @@
   <g
      inkscape:label="Layer 1"
      inkscape:groupmode="layer"
-     id="layer1"
-     transform="translate(-226.69563,-436.90297)">
+     id="layer1">
     <rect
        height="100.00001"
        width="99.999428"
@@ -116,13 +111,13 @@
        inkscape:connector-curvature="0" />
     <g
        id="g3010"
-       transform="translate(-95.35188,-39.277969)">
+       transform="translate(-95.351883,-39.277969)">
       <polygon
          transform="matrix(5.7120336,0,0,5.7120336,322.04724,476.18085)"
          style="fill:#4d4d4d"
          id="_471970800"
          class="fil2"
-         points="0.000103387,6.65257 4.20177,6.65257 4.20177,7.70289 17.5069,7.70289 17.5069,9.80372 4.20177,9.80372 4.20177,10.8542 0.000103387,10.8542 " />
+         points="4.20177,7.70289 17.5069,7.70289 17.5069,9.80372 4.20177,9.80372 4.20177,10.8542 0.000103387,10.8542 0.000103387,6.65257 4.20177,6.65257 " />
       <g
          id="g3004">
         <rect
diff --git a/librecad.pro b/librecad.pro
index a22c8e2..dcf737f 100755
--- a/librecad.pro
+++ b/librecad.pro
@@ -62,9 +62,8 @@ win32 {
 
 
 # Additional libraries to load
-LIBS += \
- -lfparser \
- -ldxflib
+# LIBS += \
+# -Ldxflib/lib -ldxf \
 # Store intermedia stuff somewhere else
 OBJECTS_DIR = intermediate/obj
 MOC_DIR = intermediate/moc
@@ -75,7 +74,8 @@ UI_HEADERS_DIR = intermediate/ui
 UI_SOURCES_DIR = intermediate/ui
 RESOURCES += res/extui/extui.qrc
 
-INCLUDEPATH += \
+INCLUDEPATH += dxflib/src \
+    fparser \
     src/cmd \
     src/lib/actions \
     src/lib/creation \
@@ -98,6 +98,17 @@ INCLUDEPATH += \
 # ################################################################################
 # 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/fparser.hh \
     src/lib/actions/rs_actioninterface.h \
     src/lib/actions/rs_preview.h \
     src/lib/actions/rs_previewactioninterface.h \
@@ -205,7 +216,9 @@ HEADERS = \
     src/plugins/document_interface.h \
     src/plugins/qc_plugininterface.h
 
-SOURCES = \
+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