[Pkg-osm-commits] [SCM] osmium branch, master, updated. debian/0.0_20111213-g7f3500a-2-4-gccbc090

David Paleino dapal at debian.org
Sat Apr 14 18:34:08 UTC 2012


The following commit has been merged in the master branch:
commit a69bdc88c69441f43e898c6c494033c59adef568
Author: David Paleino <dapal at debian.org>
Date:   Sat Apr 14 19:54:40 2012 +0200

    Don't even reference docs in the Makefile

diff --git a/debian/patches/03-disable_building_docs.patch b/debian/patches/03-disable_building_docs.patch
index 46daf9a..6d62639 100644
--- a/debian/patches/03-disable_building_docs.patch
+++ b/debian/patches/03-disable_building_docs.patch
@@ -4,11 +4,29 @@ Origin: vendor
 Forwarded: not-needed
 
 ---
- Makefile |    2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
+ Makefile |    6 +++---
+ 1 file changed, 3 insertions(+), 3 deletions(-)
 
 --- osmium.orig/Makefile
 +++ osmium/Makefile
+@@ -7,7 +7,7 @@
+ all:
+ 
+ clean:
+-	rm -fr doc/html
++	#rm -fr doc/html
+ 
+ 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
+ 
+ check:
+ 	cppcheck --enable=all -I include */*.cpp test/*/test_*.cpp
 @@ -43,7 +43,7 @@ indent:
  doc: doc/html/files.html
  

-- 
C++ framework for working with OSM data files



More information about the Pkg-osm-commits mailing list