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

[David Paleino]

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

    Disable building the documentation, since doxygen randomly fails on some arches (Closes: #667035)

diff --git a/debian/changelog b/debian/changelog
index 6750f06..9c8709e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+osmium (0.0~20111213-g7f3500a-3) UNRELEASED; urgency=low
+
+  * Disable building the documentation, since doxygen randomly fails
+    on some arches (Closes: #667035)
+
+ -- David Paleino <dapal at debian.org>  Sat, 14 Apr 2012 19:40:00 +0200
+
 osmium (0.0~20111213-g7f3500a-2) unstable; urgency=low
 
   * Switch dependency from libgeos-dev to libgeos++-dev
diff --git a/debian/control b/debian/control
index d50435d..59de7f2 100644
--- a/debian/control
+++ b/debian/control
@@ -6,8 +6,8 @@ Uploaders: David Paleino <dapal at debian.org>
 Build-Depends:
  debhelper (>= 8~)
  , cppcheck
- , doxygen
- , graphviz
+# , doxygen
+# , graphviz
  , libprotobuf-dev
  , protobuf-compiler
  , libv8-dev
@@ -49,26 +49,26 @@ Description: C++ framework for working with OSM data files
  This package provides the header files useful to develop third-party
  applications.
 
-Package: osmium-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}
- , libjs-jquery
-Description: C++ framework for working with OSM data files - docs
- Osmium is a C++ framework for working with OSM data files. Osmium can read
- OSM data in XML or binary format (PBF) and can call different handlers for
- each OSM object.
- .
- Available handlers include:
-  * Javascript handler (calls Javascript callbacks you provide)
-  * Multipolygon handler (assembles areas(multipolygons) from relations and
-    ways)
-  * NodeLocationStore handler (stores node locations and builds way
-    geometries from them)
-  * Statistics handler (does some general statistics)
-  * (others...)
- .
- This package provides documentation about the Osmium framework.
+#Package: osmium-doc
+#Section: doc
+#Architecture: all
+#Depends: ${misc:Depends}
+# , libjs-jquery
+#Description: C++ framework for working with OSM data files - docs
+# Osmium is a C++ framework for working with OSM data files. Osmium can read
+# OSM data in XML or binary format (PBF) and can call different handlers for
+# each OSM object.
+# .
+# Available handlers include:
+#  * Javascript handler (calls Javascript callbacks you provide)
+#  * Multipolygon handler (assembles areas(multipolygons) from relations and
+#    ways)
+#  * NodeLocationStore handler (stores node locations and builds way
+#    geometries from them)
+#  * Statistics handler (does some general statistics)
+#  * (others...)
+# .
+# This package provides documentation about the Osmium framework.
 
 Package: osmjs
 Architecture: any
diff --git a/debian/patches/03-disable_building_docs.patch b/debian/patches/03-disable_building_docs.patch
new file mode 100644
index 0000000..46daf9a
--- /dev/null
+++ b/debian/patches/03-disable_building_docs.patch
@@ -0,0 +1,20 @@
+From: David Paleino <dapal at debian.org>
+Subject: disable building docs, since doxygen randomly fails on "slow" arches
+Origin: vendor
+Forwarded: not-needed
+
+---
+ Makefile |    2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+--- osmium.orig/Makefile
++++ osmium/Makefile
+@@ -43,7 +43,7 @@ indent:
+ doc: doc/html/files.html
+ 
+ doc/html/files.html: include/*.hpp include/*/*.hpp include/*/*/*.hpp
+-	doxygen >/dev/null
++	#doxygen >/dev/null
+ 
+ deb:
+ 	debuild -I -us -uc
diff --git a/debian/patches/series b/debian/patches/series
index a1f6622..2369b95 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 00-fix_typos.patch
 01-fix_ld--as-needed.patch
 02-support_new_libgeos++.patch
+03-disable_building_docs.patch

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