[SCM] 2D CAD system branch, master, updated. debian/2.0.0_alpha3+nolibs-1-6-g2201631

[Scott Howard]

The following commit has been merged in the master branch:
commit 22016310b37a4d42ad49dc88ed928057064e6c6c
Author: Scott Howard <showard at debian.org>
Date:   Mon Jul 2 22:14:20 2012 -0400

    refreshed patch

diff --git a/debian/patches/debian_build.patch b/debian/patches/debian_build.patch
index 6a11f0c..c25eefc 100644
--- a/debian/patches/debian_build.patch
+++ b/debian/patches/debian_build.patch
@@ -25,49 +25,18 @@ Forwarded: <no|not-needed|url proving that it has been forwarded>
 Reviewed-By: <name and email of someone who approved the patch>
 Last-Update: <YYYY-MM-DD>
 
-Index: librecad/libraries/libraries.pro
-===================================================================
---- librecad.orig/libraries/libraries.pro	2012-04-16 13:02:35.000000000 -0400
-+++ librecad/libraries/libraries.pro	2012-04-16 13:05:07.296793166 -0400
-@@ -10,7 +10,6 @@
- 
- SUBDIRS     = \
-         libdxfrw \
--        dxflib \
-         jwwlib
- 
- 
-Index: librecad/librecad/src/src.pro
-===================================================================
---- librecad.orig/librecad/src/src.pro	2012-04-16 13:02:35.000000000 -0400
-+++ librecad/librecad/src/src.pro	2012-04-16 13:06:18.480794859 -0400
-@@ -33,7 +33,6 @@
-     help verbose
- 
- PRE_TARGETDEPS += ../../generated/lib/libdxfrw.a
--PRE_TARGETDEPS += ../../generated/lib/libdxflib.a
- PRE_TARGETDEPS += ../../generated/lib/libjwwlib.a
- 
- DESTDIR = $${INSTALLDIR}
-@@ -76,7 +75,7 @@
- 
- 
- DEPENDPATH += \
--    ../../libraries/dxflib/src \
-+    /usr/include/dxflib \
-     ../../libraries/libdxfrw/src \
-     ../../libraries/jwwlib/src \
-     cmd \
 Index: librecad/libraries/jwwlib/jwwlib.pro
 ===================================================================
---- librecad.orig/libraries/jwwlib/jwwlib.pro	2012-04-16 12:53:12.000000000 -0400
-+++ librecad/libraries/jwwlib/jwwlib.pro	2012-04-16 13:04:13.204791881 -0400
-@@ -22,7 +22,7 @@
+--- librecad.orig/libraries/jwwlib/jwwlib.pro	2012-07-02 19:16:48.000000000 -0400
++++ librecad/libraries/jwwlib/jwwlib.pro	2012-07-02 19:21:11.142934950 -0400
+@@ -21,8 +21,8 @@
+ include(../../settings.pro)
  include(../../common.pro)
  
- INCLUDEPATH += \
--    ../dxflib/src
+-#INCLUDEPATH += \
+-#    ../dxflib/src
++INCLUDEPATH += \
 +    /usr/include/dxflib
  
  SOURCES += \
-     src/dl_jww.cpp \
+     src/dl_writer_ascii.cpp \

-- 
2D CAD system