[SCM] osmium branch, master, updated. debian/0.0_20111213-g7f3500a-3-4-g856f847

[Andreas Tille]

The following commit has been merged in the master branch:
commit 9fdcfece0c7002f2ae0effd9ee216c2f434c5798
Author: Andreas Tille <tille at debian.org>
Date:   Tue Dec 17 17:49:33 2013 +0100

    cme fix dpkg-control (+readded commented osmium-doc paragraph), Priority: optional

diff --git a/debian/changelog b/debian/changelog
index f6486da..8d7dd79 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,6 +3,8 @@ osmium (0.0~20111213-g7f3500a-4) UNRELEASED; urgency=medium
   * debian/control:
     - Added myself as Uploader
     - Moved to pkg-grass team (in Vcs fields)
+    - cme fix dpkg-control (+readded commented osmium-doc paragraph)
+    - Priority: optional
 
  -- Andreas Tille <tille at debian.org>  Tue, 17 Dec 2013 17:27:00 +0100
 
diff --git a/debian/control b/debian/control
index 2aad05a..d836fdf 100644
--- a/debian/control
+++ b/debian/control
@@ -1,38 +1,38 @@
 Source: osmium
-Section: utils
-Priority: extra
 Maintainer: Debian OpenStreetMap Team <pkg-osm-maint at lists.alioth.debian.org>
 Uploaders: David Paleino <dapal at debian.org>,
            Andreas Tille <tille at debian.org>
-Build-Depends:
- debhelper (>= 8~)
- , cppcheck
+Section: utils
+Priority: optional
+Build-Depends: debhelper (>= 8~),
+               cppcheck,
+               libprotobuf-dev,
+               protobuf-compiler,
+               libv8-dev,
+               libicu-dev,
+               libsparsehash-dev,
+               libexpat1-dev,
+               libgeos++-dev,
+               libgdal1-dev,
+               libgd2-xpm-dev,
+               libsqlite3-dev,
+               libshp-dev,
+               zlib1g-dev,
+               libboost-dev,
+               libosmpbf-dev,
+               libboost-test-dev
 # , doxygen
 # , graphviz
- , libprotobuf-dev
- , protobuf-compiler
- , libv8-dev
- , libicu-dev
- , libsparsehash-dev
- , libexpat1-dev
- , libgeos++-dev
- , libgdal1-dev
- , libgd2-xpm-dev
- , libsqlite3-dev
- , libshp-dev
- , zlib1g-dev
- , libboost-dev
- , libosmpbf-dev
- , libboost-test-dev
-Standards-Version: 3.9.3
-Vcs-Git: git://anonscm.debian.org/pkg-grass/osmium.git
+Standards-Version: 3.9.5
 Vcs-Browser: http://anonscm.debian.org/?p=pkg-grass/osmium.git;a=summary
+Vcs-Git: git://anonscm.debian.org/pkg-grass/osmium.git
 Homepage: http://wiki.openstreetmap.org/wiki/Osmium
 
 Package: libosmium-dev
-Section: libdevel
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Section: libdevel
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
 Description: C++ framework for working with OSM data files
  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
@@ -50,6 +50,26 @@ Description: C++ framework for working with OSM data files
  This package provides the header files useful to develop third-party
  applications.
 
+Package: osmjs
+Architecture: any
+Depends: ${shlibs:Depends},
+         ${misc:Depends}
+Description: osmium-based Javascript framework for handling OSM data
+ 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 contains the Javascript framework based on osmium.
+
 #Package: osmium-doc
 #Section: doc
 #Architecture: all
@@ -71,23 +91,3 @@ Description: C++ framework for working with OSM data files
 # .
 # This package provides documentation about the Osmium framework.
 
-Package: osmjs
-Architecture: any
-Depends:
- ${shlibs:Depends}
- , ${misc:Depends}
-Description: osmium-based Javascript framework for handling OSM data
- 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 contains the Javascript framework based on osmium.

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