[SCM] 2D CAD system branch, master, updated. upstream/1.0.0_beta4-12-g7cf5b52

[Scott Howard]

The following commit has been merged in the master branch:
commit 7cf5b52567e4f7b0d8c415b7ef9486c932db3484
Author: Scott Howard <showard314 at gmail.com>
Date:   Wed Dec 8 20:30:02 2010 -0500

    fixed install so caduntu can find its resources

diff --git a/debian/librecad-data.install b/debian/librecad-data.install
index 9f1cbd8..ef95319 100644
--- a/debian/librecad-data.install
+++ b/debian/librecad-data.install
@@ -1 +1,4 @@
-unix/resources /usr/share/librecad
+unix/resources/fonts /usr/share/caduntu
+unix/resources/library /usr/share/caduntu
+unix/resources/patterns /usr/share/caduntu
+unix/resources/qm /usr/share/caduntu
diff --git a/debian/patches/define-debian-paths.patch b/debian/patches/define-debian-paths.patch
deleted file mode 100644
index 0956c29..0000000
--- a/debian/patches/define-debian-paths.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-Description: Adjust file and directory paths to the Debian environment
-Forwarded: not-needed
-Author: Andreas Fester <Andreas.Fester at gmx.de>
-Index: librecad/src/main/main.cpp
-===================================================================
---- librecad.orig/src/main/main.cpp	2010-12-08 08:24:18.149495105 -0500
-+++ librecad/src/main/main.cpp	2010-12-08 08:25:11.182612394 -0500
-@@ -137,6 +137,13 @@
- 	unit = RS_SETTINGS->readEntry("/Unit", QC_PREDEFINED_UNIT);
- #endif
-     RS_SETTINGS->endGroup();
-+    RS_SETTINGS->beginGroup("/Paths");
-+    RS_SETTINGS->writeEntry("/Translations", QString("/usr/share/qcad/qm"));
-+    RS_SETTINGS->writeEntry("/Patterns", QString("/usr/share/qcad/patterns"));
-+    RS_SETTINGS->writeEntry("/Fonts", QString("/usr/share/qcad/fonts"));
-+    RS_SETTINGS->writeEntry("/Scripts", QString("/usr/share/qcad/scripts"));
-+    RS_SETTINGS->writeEntry("/Library", QString("/usr/share/qcad/libraries"));
-+    RS_SETTINGS->endGroup();
- 
- 	// show initial config dialog:
- 	if (unit=="Invalid") {
diff --git a/debian/patches/rs_debug.patch b/debian/patches/rs_debug.patch
new file mode 100644
index 0000000..cd87c3b
--- /dev/null
+++ b/debian/patches/rs_debug.patch
@@ -0,0 +1,15 @@
+Description: Outputs rs_debugging info
+Author: "Rallaz" http://download.opensuse.org/repositories/home:/Rallaz/Fedora_13/src/
+Index: librecad/src/lib/debug/rs_debug.cpp
+===================================================================
+--- librecad.orig/src/lib/debug/rs_debug.cpp	2010-12-08 20:19:12.538204796 -0500
++++ librecad/src/lib/debug/rs_debug.cpp	2010-12-08 20:19:14.898056945 -0500
+@@ -147,7 +147,7 @@
+     RS_String nowStr;
+ 
+ 		nowStr = now.toString("yyyyMMdd_hh:mm:ss:zzz ");
+-    fprintf(stream, nowStr.latin1());
++    fprintf(stream, "%s", nowStr.toLatin1().data());
+     fprintf(stream, "\n");
+     fflush(stream);
+ }
diff --git a/debian/patches/series b/debian/patches/series
index b03b0a5..f03c88c 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1,4 @@
+rs_debug.patch
 bug#234340.patch
-define-debian-paths.patch
 qcad-2.0.5.0-latin2.patch
 # autosave.patch

-- 
2D CAD system