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

Scott Howard showard314 at gmail.com
Tue Sep 25 20:34:11 UTC 2012


The following commit has been merged in the master branch:
commit e1739c327190ccde3c2598ac00e628e4c2315851
Author: Scott Howard <showard314 at gmail.com>
Date:   Tue Sep 25 16:34:05 2012 -0400

    cleaned up some of the new file locations

diff --git a/debian/librecad-data.docs b/debian/librecad-data.docs
deleted file mode 100644
index c078c5c..0000000
--- a/debian/librecad-data.docs
+++ /dev/null
@@ -1 +0,0 @@
-unix/resources/doc/
diff --git a/debian/librecad-data.install b/debian/librecad-data.install
index b3f9dda..2728e2e 100644
--- a/debian/librecad-data.install
+++ b/debian/librecad-data.install
@@ -2,3 +2,4 @@ unix/resources/fonts /usr/share/librecad
 unix/resources/library /usr/share/librecad
 unix/resources/patterns /usr/share/librecad
 unix/resources/qm /usr/share/librecad
+unix/resources/doc/ /usr/share/librecad
diff --git a/debian/librecad-data.links b/debian/librecad-data.links
index d7ff2d3..f656a83 100644
--- a/debian/librecad-data.links
+++ b/debian/librecad-data.links
@@ -1 +1,2 @@
-/usr/share/doc/librecad/doc/ /usr/share/librecad/doc/
+/usr/share/doc/librecad/doc/LibreCADdoc.qch /usr/share/librecad/doc/LibreCADdoc.qch
+/usr/share/doc/librecad/doc/LibreCADdoc.qhc /usr/share/librecad/doc/LibreCADdoc.qhc
diff --git a/debian/rules b/debian/rules
index c4a706b..e38bdc6 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,7 +12,7 @@ override_dh_clean:
 	dh_clean
 	rm -rf unix/
 	find . -name *.qm -delete
-	rm -rf debian/librecad.1 debian/librecad.desktop debian/librecad.sharedmimeinfo debian/librecad.mime debian/librecad.png debian/librecad.xpm debian/librecad.svg support/doc/LibreCADdoc.qch support/doc/LibreCADdoc.qhc plugins/intermediate
+	rm -rf debian/librecad.1 debian/librecad.desktop debian/librecad.sharedmimeinfo debian/librecad.mime debian/librecad.png debian/librecad.xpm debian/librecad.svg librecad/support/doc/LibreCADdoc.qch librecad/support/doc/LibreCADdoc.qhc plugins/intermediate generated/
 
 override_dh_auto_configure:
 	dh_auto_configure -- librecad.pro

-- 
2D CAD system



More information about the debian-science-commits mailing list