This is an automated email from the git hooks/post-receive script.

sebastic pushed a commit to branch master
in repository libosmium.

commit 7ea282f542d1314121a02e4cfc630f17069f7145
Author: Bas Couwenberg <sebas...@xs4all.nl>
Date:   Fri Mar 6 22:47:08 2015 +0100

    Install generated HTML documentation.
---
 debian/control                               | 25 ++++++++++++++++++++++++-
 debian/{docs => libosmium2-dev.docs}         |  0
 debian/{examples => libosmium2-dev.examples} |  0
 debian/{install => libosmium2-dev.install}   |  0
 debian/libosmium2-doc.doc-base               |  8 ++++++++
 debian/libosmium2-doc.docs                   |  1 +
 debian/libosmium2-doc.links                  |  1 +
 debian/rules                                 | 15 +++++++++++++--
 8 files changed, 47 insertions(+), 3 deletions(-)

diff --git a/debian/control b/debian/control
index 532c16b..fa3f639 100644
--- a/debian/control
+++ b/debian/control
@@ -28,11 +28,12 @@ Package: libosmium2-dev
 Architecture: any
 Section: libdevel
 Depends: ${misc:Depends}
+Recommends: libosmium2-doc
 Suggests: osmium-tool,
           osmium-contrib,
           node-osmium,
           pyosmium
-Description: Fast and flexible C++ library for working with OpenStreetMap data
+Description: C++ framework for working with OSM data files
  The Osmium library has extensive support for all types of OSM entities: nodes,
  ways, relations, and changesets. It allows reading from and writing to OSM
  files in XML and PBF formats, including change files and full history files.
@@ -44,4 +45,26 @@ Description: Fast and flexible C++ library for working with 
OpenStreetMap data
  .
  Osmium is a header-only library, so there is nothing to compile to build it.
  Just include the header files you need.
+ .
+ This package contains the Osmium library headers.
+
+Package: libosmium2-doc
+Architecture: all
+Section: doc
+Depends: libjs-jquery,
+         ${misc:Depends}
+Description: C++ framework for working with OSM data files - documentation
+ The Osmium library has extensive support for all types of OSM entities: nodes,
+ ways, relations, and changesets. It allows reading from and writing to OSM
+ files in XML and PBF formats, including change files and full history files.
+ Osmium can store OSM data in memory and on disk in various formats and using
+ various indexes. Its easy to use handler interface allows you to quickly write
+ data filtering and conversion functions. Osmium can create WKT, WKB, OGR, GEOS
+ and GeoJSON geometries for easy conversion into many GIS formats and it can
+ assemble multipolygons from ways and relations.
+ .
+ Osmium is a header-only library, so there is nothing to compile to build it.
+ Just include the header files you need.
+ .
+ This package contains the Osmium library documentation.
 
diff --git a/debian/docs b/debian/libosmium2-dev.docs
similarity index 100%
rename from debian/docs
rename to debian/libosmium2-dev.docs
diff --git a/debian/examples b/debian/libosmium2-dev.examples
similarity index 100%
rename from debian/examples
rename to debian/libosmium2-dev.examples
diff --git a/debian/install b/debian/libosmium2-dev.install
similarity index 100%
rename from debian/install
rename to debian/libosmium2-dev.install
diff --git a/debian/libosmium2-doc.doc-base b/debian/libosmium2-doc.doc-base
new file mode 100644
index 0000000..3b407f7
--- /dev/null
+++ b/debian/libosmium2-doc.doc-base
@@ -0,0 +1,8 @@
+Document: libosmium
+Title: libosmium documentation
+Author: Jochen Topf
+Section: Programming/C++
+
+Format: HTML
+Index: /usr/share/doc/libosmium2-doc/html/index.html
+Files: /usr/share/doc/libosmium2-doc/html/*.html
diff --git a/debian/libosmium2-doc.docs b/debian/libosmium2-doc.docs
new file mode 100644
index 0000000..708e851
--- /dev/null
+++ b/debian/libosmium2-doc.docs
@@ -0,0 +1 @@
+build/doc/html/
diff --git a/debian/libosmium2-doc.links b/debian/libosmium2-doc.links
new file mode 100644
index 0000000..cf85f0b
--- /dev/null
+++ b/debian/libosmium2-doc.links
@@ -0,0 +1 @@
+usr/share/javascript/jquery/jquery.js 
usr/share/libosmium2-dev/doc/html/jquery.js
diff --git a/debian/rules b/debian/rules
index a1be1b6..4731120 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,10 +11,21 @@ export VERBOSE=1
 override_dh_auto_configure:
        dh_auto_configure -- -DCMAKE_VERBOSE_MAKEFILE=1
 
-override_dh_auto_build:
-       dh_auto_build
+override_dh_auto_build-arch:
+       dh_auto_build --arch
+
+override_dh_auto_build-indep:
        (cd build && $(MAKE) doc)
 
 override_dh_auto_test:
        (cd build && ctest -V)
 
+override_dh_installdocs:
+       dh_installdocs
+
+       # Remove embedded jquery.js in favor of libjs-query
+       $(RM) debian/*/usr/share/doc/*/html/jquery.js
+
+       # Remove useless autogenerated doxygen file
+       $(RM) debian/*/usr/share/doc/*/html/*.md5
+

-- 
Alioth's /usr/local/bin/git-commit-notice on 
/srv/git.debian.org/git/pkg-grass/libosmium.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

Reply via email to