[SCM] 2D CAD system branch, master, updated. debian/2.0.0_alpha2+nolibs-1-13-geccde83

[Scott Howard]

The following commit has been merged in the master branch:
commit da40c3c620c3b3f4d8f7ce4b17b5db40c87ea49b
Author: Scott Howard <showard at debian.org>
Date:   Mon Apr 16 13:07:06 2012 -0400

    Refreshed patches

diff --git a/debian/changelog b/debian/changelog
index 6fe192d..38c0634 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,9 @@
 librecad (2.0.0~alpha3+nolibs-1) experimental; urgency=low
 
   * New upstream release
+  * Refreshed patches
 
- -- Scott Howard <showard at debian.org>  Mon, 16 Apr 2012 12:50:45 -0400
+ -- Scott Howard <showard at debian.org>  Mon, 16 Apr 2012 13:06:49 -0400
 
 librecad (2.0.0~alpha2+nolibs-1) experimental; urgency=low
 
diff --git a/debian/patches/debian_build.patch b/debian/patches/debian_build.patch
index b687145..6a11f0c 100644
--- a/debian/patches/debian_build.patch
+++ b/debian/patches/debian_build.patch
@@ -25,53 +25,44 @@ 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>
 
---- librecad-2.0.0~alpha2+nolibs.orig/libraries/libraries.pro
-+++ librecad-2.0.0~alpha2+nolibs/libraries/libraries.pro
-@@ -10,8 +10,6 @@ TARGET = libraries
+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 \
--        fparser
-+        jwwlib
+         jwwlib
  
  
---- librecad-2.0.0~alpha2+nolibs.orig/librecad/src/src.pro
-+++ librecad-2.0.0~alpha2+nolibs/librecad/src/src.pro
-@@ -33,9 +33,7 @@ CONFIG += qt \
+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
--PRE_TARGETDEPS += ../../generated/lib/libfparser.a
  
  DESTDIR = $${INSTALLDIR}
+@@ -76,7 +75,7 @@
  
-@@ -69,17 +67,16 @@ win32 {
- }
- 
- # Additional libraries to load
--LIBS += -L../../generated/lib  \
-+LIBS += -L../../generated/lib \
-     -ldxflib \
-     -ldxfrw \
-     -ljwwlib \
-     -lfparser
  
  DEPENDPATH += \
 -    ../../libraries/dxflib/src \
 +    /usr/include/dxflib \
      ../../libraries/libdxfrw/src \
      ../../libraries/jwwlib/src \
--    ../../libraries/fparser \
      cmd \
-     lib/actions \
-     lib/creation \
---- librecad-2.0.0~alpha2+nolibs.orig/libraries/jwwlib/jwwlib.pro
-+++ librecad-2.0.0~alpha2+nolibs/libraries/jwwlib/jwwlib.pro
-@@ -22,7 +22,7 @@ include(../../settings.pro)
+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 @@
  include(../../common.pro)
  
  INCLUDEPATH += \

-- 
2D CAD system