[Pkg-mono-svn-commits] rev 3906 - monodoc/trunk/debian

[David Paleino]

Author: hanska-guest
Date: 2009-02-03 11:56:52 +0000 (Tue, 03 Feb 2009)
New Revision: 3906

Added:
   monodoc/trunk/debian/monodoc-http.links
Modified:
   monodoc/trunk/debian/monodoc-http.dirs
   monodoc/trunk/debian/monodoc-http.install
   monodoc/trunk/debian/rules
Log:
Moving arch-independent data to /usr/share/


Modified: monodoc/trunk/debian/monodoc-http.dirs
===================================================================
--- monodoc/trunk/debian/monodoc-http.dirs	2009-02-03 10:49:23 UTC (rev 3905)
+++ monodoc/trunk/debian/monodoc-http.dirs	2009-02-03 11:56:52 UTC (rev 3906)
@@ -1,3 +1,4 @@
 usr/bin
 usr/share/gnome/apps/Development
 usr/lib/monodoc/web
+usr/share/monodoc/web/xtree

Modified: monodoc/trunk/debian/monodoc-http.install
===================================================================
--- monodoc/trunk/debian/monodoc-http.install	2009-02-03 10:49:23 UTC (rev 3905)
+++ monodoc/trunk/debian/monodoc-http.install	2009-02-03 11:56:52 UTC (rev 3906)
@@ -1,2 +1,4 @@
 engine/web/			/usr/lib/monodoc/
+engine/web/images/	/usr/share/monodoc/web/
+engine/web/xtree/images/	/usr/share/monodoc/web/xtree/
 debian/monodoc-http.desktop	/usr/share/applications/

Added: monodoc/trunk/debian/monodoc-http.links
===================================================================
--- monodoc/trunk/debian/monodoc-http.links	                        (rev 0)
+++ monodoc/trunk/debian/monodoc-http.links	2009-02-03 11:56:52 UTC (rev 3906)
@@ -0,0 +1,3 @@
+/usr/share/monodoc/web/images /usr/lib/monodoc/web/images
+/usr/share/monodoc/web/xtree/images /usr/lib/monodoc/web/xtree/images
+

Modified: monodoc/trunk/debian/rules
===================================================================
--- monodoc/trunk/debian/rules	2009-02-03 10:49:23 UTC (rev 3905)
+++ monodoc/trunk/debian/rules	2009-02-03 11:56:52 UTC (rev 3906)
@@ -36,7 +36,7 @@
 	rm -rf $$MONO_SHARED_DIR/.wapi autom4te.cache/
 	find . -name "Makefile.in" | xargs rm -rf
 	find . -name "*.dll" -o -name "*.mdb" | xargs rm -rf
-	dh_clean configure config.sub config.guess aclocal.m4 missing config-stamp
+	dh_clean configure config.sub config.guess aclocal.m4 missing config-stamp build-stamp
 
 install: build
 	dh_testdir
@@ -51,12 +51,14 @@
 	dh_testdir
 	dh_testroot
 	dh_movefiles
-	dh_link
 	dh_install
 	cp $(CURDIR)/debian/monodoc-http-script $(CURDIR)/debian/monodoc-http/usr/bin/monodoc-http
 	# fix upstream file permissions
-	find debian/monodoc-http/usr/lib/monodoc/web -type f -exec chmod 644 {} \;
-	find debian/monodoc-http/usr/lib/monodoc/web -type d -exec chmod 755 {} \;
+	find debian/monodoc-http/usr/*/monodoc/web -type f -exec chmod 644 {} \;
+	find debian/monodoc-http/usr/*/monodoc/web -type d -exec chmod 755 {} \;
+	# remove directories moved to /usr/share/
+	find debian/monodoc-http/usr/lib/monodoc/web -type d -name "images" | xargs rm -rf
+	dh_link
 	dh_desktop
 	dh_installchangelogs ChangeLog
 	dh_installdocs