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

[Mathieu Malaterre]

Author: malat-guest
Date: 2011-10-19 13:17:09 +0000 (Wed, 19 Oct 2011)
New Revision: 8209

Modified:
   trunk/packages/mummy/trunk/debian/control
   trunk/packages/mummy/trunk/debian/get-orig-source.sh
   trunk/packages/mummy/trunk/debian/rules
Log:
use cableswig and gccxml from debian packages

Modified: trunk/packages/mummy/trunk/debian/control
===================================================================
--- trunk/packages/mummy/trunk/debian/control	2011-10-19 13:16:35 UTC (rev 8208)
+++ trunk/packages/mummy/trunk/debian/control	2011-10-19 13:17:09 UTC (rev 8209)
@@ -4,9 +4,10 @@
 Maintainer: Debian Med Packaging Team <debian-med-packaging at lists.alioth.debian.org>
 DM-Upload-Allowed: yes
 Uploaders: Mathieu Malaterre <mathieu.malaterre at gmail.com>
-Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), cmake (>= 2.8.2), mono-devel, cli-common-dev (>= 0.5.7)
+Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), cmake (>= 2.8.2),
+ mono-devel, cli-common-dev (>= 0.5.7), libcableswig-dev, libgccxml-dev
 Build-Depends-Indep: doxygen (>= 1.6.2), graphviz
-Standards-Version: 3.9.1
+Standards-Version: 3.9.2
 Homepage: http://www.kitware.com/products/avdownload.php
 Vcs-Svn: svn://svn.debian.org/svn/debian-science/packages/mummy/trunk
 Vcs-Browser: http://svn.debian.org/viewsvn/debian-science/packages/mummy/trunk

Modified: trunk/packages/mummy/trunk/debian/get-orig-source.sh
===================================================================
--- trunk/packages/mummy/trunk/debian/get-orig-source.sh	2011-10-19 13:16:35 UTC (rev 8208)
+++ trunk/packages/mummy/trunk/debian/get-orig-source.sh	2011-10-19 13:17:09 UTC (rev 8209)
@@ -13,22 +13,23 @@
 cd mummy-$VERSION
 rm -rf .git
 
-mkdir mummyExternalSourceTrees
-cd mummyExternalSourceTrees
+#mkdir mummyExternalSourceTrees
+#cd mummyExternalSourceTrees
+#
+## We need a convienient copy of CableSwig
+#DATE=20110217
+#
+#cvs -Q -z3 -d :pserver:anonymous at public.kitware.com:/cvsroot/CableSwig export -D ${DATE} CableSwig
+#
+## Use a light weigth version of cableswig:
+## we do not need GCC source tree
+#rm -rf CableSwig/GCC
+#rm -rf CableSwig/SWIG
+#rm -rf CableSwig/GCC_XML/Support
+#rm -rf CableSwig/GCC_XML/VcInstall
+#rm -rf CableSwig/GCC_XML/Patches
+#
+#cd ../..
+cd ..
 
-# We need a convienient copy of CableSwig
-DATE=20110217
-
-cvs -Q -z3 -d :pserver:anonymous at public.kitware.com:/cvsroot/CableSwig export -D ${DATE} CableSwig
-
-# Use a light weigth version of cableswig:
-# we do not need GCC source tree
-rm -rf CableSwig/GCC
-rm -rf CableSwig/SWIG
-rm -rf CableSwig/GCC_XML/Support
-rm -rf CableSwig/GCC_XML/VcInstall
-rm -rf CableSwig/GCC_XML/Patches
-
-cd ../..
-
 GZIP="--best --no-name" tar cfz mummy_$VERSION.orig.tar.gz mummy-$VERSION

Modified: trunk/packages/mummy/trunk/debian/rules
===================================================================
--- trunk/packages/mummy/trunk/debian/rules	2011-10-19 13:16:35 UTC (rev 8208)
+++ trunk/packages/mummy/trunk/debian/rules	2011-10-19 13:17:09 UTC (rev 8209)
@@ -1,17 +1,19 @@
 #!/usr/bin/make -f
-include /usr/share/cli-common/cli.make
-
-# Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
 
-# This has to be exported to make some magic below work.
-export DH_OPTIONS
+DPKG_EXPORT_BUILDFLAGS = 1
+-include /usr/share/dpkg/buildflags.mk
+#-include /usr/share/cli-common/cli.make
 
 %:
 	dh $@ --parallel
 
+CMAKE_EXTRA_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
+
 override_dh_auto_configure:
-	dh_auto_configure -- -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 -DCMAKE_BUILD_TYPE:STRING=Release
+	dh_auto_configure -- $(CMAKE_EXTRA_FLAGS)
 
 get-orig-source:
 	./debian/get-orig-source.sh