[libqglviewer] 02/06: Use wrap-and-sort.
Anton Gladky
gladk at moszumanska.debian.org
Sat Dec 28 14:04:47 UTC 2013
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository libqglviewer.
commit c07abbecd43428ccc243c4fbb0e93fb6c81213a6
Author: Anton Gladky <gladk at debian.org>
Date: Sat Dec 28 08:51:07 2013 +0100
Use wrap-and-sort.
---
debian/control | 78 ++++++++++++++++++++++++++++-------------
debian/copyright | 17 +++++----
debian/libqglviewer-dev.install | 4 +--
3 files changed, 63 insertions(+), 36 deletions(-)
diff --git a/debian/control b/debian/control
index 70c8624..582d8e3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,10 +2,13 @@ Source: libqglviewer
Section: libs
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://www.libqglviewer.com/
Standards-Version: 3.9.4
-Build-Depends: debhelper (>= 9), libqt4-dev (>= 4:4.8.0~),
+Build-Depends:
+ debhelper (>= 9),
+ libqt4-dev (>= 4:4.8.0~),
libqt4-opengl-dev (>= 4:4.8.0~)
Vcs-Git: git://anonscm.debian.org/gitweb/?p=debian-science/packages/libqglviewer.git
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/libqglviewer.git
@@ -13,12 +16,26 @@ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/libqglv
Package: libqglviewer-dev
Section: libdevel
Architecture: any
-Depends: libqglviewer2 (= ${binary:Version}), libqt4-dev, libx11-dev, libxext-dev,
- libxmu-dev, libgl1-mesa-dev | libgl-dev, libqt4-opengl-dev, ${shlibs:Depends},
- ${misc:Depends}
-Replaces: libqglviewer-dev-common (<< 2.3.17~), libqglviewer-qt3-dev (<< 2.3.17~), libqglviewer-qt4-dev (<< 2.3.17~)
-Breaks: libqglviewer-dev-common (<< 2.3.17~), libqglviewer-qt3-dev (<< 2.3.17~), libqglviewer-qt4-dev (<< 2.3.17~)
-Recommends: libqglviewer-doc
+Depends:
+ libgl1-mesa-dev | libgl-dev,
+ libqglviewer2 (= ${binary:Version}),
+ libqt4-dev,
+ libqt4-opengl-dev,
+ libx11-dev,
+ libxext-dev,
+ libxmu-dev,
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces:
+ libqglviewer-dev-common (<< 2.3.17~),
+ libqglviewer-qt3-dev (<< 2.3.17~),
+ libqglviewer-qt4-dev (<< 2.3.17~)
+Breaks:
+ libqglviewer-dev-common (<< 2.3.17~),
+ libqglviewer-qt3-dev (<< 2.3.17~),
+ libqglviewer-qt4-dev (<< 2.3.17~)
+Recommends:
+ libqglviewer-doc
Description: OpenGL 3D viewer library based on Qt4 - development files
libqglviewer (also known as libQGLViewer) is a free C++ library based on Qt
that enables the quick creation of OpenGL 3D viewers. It features a powerful
@@ -32,14 +49,16 @@ Description: OpenGL 3D viewer library based on Qt4 - development files
This package contains the files needed to develop and compile programs
using QGLViewer linked with Qt version 4.
-Package: libqglviewer2
-Architecture: any
-Multi-Arch: same
-Pre-Depends: ${misc:Pre-Depends}
-Depends: ${shlibs:Depends}, ${misc:Depends}
-Replaces: libqglviewer-qt4-2 (<< 2.3.17~), libqglviewer-qt3-2 (<< 2.3.17~)
-Breaks: libqglviewer-qt4-2 (<< 2.3.17~), libqglviewer-qt3-2 (<< 2.3.17~)
-Description: OpenGL 3D viewer library based on Qt - runtime library
+Package: libqglviewer-doc
+Section: doc
+Architecture: all
+Depends:
+ libjs-jquery,
+ ${misc:Depends}
+Conflicts:
+ libqglviewer-dev (<< 2.3.15),
+ libqglviewer-dev-common
+Description: OpenGL 3D viewer library - header files and documentation
libqglviewer (also known as libQGLViewer) is a free C++ library based on Qt
that enables the quick creation of OpenGL 3D viewers. It features a powerful
camera trackball and simple applications simply require an implementation of
@@ -49,15 +68,23 @@ Description: OpenGL 3D viewer library based on Qt - runtime library
customizable and easy to extend to create complex applications, with a
possible Qt GUI.
.
- This package contains the shared library needed to run programs using
- QGLViewer. This package contains QGLViewer linked with Qt version 4.
+ This package contains documentation and examples.
-Package: libqglviewer-doc
-Section: doc
-Architecture: all
-Depends: ${misc:Depends}, libjs-jquery
-Conflicts: libqglviewer-dev (<< 2.3.15), libqglviewer-dev-common
-Description: OpenGL 3D viewer library - header files and documentation
+Package: libqglviewer2
+Architecture: any
+Multi-Arch: same
+Pre-Depends:
+ ${misc:Pre-Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
+Replaces:
+ libqglviewer-qt3-2 (<< 2.3.17~),
+ libqglviewer-qt4-2 (<< 2.3.17~)
+Breaks:
+ libqglviewer-qt3-2 (<< 2.3.17~),
+ libqglviewer-qt4-2 (<< 2.3.17~)
+Description: OpenGL 3D viewer library based on Qt - runtime library
libqglviewer (also known as libQGLViewer) is a free C++ library based on Qt
that enables the quick creation of OpenGL 3D viewers. It features a powerful
camera trackball and simple applications simply require an implementation of
@@ -67,4 +94,5 @@ Description: OpenGL 3D viewer library - header files and documentation
customizable and easy to extend to create complex applications, with a
possible Qt GUI.
.
- This package contains documentation and examples.
+ This package contains the shared library needed to run programs using
+ QGLViewer. This package contains QGLViewer linked with Qt version 4.
diff --git a/debian/copyright b/debian/copyright
index 237f9d6..12108f7 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -8,9 +8,9 @@ Copyright: 2002-2012 Gilles Debunne <Gilles.Debunne at imag.fr>
License: commercial or GPL-2.0 or GPL-3.0, with the following exception:
Additional rights granted beyond the GPL (the "Exception").
.
- As a special exception to the terms and conditions of GPL version 2.0 or
+ As a special exception to the terms and conditions of GPL version 2.0 or
GPL version 3.0, Gilles Debunne hereby grants you the rights described below,
- provided you agree to the terms and conditions in this Exception, including
+ provided you agree to the terms and conditions in this Exception, including
its obligations and restrictions on use.
.
Nothing in this Exception gives you or anyone else the right to change the
@@ -54,11 +54,11 @@ License: commercial or GPL-2.0 or GPL-3.0, with the following exception:
.
and
.
- B) You must, on request, make a complete package including the complete
- source code of Your Software (as defined in the GNU General Public
+ B) You must, on request, make a complete package including the complete
+ source code of Your Software (as defined in the GNU General Public
License version 2, section 3, but excluding anything excluded by the
special exception in the same section) available to Gilles Debunne
- under the same license as that granted to other recipients of the
+ under the same license as that granted to other recipients of the
source code of Your Software.
.
and
@@ -77,9 +77,8 @@ License: commercial or GPL-2.0 or GPL-3.0, with the following exception:
contracts, non-disclosure agreements, and employee contracts.
.
.
- 2) The right to link non-Open Source applications with versions of the
- Licensed Software: You may link applications with versions of the Licensed
+ 2) The right to link non-Open Source applications with versions of the
+ Licensed Software: You may link applications with versions of the Licensed
Software, provided that such applications have been developed and are deployed
- in accordance with the terms and conditions of the libQGLViewer Commercial
+ in accordance with the terms and conditions of the libQGLViewer Commercial
License Agreement.
-
diff --git a/debian/libqglviewer-dev.install b/debian/libqglviewer-dev.install
index 1cb1244..1b6435e 100644
--- a/debian/libqglviewer-dev.install
+++ b/debian/libqglviewer-dev.install
@@ -1,3 +1,3 @@
-usr/lib/*/*.so
-usr/lib/*/*.prl
usr/include
+usr/lib/*/*.prl
+usr/lib/*/*.so
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libqglviewer.git
More information about the debian-science-commits
mailing list