This is an automated email from the git hooks/post-receive script.
sebastic pushed a commit to branch stretch
in repository osgearth.
commit 692be954e9db90aa776bb0a95e8cec49e792ac95
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Fri Aug 28 17:02:47 2015 +0200
Use -DCMAKE_VERBOSE_MAKEFILE=1 instead of passing MAKE_VERBOSE.
---
debian/changelog | 6 ++++++
debian/rules | 8 +++-----
2 files changed, 9 insertions(+), 5 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index c0b45d3..a4fcea5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+osgearth (2.5.0+dfsg-5) UNRELEASED; urgency=medium
+
+ * Use -DCMAKE_VERBOSE_MAKEFILE=1 instead of passing MAKE_VERBOSE.
+
+ -- Bas Couwenberg <sebas...@debian.org> Fri, 28 Aug 2015 17:02:17 +0200
+
osgearth (2.5.0+dfsg-4) unstable; urgency=medium
* Add libcurl-ssl-dev as alternative for libcurl-gnutls-dev build dependency.
diff --git a/debian/rules b/debian/rules
index 023ebc8..68386f8 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,8 +22,6 @@ BUILD_DATE := $(shell dpkg-parsechangelog | sed -n 's/^Date:
//p' | LC_ALL=C dat
MANPAGES:=$(wildcard debian/man/*.*.xml)
-MAKE_VERBOSE=1
-
%:
dh $@ --with pkgkde_symbolshelper
@@ -34,7 +32,7 @@ override_dh_clean:
-$(RM) -rf build/
override_dh_auto_configure:
- mkdir -p build && cd build && cmake .. -DCMAKE_BUILD_TYPE=Release
-DCMAKE_INSTALL_PREFIX=/usr -DLIB_POSTFIX=""
-DDEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH)
+ mkdir -p build && cd build && cmake .. -DCMAKE_VERBOSE_MAKEFILE=1
-DCMAKE_BUILD_TYPE=Release -DCMAKE_INSTALL_PREFIX=/usr -DLIB_POSTFIX=""
-DDEB_HOST_MULTIARCH=$(DEB_HOST_MULTIARCH)
override_dh_auto_build:
# Create man pages from DocBook XML
@@ -43,10 +41,10 @@ override_dh_auto_build:
mv `basename $$x | sed 's/.xml$$//'` `dirname $$x` ; \
done
- $(MAKE) $(NJOBS) -C build VERBOSE=$(MAKE_VERBOSE)
+ $(MAKE) $(NJOBS) -C build
override_dh_auto_install:
- $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp
VERBOSE=$(MAKE_VERBOSE)
+ $(MAKE) -C build install DESTDIR=$(CURDIR)/debian/tmp
mkdir -p $(CURDIR)/debian/osgearth-data/usr/share/osgearth/maps && \
cp $(CURDIR)/tests/*.earth
$(CURDIR)/debian/osgearth-data/usr/share/osgearth/maps/ && \
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/osgearth.git
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
