This is an automated email from the git hooks/post-receive script.
sebastic-guest pushed a commit to branch master
in repository osmium.
commit 1108fbc10e701a156c62b06cbfa253e55a8b3e5d
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date: Mon Jun 9 00:27:57 2014 +0200
Refresh 03-disable_building_docs.patch.
---
debian/patches/03-disable_building_docs.patch | 38 ++++++++++++---------------
1 file changed, 17 insertions(+), 21 deletions(-)
diff --git a/debian/patches/03-disable_building_docs.patch
b/debian/patches/03-disable_building_docs.patch
index 6d62639..0b71442 100644
--- a/debian/patches/03-disable_building_docs.patch
+++ b/debian/patches/03-disable_building_docs.patch
@@ -2,33 +2,29 @@ From: David Paleino <da...@debian.org>
Subject: disable building docs, since doxygen randomly fails on "slow" arches
Origin: vendor
Forwarded: not-needed
-
----
- Makefile | 6 +++---
- 1 file changed, 3 insertions(+), 3 deletions(-)
-
---- osmium.orig/Makefile
-+++ osmium/Makefile
-@@ -7,7 +7,7 @@
- all:
+--- a/Makefile
++++ b/Makefile
+@@ -18,7 +18,8 @@ all:
+ .PHONY: clean install check check-includes test indent
clean:
-- rm -fr doc/html
-+ #rm -fr doc/html
+- rm -fr check-includes-report doc/html
++ #rm -fr check-includes-report doc/html
++ rm -fr check-includes-report
+ $(MAKE) -C test clean
install: doc
- install -m 755 -g root -o root -d $(DESTDIR)/usr/include
-@@ -15,7 +15,7 @@ install: doc
- install -m 644 -g root -o root README
$(DESTDIR)/usr/share/doc/libosmium-dev/README
- install -m 644 -g root -o root include/osmium.hpp $(DESTDIR)/usr/include
- cp --recursive include/osmium $(DESTDIR)/usr/include
-- cp --recursive doc/html $(DESTDIR)/usr/share/doc/libosmium-dev
-+ #cp --recursive doc/html $(DESTDIR)/usr/share/doc/libosmium-dev
+@@ -27,7 +28,7 @@ install: doc
+ install -m 644 -g $(INSTALL_GROUP) -o $(INSTALL_USER) README
$(DESTDIR)$(PREFIX)/share/doc/libosmium-dev/README
+ install -m 644 -g $(INSTALL_GROUP) -o $(INSTALL_USER)
include/osmium.hpp $(DESTDIR)$(PREFIX)/include
+ cp -r include/osmium $(DESTDIR)$(PREFIX)/include
+- cp -r doc/html $(DESTDIR)$(PREFIX)/share/doc/libosmium-dev
++ #cp -r doc/html $(DESTDIR)$(PREFIX)/share/doc/libosmium-dev
check:
- cppcheck --enable=all -I include */*.cpp test/*/test_*.cpp
-@@ -43,7 +43,7 @@ indent:
- doc: doc/html/files.html
+ cppcheck --enable=all -I include */*.cpp test/t/*/test_*.cpp
+@@ -67,7 +68,7 @@ indent:
+ doc: doc/html/files.html Doxyfile
doc/html/files.html: include/*.hpp include/*/*.hpp include/*/*/*.hpp
- doxygen >/dev/null
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-grass/osmium.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
