[SCM] High-level 3D graphics kit branch, experimental, updated. debian/3.1.3-2.2-12-g093ac5c

[Anton Gladky]

The following commit has been merged in the experimental branch:
commit 55c875142d487b25452199ec49ca6d83a7c83fcb
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Tue Mar 5 21:23:18 2013 +0100

    Use wrap-and-sort for formatting.

diff --git a/debian/control b/debian/control
index a3a76b2..bf1e55a 100644
--- a/debian/control
+++ b/debian/control
@@ -2,11 +2,20 @@ Source: coin3
 Homepage: http://www.coin3d.org/
 Section: graphics
 Maintainer: Debian Science Team <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Anton Gladky <gladk at debian.org>
+Uploaders:
+ Anton Gladky <gladk at debian.org>
 Priority: optional
-Build-Depends: debhelper (>= 9), autotools-dev, 
- libx11-dev, libxext-dev, libxi-dev, libxmu-dev, libxpm-dev, libxt-dev, libgl1-mesa-dev,
- doxygen
+Build-Depends:
+ autotools-dev,
+ debhelper (>= 9),
+ doxygen,
+ libgl1-mesa-dev,
+ libx11-dev,
+ libxext-dev,
+ libxi-dev,
+ libxmu-dev,
+ libxpm-dev,
+ libxt-dev
 Standards-Version: 3.9.4
 Vcs-Git: git://git.debian.org/git/debian-science/packages/coin3.git
 Vcs-Browser: http://git.debian.org/?p=debian-science/packages/coin3.git
@@ -14,8 +23,15 @@ Vcs-Browser: http://git.debian.org/?p=debian-science/packages/coin3.git
 Package: libcoin60
 Architecture: any
 Section: libs
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Suggests: libsimage-dev, libfreetype6, libopenal0a, zlib1g, libbz2-1.0
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Suggests:
+ libbz2-1.0,
+ libfreetype6,
+ libopenal0a,
+ libsimage-dev,
+ zlib1g
 Description: high-level 3D graphics kit implementing the Open Inventor API
  Coin is an OpenGL-based, retain-mode 3D graphics library that
  implements the Open Inventor 2.1 API. It also includes support for
@@ -30,34 +46,53 @@ Description: high-level 3D graphics kit implementing the Open Inventor API
 Package: libcoin60-dev
 Architecture: any
 Section: libdevel
-Depends: ${misc:Depends}, libcoin60 (= ${binary:Version}), libx11-dev, 
- libxext-dev, libxi-dev, libxmu-dev, libxpm-dev, libxt-dev, 
- libgl1-mesa-dev | libgl-dev
-Suggests: libcoin60-doc (= ${binary:Version})
-Conflicts: inventor-dev, libcoin20-dev, libcoin40-dev
+Depends:
+ libcoin60 (= ${binary:Version}),
+ libgl1-mesa-dev | libgl-dev,
+ libx11-dev,
+ libxext-dev,
+ libxi-dev,
+ libxmu-dev,
+ libxpm-dev,
+ libxt-dev,
+ ${misc:Depends}
+Suggests:
+ libcoin60-doc (= ${binary:Version})
+Conflicts:
+ inventor-dev,
+ libcoin20-dev,
+ libcoin40-dev
 Description: high-level 3D graphics devkit with Open Inventor and VRML97 support
  Coin is an OpenGL-based, retain-mode 3D graphics library that
  implements the Open Inventor 2.1 API. It also includes support for
  VRML97 and 3D audio.
 
-Package: libcoin60-runtime
-Architecture: all
-Section: libs
-Depends: ${misc:Depends}
-Suggests: libcoin60
-Conflicts: libcoin20-runtime, libcoin40-runtime
-Description: high-level 3D graphics kit - external data files
- External data files used by the Coin library at run-time.  The
- dragger geometry files represent the defaults that are used if the
- files are not found.  This package is completely optional.
-
 Package: libcoin60-doc
 Architecture: all
 Section: doc
-Depends: ${misc:Depends}
-Suggests: libcoin60-dev (= ${binary:Version})
-Conflicts: inventor-dev, libcoin20-doc, libcoin40-doc
+Depends:
+ ${misc:Depends}
+Suggests:
+ libcoin60-dev (= ${binary:Version})
+Conflicts:
+ inventor-dev,
+ libcoin20-doc,
+ libcoin40-doc
 Description: high-level 3D graphics kit with Open Inventor and VRML97 support
  API documentation for the Coin library (the Open Inventor API) in
  manpage and HTML format.
 
+Package: libcoin60-runtime
+Architecture: all
+Section: libs
+Depends:
+ ${misc:Depends}
+Suggests:
+ libcoin60
+Conflicts:
+ libcoin20-runtime,
+ libcoin40-runtime
+Description: high-level 3D graphics kit - external data files
+ External data files used by the Coin library at run-time.  The
+ dragger geometry files represent the defaults that are used if the
+ files are not found.  This package is completely optional.
diff --git a/debian/copyright b/debian/copyright
index b46c002..bacb2f0 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -5,7 +5,7 @@ Upstream-Source: https://bitbucket.org/Coin3D/coin/wiki/Home
 Files: *
 Copyright: Coin is copyright (C) 1998-2008 by Kongsberg SIM (SIM).
 License: GPL-2
- On Debian systems the full text of the GNU General Public License v2 
+ On Debian systems the full text of the GNU General Public License v2
  can be found in the `/usr/share/common-licenses/GPL-2' file.
 
 Files: debian/*
diff --git a/debian/libcoin60-dev.install b/debian/libcoin60-dev.install
index 304daf3..6d70934 100644
--- a/debian/libcoin60-dev.install
+++ b/debian/libcoin60-dev.install
@@ -1,6 +1,6 @@
-usr/lib/*/lib*.so usr/lib
-usr/lib/*/lib*.a usr/lib
+usr/bin/coin-config
 usr/include
-usr/share/aclocal
+usr/lib/*/lib*.a usr/lib
+usr/lib/*/lib*.so usr/lib
 usr/share/Coin/conf
-usr/bin/coin-config
+usr/share/aclocal

-- 
High-level 3D graphics kit