r13759 - packages/trunk/nikki/debian

[Paul Wise]

Author: pabs
Date: 2012-08-14 03:19:06 +0000 (Tue, 14 Aug 2012)
New Revision: 13759

Modified:
   packages/trunk/nikki/debian/control
   packages/trunk/nikki/debian/rules
Log:
Add test suite stuff (disabled until the next release)

Modified: packages/trunk/nikki/debian/control
===================================================================
--- packages/trunk/nikki/debian/control	2012-08-13 03:26:45 UTC (rev 13758)
+++ packages/trunk/nikki/debian/control	2012-08-14 03:19:06 UTC (rev 13759)
@@ -6,6 +6,7 @@
  Joachim Breitner <nomeata at debian.org>,
  Miriam Ruiz <miriam at debian.org>
 Build-Depends:
+ cabal-install,
  cmake,
  debhelper (>= 9),
  ghc,

Modified: packages/trunk/nikki/debian/rules
===================================================================
--- packages/trunk/nikki/debian/rules	2012-08-13 03:26:45 UTC (rev 13758)
+++ packages/trunk/nikki/debian/rules	2012-08-14 03:19:06 UTC (rev 13759)
@@ -16,7 +16,7 @@
 override_dh_auto_clean:
 	[ ! -e src/rootInstall/dist/setup ] || { cd src/rootInstall && ./dist/setup clean ; }
 	cd src && bash clean.sh
-	rm -f src/Setup.hi src/Setup.o nikki.xpm
+	rm -rf src/Setup.hi src/Setup.o nikki.xpm src/testsuite/.cabal
 
 override_dh_auto_install:
 	cd src/rootInstall && ./dist/setup copy --destdir=../../debian/nikki/
@@ -24,6 +24,11 @@
 	rm -f debian/nikki/usr/share/nikki/README
 	mkdir -p debian/nikki/usr/share/doc/nikki
 
+# Disabled until 0.5.1.3 or later is released
+# Earlier versions require an unnessecary dependency
+#override_dh_auto_test:
+#	cd src/testsuite && HOME=. cabal configure && HOME=. cabal build && ./dist/build/testsuite/testsuite
+
 override_dh_install:
 	dh_install
 	prename s/icon-[0-9]+/nikki/ debian/nikki/usr/share/icons/hicolor/*/apps/icon-*.png