[SCM] SUMO packaging. Simulation of Urban MObility. branch, master, updated. debian/0.17.1_dfsg-1-10-g2035aa9

[Anton Gladky]

The following commit has been merged in the master branch:
commit ff138d50485b12fdeff880778ba5eb584b64da27
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Mon Jun 10 22:35:50 2013 +0200

    Use wrap-and-sort.

diff --git a/debian/control b/debian/control
index 06049a1..80c27a0 100644
--- a/debian/control
+++ b/debian/control
@@ -2,44 +2,67 @@ Source: sumo
 Section: science
 Priority: optional
 Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Anton Gladky <gladk at debian.org>
+Uploaders:
+ Anton Gladky <gladk at debian.org>
 Homepage: http://sumo.sourceforge.net/
 Standards-Version: 3.9.4
 Vcs-Git: git://anonscm.debian.org/debian-science/packages/sumo.git
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/sumo.git
-Build-Depends: debhelper (>= 9), libxerces-c2-dev, dpkg-dev (>= 1.16.1~),
- libgdal-dev, libproj-dev, libfox-1.6-dev, libgl2ps-dev, 
- libxrandr-dev, libbz2-dev, libcups2-dev, help2man, autotools-dev
-Build-Depends-Indep: doxygen, python
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 9),
+ dpkg-dev (>= 1.16.1~),
+ help2man,
+ libbz2-dev,
+ libcups2-dev,
+ libfox-1.6-dev,
+ libgdal-dev,
+ libgl2ps-dev,
+ libproj-dev,
+ libxerces-c2-dev,
+ libxrandr-dev
+Build-Depends-Indep:
+ doxygen,
+ python
 
 Package: sumo
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Recommends: sumo-tools
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Recommends:
+ sumo-tools
 Description: Simulation of Urban MObility (SUMO)
  SUMO is an open source,
  highly portable, microscopic road traffic simulation package
  designed to handle large road networks.
  Main binary.
 
-Package: sumo-tools
+Package: sumo-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, python, jarwrapper
-Recommends: sumo
-Description: Simulation of Urban MObility (SUMO), tools and scripts
+Depends:
+ libjs-jquery,
+ ${misc:Depends}
+Recommends:
+ sumo
+Description: Simulation of Urban MObility (SUMO), documentation and examples
  SUMO is an open source,
  highly portable, microscopic road traffic simulation package
  designed to handle large road networks.
- The binary contatins different tools and scripts.
+ The binary contatins documentation and examples.
 
-Package: sumo-doc
+Package: sumo-tools
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}, libjs-jquery
-Recommends: sumo
-Description: Simulation of Urban MObility (SUMO), documentation and examples
+Depends:
+ jarwrapper,
+ python,
+ ${misc:Depends}
+Recommends:
+ sumo
+Description: Simulation of Urban MObility (SUMO), tools and scripts
  SUMO is an open source,
  highly portable, microscopic road traffic simulation package
  designed to handle large road networks.
- The binary contatins documentation and examples.
+ The binary contatins different tools and scripts.
diff --git a/debian/copyright b/debian/copyright
index 48611d6..a629da8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -25,16 +25,16 @@ License: GPL-3+
 Files: ./src/utils/foxtools/*
 Copyright: 2003, Mathew Robertson. *
 License: LGPL-2.1+
- On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC 
+ On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC
  LICENSE ver 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: ./src/foreign/tcpip/*
 Copyright: 2004-2007, the SwarmNet (www.swarmnet.de) project
 License: BSD like
- Shawn is free software; you can redistribute it and/or modify it 
+ Shawn is free software; you can redistribute it and/or modify it
  under the terms of the BSD License. Refer to the shawn-licence.txt
- file in the root of the Shawn source tree for further details. 
- 
+ file in the root of the Shawn source tree for further details.
+
 Files: ./src/foreign/nvwa/*
 Copyright: 2004-2008, Wu Yongwei <adah at users dot sourceforge dot net>
 License: BSD-like
@@ -69,7 +69,7 @@ License: GPL-2+
 Files: ./src/foreign/polyfonts/*
 Copyright: 2003, Bob Pendleton
 License: GPL LGPL-2.1+
- On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC 
+ On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC
  LICENSE ver 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
  .
  On Debian systems, the complete text of the GNU General
@@ -129,8 +129,8 @@ License: BSD (2 clause)
     notice, this list of conditions and the following disclaimer in the
     documentation and/or other materials provided with the distribution.
  .
- 3. The names of its contributors may not be used to endorse or promote 
-    products derived from this software without specific prior written 
+ 3. The names of its contributors may not be used to endorse or promote
+    products derived from this software without specific prior written
     permission.
  .
  THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
@@ -152,11 +152,11 @@ License: BSD (2 clause)
  .
  It would be nice to CC: rjwagner at writeme.com and Cokus at math.washington.edu
  when you write.
- 
+
 Files: ./src/foreign/polyfonts/polyfonts.c
 Copyright: 2003, Bob Pendleton
 License: GPL LGPL-2.1+
- On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC 
+ On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC
  LICENSE ver 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
  .
  On Debian systems, the complete text of the GNU General
@@ -178,19 +178,18 @@ License: GPL-3+
 Files: ./src/utils/foxtools/FXRealSpinDial.cpp
 Copyright: 2004, Bill Baxter. *
 License: LGPL-2.1+
- On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC 
+ On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC
  LICENSE ver 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: ./src/utils/foxtools/FXRealSpinDial.h
 Copyright: 1998,2003, Lyle Johnson. *
   2003, Bill Baxter. *
 License: LGPL-2.1+
- On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC 
+ On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC
  LICENSE ver 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
 
 Files: ./tests/complex/netconvert/osm_roundtrip/fpdiff.py
 Copyright: texttest.org (LGPL according to google cache)
 License: LGPL
- On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC 
+ On Debian systems, the complete text of the GNU LESSER GENERAL PUBLIC
  LICENSE ver 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
diff --git a/debian/rules b/debian/rules
index 9f6e710..7240f26 100755
--- a/debian/rules
+++ b/debian/rules
@@ -3,7 +3,6 @@
 %:
 	dh $@ --parallel
 
-
 export DEB_BUILD_MAINT_OPTIONS = hardening=+all
 DPKG_EXPORT_BUILDFLAGS = 1
 
diff --git a/debian/sumo.install b/debian/sumo.install
index dcb6d75..9b9893a 100644
--- a/debian/sumo.install
+++ b/debian/sumo.install
@@ -1,13 +1,13 @@
-usr/bin/sumo
-usr/bin/sumo-gui
+debian/*.xpm /usr/share/pixmaps
+debian/sumo.desktop /usr/share/applications
+usr/bin/TraCITestClient
+usr/bin/activitygen
 usr/bin/dfrouter
 usr/bin/duarouter
 usr/bin/jtrrouter
-usr/bin/activitygen
-usr/bin/od2trips
 usr/bin/netconvert
 usr/bin/netgenerate
+usr/bin/od2trips
 usr/bin/polyconvert
-usr/bin/TraCITestClient
-debian/*.xpm /usr/share/pixmaps
-debian/sumo.desktop /usr/share/applications
+usr/bin/sumo
+usr/bin/sumo-gui

-- 
SUMO packaging. Simulation of Urban MObility.