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

[Scott Howard]

The following commit has been merged in the master branch:
commit 1bc9603a0bd9ee36e58da2477ac14730c85ba6f2
Author: Scott Howard <showard314 at gmail.com>
Date:   Sun Dec 5 23:55:32 2010 -0500

    Cleaning up build system

diff --git a/debian/changelog b/debian/changelog
index 6f3cecd..b814b66 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,5 +1,5 @@
 librecad (1.0.0~beta4-1) UNRELEASED; urgency=low
 
-  * Initial release (CLoses: #)
+  * Initial release (CLoses: #605914)
 
- -- Scott Howard <showard314 at gmail.com>  Sat, 04 Dec 2010 12:53:28 -0500
+ -- Scott Howard <showard314 at gmail.com>  Sun, 05 Dec 2010 18:24:07 -0500
diff --git a/debian/control b/debian/control
index acd50a4..79c03f6 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Description: professional CAD system
 
 Package: librecad-data
 Architecture: all
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${misc:Depends}
 Description: professional CAD system -- shared files
  libreCAD is an application for computer aided drafting (CAD) in two 
  dimensions (2D).
diff --git a/debian/librecad-data.install b/debian/librecad-data.install
new file mode 100644
index 0000000..9f1cbd8
--- /dev/null
+++ b/debian/librecad-data.install
@@ -0,0 +1 @@
+unix/resources /usr/share/librecad
diff --git a/debian/librecad.applications b/debian/librecad.applications
index 6cccad5..0671289 100644
--- a/debian/librecad.applications
+++ b/debian/librecad.applications
@@ -1,6 +1,6 @@
 libreCAD
 	requires_terminal=false
-	command=libreCAD
+	command=caduntu
 	expects_uris=false
 	can_open_multiple_files=true
 	name=libreCAD
diff --git a/debian/librecad.install b/debian/librecad.install
index 759173c..f2a8f68 100644
--- a/debian/librecad.install
+++ b/debian/librecad.install
@@ -1 +1,2 @@
-caduntu /usr/bin
+unix/caduntu /usr/bin
+debian/librecad.xpm /usr/share/pixmaps
diff --git a/debian/librecad.menu b/debian/librecad.menu
index 93720b1..916e3f3 100644
--- a/debian/librecad.menu
+++ b/debian/librecad.menu
@@ -1,6 +1,6 @@
-?package(libreCAD):\
+?package(librecad):\
   needs="X11"\
   section="Applications/Science/Engineering"\
-  icon="/usr/share/pixmaps/libreCAD.xpm"\
+  icon="/usr/share/pixmaps/librecad.xpm"\
   title="libreCAD"\
-  command="/usr/bin/libreCAD"
+  command="/usr/bin/caduntu"
diff --git a/debian/librecad.xpm b/debian/librecad.xpm
new file mode 100644
index 0000000..8c7c29e
--- /dev/null
+++ b/debian/librecad.xpm
@@ -0,0 +1,37 @@
+/* XPM */
+static char * librecad_xpm[] = {
+"32 32 2 1",
+" 	c None",
+".	c #F12424",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+" .                              ",
+" .                              ",
+" .     ....      .     ......   ",
+" .    .    .    . .    .    ..  ",
+" .   .          . .    .     .. ",
+" .   .         .   .   .      . ",
+" .   .         .   .   .      . ",
+" .   .        .......  .      . ",
+" .   .        .     .  .     .. ",
+" .    .    .  .     .  .    ..  ",
+" .     ....  .       . ......   ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                ",
+"                                "};
diff --git a/debian/watch b/debian/watch
deleted file mode 100644
index d55780d..0000000
--- a/debian/watch
+++ /dev/null
@@ -1,3 +0,0 @@
-version=3
-opts="uversionmangle=s/^/2.0.5.0-1+/" \
-http://sites.google.com/site/qcadfree/ qcad-free-(.*)\.tar\.bz2

-- 
2D CAD system