[med-svn] r9120 - trunk/packages/mummy/trunk/debian

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-12-28 15:11:37 +0000 (Wed, 28 Dec 2011)
New Revision: 9120

Added:
   trunk/packages/mummy/trunk/debian/mummy-doc.docs
Removed:
   trunk/packages/mummy/trunk/debian/mummy-doc.install
Modified:
   trunk/packages/mummy/trunk/debian/changelog
   trunk/packages/mummy/trunk/debian/rules
Log:
Update to fix mono FTBFS

Modified: trunk/packages/mummy/trunk/debian/changelog
===================================================================
--- trunk/packages/mummy/trunk/debian/changelog	2011-12-28 12:53:02 UTC (rev 9119)
+++ trunk/packages/mummy/trunk/debian/changelog	2011-12-28 15:11:37 UTC (rev 9120)
@@ -1,3 +1,13 @@
+mummy (1.0.2-4) unstable; urgency=low
+
+  [ Iain Lane ]
+  * Use Debian's default compiler /usr/bin/mono-csc
+
+  [ Mathieu Malaterre ]
+  * Use dh_installdocs for docs
+
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Wed, 28 Dec 2011 16:04:30 +0100
+
 mummy (1.0.2-3) unstable; urgency=low
 
   * Fix failure on buildd since -indep is ran anyway

Copied: trunk/packages/mummy/trunk/debian/mummy-doc.docs (from rev 9119, trunk/packages/mummy/trunk/debian/mummy-doc.install)
===================================================================
--- trunk/packages/mummy/trunk/debian/mummy-doc.docs	                        (rev 0)
+++ trunk/packages/mummy/trunk/debian/mummy-doc.docs	2011-12-28 15:11:37 UTC (rev 9120)
@@ -0,0 +1 @@
+debian/tmp/usr/share/html

Deleted: trunk/packages/mummy/trunk/debian/mummy-doc.install
===================================================================
--- trunk/packages/mummy/trunk/debian/mummy-doc.install	2011-12-28 12:53:02 UTC (rev 9119)
+++ trunk/packages/mummy/trunk/debian/mummy-doc.install	2011-12-28 15:11:37 UTC (rev 9120)
@@ -1 +0,0 @@
-usr/share/html   usr/share/doc/mummy-doc

Modified: trunk/packages/mummy/trunk/debian/rules
===================================================================
--- trunk/packages/mummy/trunk/debian/rules	2011-12-28 12:53:02 UTC (rev 9119)
+++ trunk/packages/mummy/trunk/debian/rules	2011-12-28 15:11:37 UTC (rev 9120)
@@ -7,7 +7,8 @@
 CMAKE_FLAGS += \
 	-DMummy_INSTALL_PREFIX:PATH=/usr \
 	-DMUMMY_RUNTIME_UNMANAGED_INSTALL_LIB_DIR:STRING=lib/cli/Kitware.mummy.Runtime-1.0 \
-	-DMummy_SNKEYFILE:STRING=/usr/share/cli-common/keys/mono.snk
+	-DMummy_SNKEYFILE:STRING=/usr/share/cli-common/keys/mono.snk \
+	-Dcsc_EXECUTABLE=/usr/bin/mono-csc
 
 # B-D-I is still not quite right on buildd, but anyway let's be prepared:
 #ifeq "" "$(filter %-doc,$(shell dh_listpackages))"