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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-12-27 16:25:26 +0000 (Tue, 27 Dec 2011)
New Revision: 9109

Modified:
   trunk/packages/mummy/trunk/debian/changelog
   trunk/packages/mummy/trunk/debian/rules
Log:
Minor tweak

Modified: trunk/packages/mummy/trunk/debian/changelog
===================================================================
--- trunk/packages/mummy/trunk/debian/changelog	2011-12-26 23:18:36 UTC (rev 9108)
+++ trunk/packages/mummy/trunk/debian/changelog	2011-12-27 16:25:26 UTC (rev 9109)
@@ -1,9 +1,10 @@
-mummy (1.0.2-2) UNRELEASED; urgency=low
+mummy (1.0.2-2) unstable; urgency=low
 
   * Update mummy man page.
-  * Remove quilt B-D
+  * Remove quilt B-D.
+  * Properly set documentation variable in d/rules.
 
- -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Sun, 04 Dec 2011 11:20:15 +0100
+ -- Mathieu Malaterre <mathieu.malaterre at gmail.com>  Tue, 27 Dec 2011 17:24:27 +0100
 
 mummy (1.0.2-1) unstable; urgency=low
 

Modified: trunk/packages/mummy/trunk/debian/rules
===================================================================
--- trunk/packages/mummy/trunk/debian/rules	2011-12-26 23:18:36 UTC (rev 9108)
+++ trunk/packages/mummy/trunk/debian/rules	2011-12-27 16:25:26 UTC (rev 9109)
@@ -3,18 +3,23 @@
 
 DPKG_EXPORT_BUILDFLAGS = 1
 -include /usr/share/dpkg/buildflags.mk
-include /usr/share/cli-common/cli.make
 
 %:
-	dh $@ --parallel
+	dh $@ --parallel --with cli
 
-CMAKE_EXTRA_FLAGS += \
+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
 
+ifeq "" "$(filter %-doc,$(shell dh_listpackages))"
+  CMAKE_FLAGS += -DMummy_BUILD_DOCUMENTATION:BOOL=OFF
+else
+  CMAKE_FLAGS += -DMummy_BUILD_DOCUMENTATION:BOOL=ON
+endif
+
 override_dh_auto_configure:
-	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
+	dh_auto_configure -- $(CMAKE_FLAGS)
 
 debian/mummy.1: debian/mummy.1.in
 	help2man --include=debian/mummy.1.in \