From 812a7ce660cdbfc92d38094d99592cbbab936fa0 Mon Sep 17 00:00:00 2001 From: Bastian Holst Date: Wed, 4 Aug 2010 22:32:14 +0200 Subject: [PATCH] Updated changelog to the current svn version. --- packaging/debian/changelog | 12 ++++++++++++ packaging/debian/rules | 2 +- 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/packaging/debian/changelog b/packaging/debian/changelog index 0e198e4..165335a 100644 --- a/packaging/debian/changelog +++ b/packaging/debian/changelog @@ -1,3 +1,15 @@ +marble (0.10-svn+1159226-2) fremantle; urgency=low + + * Removed unit tests from build. + + -- Bastian Holst Sun, 08 Aug 2010 16:53:03 +0200 + +marble (0.10-svn+1159226-1) unstable; urgency=low + + * New upstream version + + -- Bastian Holst Wed, 04 Aug 2010 21:41:28 +0200 + marble (0.10-svn+1115543-1) unstable; urgency=low * New upstream version (auto-select OSM on first start) diff --git a/packaging/debian/rules b/packaging/debian/rules index b8bbabe..cddadc3 100755 --- a/packaging/debian/rules +++ b/packaging/debian/rules @@ -5,7 +5,7 @@ include /usr/share/cdbs/1/rules/debhelper.mk include /usr/share/cdbs/1/class/makefile.mk include /usr/share/cdbs/1/rules/simple-patchsys.mk -CMAKE = cmake -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/tmp/opt/marble -DMARBLE_DATA_INSTALL_PATH=$(CURDIR)/debian/tmp/opt/marble/share/marble/data -DQTONLY=ON -DMARBLE_DATA_PATH=/opt/marble/share/marble/data -DMARBLE_PLUGIN_INSTALL_PATH=$(CURDIR)/debian/tmp/opt/marble/lib/marble/plugins -DMARBLE_PLUGIN_PATH=/opt/marble/lib/marble/plugins -DPACKAGE_ROOT_PREFIX=$(CURDIR)/debian/tmp -DCMAKE_SKIP_RPATH=ON +CMAKE = cmake -DCMAKE_INSTALL_PREFIX=$(CURDIR)/debian/tmp/opt/marble -DMARBLE_DATA_INSTALL_PATH=$(CURDIR)/debian/tmp/opt/marble/share/marble/data -DQTONLY=ON -DMARBLE_DATA_PATH=/opt/marble/share/marble/data -DMARBLE_PLUGIN_INSTALL_PATH=$(CURDIR)/debian/tmp/opt/marble/lib/marble/plugins -DMARBLE_PLUGIN_PATH=/opt/marble/lib/marble/plugins -DPACKAGE_ROOT_PREFIX=$(CURDIR)/debian/tmp -DCMAKE_SKIP_RPATH=ON -DBUILD_MARBLE_TESTS=OFF -DENABLE_TESTS=FALSE DEB_MAKE_INSTALL_TARGET = install -- 1.7.9.5