[SCM] High-level 3D graphics kit branch, experimental, updated. 3.1.3-3_exp1-5-g021cded

[Anton Gladky]

The following commit has been merged in the experimental branch:
commit 021cdedef1919055b1536a1facd9f5830c793138
Author: Anton Gladky <gladky.anton at gmail.com>
Date:   Thu Apr 11 22:27:10 2013 +0200

    Update binary-names. Use multiarch.

diff --git a/debian/control b/debian/control
index bf1e55a..866f7a9 100644
--- a/debian/control
+++ b/debian/control
@@ -15,17 +15,19 @@ Build-Depends:
  libxi-dev,
  libxmu-dev,
  libxpm-dev,
- libxt-dev
+ libxt-dev,
+ libboost-all-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
 
-Package: libcoin60
+Package: libcoin80
 Architecture: any
 Section: libs
 Depends:
  ${misc:Depends},
  ${shlibs:Depends}
+Pre-Depends: ${misc:Pre-Depends}
 Suggests:
  libbz2-1.0,
  libfreetype6,
@@ -43,11 +45,11 @@ Description: high-level 3D graphics kit implementing the Open Inventor API
      libopenal0a   enables audio support
      zlib1g and libbz2 enable transparent read of compressed files
 
-Package: libcoin60-dev
+Package: libcoin80-dev
 Architecture: any
 Section: libdevel
 Depends:
- libcoin60 (= ${binary:Version}),
+ libcoin80 (= ${binary:Version}),
  libgl1-mesa-dev | libgl-dev,
  libx11-dev,
  libxext-dev,
@@ -57,41 +59,44 @@ Depends:
  libxt-dev,
  ${misc:Depends}
 Suggests:
- libcoin60-doc (= ${binary:Version})
+ libcoin80-doc (= ${binary:Version})
 Conflicts:
  inventor-dev,
  libcoin20-dev,
- libcoin40-dev
+ libcoin40-dev,
+ libcoin60-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-doc
+Package: libcoin80-doc
 Architecture: all
 Section: doc
 Depends:
  ${misc:Depends}
 Suggests:
- libcoin60-dev (= ${binary:Version})
+ libcoin80-dev (= ${binary:Version})
 Conflicts:
  inventor-dev,
  libcoin20-doc,
- libcoin40-doc
+ libcoin40-doc,
+ libcoin60-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
+Package: libcoin80-runtime
 Architecture: all
 Section: libs
 Depends:
  ${misc:Depends}
 Suggests:
- libcoin60
+ libcoin80
 Conflicts:
  libcoin20-runtime,
- libcoin40-runtime
+ libcoin40-runtime,
+ libcoin60-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
diff --git a/debian/libcoin60.install b/debian/libcoin60.install
deleted file mode 100644
index a595952..0000000
--- a/debian/libcoin60.install
+++ /dev/null
@@ -1 +0,0 @@
-usr/lib/*/lib*.so.* usr/lib
diff --git a/debian/libcoin60.lintian-overrides b/debian/libcoin60.lintian-overrides
deleted file mode 100644
index 9b12bed..0000000
--- a/debian/libcoin60.lintian-overrides
+++ /dev/null
@@ -1 +0,0 @@
-libcoin60 binary: embedded-library
diff --git a/debian/libcoin60-dev.install b/debian/libcoin80-dev.install
similarity index 57%
rename from debian/libcoin60-dev.install
rename to debian/libcoin80-dev.install
index 6d70934..1333cd4 100644
--- a/debian/libcoin60-dev.install
+++ b/debian/libcoin80-dev.install
@@ -1,6 +1,6 @@
 usr/bin/coin-config
 usr/include
-usr/lib/*/lib*.a usr/lib
-usr/lib/*/lib*.so usr/lib
+usr/lib/*/lib*.a
+usr/lib/*/lib*.so
 usr/share/Coin/conf
 usr/share/aclocal
diff --git a/debian/libcoin60-dev.manpages b/debian/libcoin80-dev.manpages
similarity index 100%
rename from debian/libcoin60-dev.manpages
rename to debian/libcoin80-dev.manpages
diff --git a/debian/libcoin60-doc.doc-base b/debian/libcoin80-doc.doc-base
similarity index 52%
rename from debian/libcoin60-doc.doc-base
rename to debian/libcoin80-doc.doc-base
index 967d931..9be66b0 100644
--- a/debian/libcoin60-doc.doc-base
+++ b/debian/libcoin80-doc.doc-base
@@ -1,4 +1,4 @@
-Document: libcoin60
+Document: libcoin80
 Title: Coin Library
 Author: The Coin Developer Team at Kongsberg SIM (SIM)
 Abstract: Coin is an OpenGL-based, retain-mode 3D graphics library
@@ -6,5 +6,5 @@ Abstract: Coin is an OpenGL-based, retain-mode 3D graphics library
 Section: Graphics
 
 Format: HTML
-Index: /usr/share/doc/libcoin60-doc/html/index.html
-Files: /usr/share/doc/libcoin60-doc/html/*.html /usr/share/doc/libcoin60-doc/html/*.png /usr/share/doc/libcoin60-doc/html/*.css
+Index: /usr/share/doc/libcoin80-doc/html/index.html
+Files: /usr/share/doc/libcoin80-doc/html/*.html /usr/share/doc/libcoin80-doc/html/*.png /usr/share/doc/libcoin80-doc/html/*.css
diff --git a/debian/libcoin60-doc.install b/debian/libcoin80-doc.install
similarity index 100%
rename from debian/libcoin60-doc.install
rename to debian/libcoin80-doc.install
diff --git a/debian/libcoin80-doc.lintian-overrides b/debian/libcoin80-doc.lintian-overrides
new file mode 100644
index 0000000..f953297
--- /dev/null
+++ b/debian/libcoin80-doc.lintian-overrides
@@ -0,0 +1,2 @@
+libcoin80-doc: manpage-has-bad-whatis-entry
+libcoin80-doc: manpage-has-errors-from-man
diff --git a/debian/libcoin60-doc.manpages b/debian/libcoin80-doc.manpages
similarity index 100%
rename from debian/libcoin60-doc.manpages
rename to debian/libcoin80-doc.manpages
diff --git a/debian/libcoin60-runtime.install b/debian/libcoin80-runtime.install
similarity index 100%
rename from debian/libcoin60-runtime.install
rename to debian/libcoin80-runtime.install
diff --git a/debian/libcoin80.install b/debian/libcoin80.install
new file mode 100644
index 0000000..3ddde58
--- /dev/null
+++ b/debian/libcoin80.install
@@ -0,0 +1 @@
+usr/lib/*/lib*.so.*
diff --git a/debian/libcoin80.lintian-overrides b/debian/libcoin80.lintian-overrides
new file mode 100644
index 0000000..8445970
--- /dev/null
+++ b/debian/libcoin80.lintian-overrides
@@ -0,0 +1 @@
+libcoin80 binary: embedded-library
diff --git a/debian/rules b/debian/rules
index 693ba3d..62dc285 100755
--- a/debian/rules
+++ b/debian/rules
@@ -6,7 +6,7 @@
 DEB_CONFIGURE_EXTRA_FLAGS = --disable-dependency-tracking \
 	--enable-static --enable-shared \
 	--disable-maintainer-mode \
-	--enable-html htmldir=/usr/share/doc/libcoin60-doc/html \
+	--enable-html htmldir=/usr/share/doc/libcoin80-doc/html \
 	--enable-man --mandir=/usr/share/man \
 	--without-mesa
 

-- 
High-level 3D graphics kit