[freecad] 03/04: Use wrap-and-sort.
Anton Gladky
gladk at alioth.debian.org
Mon Sep 30 17:37:29 UTC 2013
This is an automated email from the git hooks/post-receive script.
gladk pushed a commit to branch master
in repository freecad.
commit 4d36847466e62e5b95df98fe85cb382f24889537
Author: Anton Gladky <gladky.anton at gmail.com>
Date: Mon Sep 30 18:49:10 2013 +0200
Use wrap-and-sort.
---
debian/control | 96 ++++++++++++++++++++++++++++++++++++------------
debian/copyright | 45 +++++++++++------------
debian/freecad.install | 8 ++--
3 files changed, 98 insertions(+), 51 deletions(-)
diff --git a/debian/control b/debian/control
index 6ee95b5..09965c3 100644
--- a/debian/control
+++ b/debian/control
@@ -2,33 +2,76 @@ Source: freecad
Section: science
Priority: extra
Maintainer: Debian Science Maintainers <debian-science-maintainers at lists.alioth.debian.org>
-Uploaders: Teemu Ikonen <tpikonen at gmail.com>,
- "Adam C. Powell, IV" <hazelsct at debian.org>,
+Uploaders:
+ Teemu Ikonen <tpikonen at gmail.com>,
+ "Adam C. Powell,
+ IV" <hazelsct at debian.org>,
Anton Gladky <gladk at debian.org>
Vcs-Browser: http://anonscm.debian.org/gitweb/?p=debian-science/packages/freecad.git
Vcs-Git: git://anonscm.debian.org/debian-science/packages/freecad.git
Homepage: http://freecadweb.org/
-Build-Depends: debhelper (>= 9), libtool, cmake,
- libboost-dev, libboost-date-time-dev, libboost-filesystem-dev,
- libboost-graph-dev, libboost-iostreams-dev, libboost-program-options-dev,
- libboost-regex-dev, libboost-serialization-dev, libboost-signals-dev,
- libboost-python-dev, libboost-thread-dev, python-dev, python-support,
- libqt4-dev, libxt-dev, libxext-dev, libxmu-dev, libxi-dev, libx11-dev,
- libcoin80-dev, libsoqt4-dev (>=1.6), libeigen3-dev,
- libgts-bin, libgts-dev, libcv-dev, zlib1g-dev, libxerces-c2-dev,
- liboce-foundation-dev, liboce-modeling-dev,
- liboce-ocaf-dev, libfltk1.3-dev, oce-draw, libf2c2-dev,
- liboce-visualization-dev, python-cxx-dev, libswscale-dev,
- libzipios++-dev, swig, gfortran, libqtwebkit-dev, libode-dev, libspnav-dev
+Build-Depends:
+ cmake,
+ debhelper (>= 9),
+ gfortran,
+ libboost-date-time-dev,
+ libboost-dev,
+ libboost-filesystem-dev,
+ libboost-graph-dev,
+ libboost-iostreams-dev,
+ libboost-program-options-dev,
+ libboost-python-dev,
+ libboost-regex-dev,
+ libboost-serialization-dev,
+ libboost-signals-dev,
+ libboost-thread-dev,
+ libcoin80-dev,
+ libcv-dev,
+ libeigen3-dev,
+ libf2c2-dev,
+ libfltk1.3-dev,
+ libgts-bin,
+ libgts-dev,
+ liboce-foundation-dev,
+ liboce-modeling-dev,
+ liboce-ocaf-dev,
+ liboce-visualization-dev,
+ libode-dev,
+ libqt4-dev,
+ libqtwebkit-dev,
+ libsoqt4-dev (>=1.6),
+ libspnav-dev,
+ libswscale-dev,
+ libtool,
+ libx11-dev,
+ libxerces-c2-dev,
+ libxext-dev,
+ libxi-dev,
+ libxmu-dev,
+ libxt-dev,
+ libzipios++-dev,
+ oce-draw,
+ python-cxx-dev,
+ python-dev,
+ python-support,
+ swig,
+ zlib1g-dev
Standards-Version: 3.9.4
Package: freecad
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends},
- python-pivy (>=0.5.0~v609hg-2) [!powerpc], python-matplotlib,
- libsoqt4-20 (>=1.6)
-Recommends: python-collada, python-ply
-Suggests: freecad-doc
+Depends:
+ libsoqt4-20 (>=1.6),
+ python-matplotlib,
+ python-pivy (>=0.5.0~v609hg-2) [!powerpc],
+ ${misc:Depends},
+ ${python:Depends},
+ ${shlibs:Depends}
+Recommends:
+ python-collada,
+ python-ply
+Suggests:
+ freecad-doc
Description: Extensible Open Source CAx program (alpha)
FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
It features some key concepts like macro recording, workbenches, ability
@@ -42,8 +85,11 @@ Description: Extensible Open Source CAx program (alpha)
Package: freecad-dev
Architecture: any
Section: libdevel
-Depends: ${shlibs:Depends}, ${misc:Depends}, freecad (= ${binary:Version}),
- libeigen3-dev
+Depends:
+ freecad (= ${binary:Version}),
+ libeigen3-dev,
+ ${misc:Depends},
+ ${shlibs:Depends}
Description: FreeCAD development files
FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
It features some key concepts like macro recording, workbenches, ability
@@ -57,8 +103,11 @@ Description: FreeCAD development files
Package: freecad-doc
Architecture: all
Section: doc
-Recommends: freecad (= ${source:Version})
-Depends: ${misc:Depends}, qt4-dev-tools
+Recommends:
+ freecad (= ${source:Version})
+Depends:
+ qt4-dev-tools,
+ ${misc:Depends}
Description: FreeCAD documentation
FreeCAD is an Open Source CAx RAD based on OpenCasCade, Qt and Python.
It features some key concepts like macro recording, workbenches, ability
@@ -71,4 +120,3 @@ Description: FreeCAD documentation
The documentation is provided in Qt's new help format;
the new help format version can be viewed in conjunction with the Qt Assistant
found in the qt4-dev-tools package.
-
diff --git a/debian/copyright b/debian/copyright
index 777f5a2..ef7c121 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -114,13 +114,13 @@ License: LGPL-2.1
.
On Debian systems, the complete text of the GNU Lesser General Public
License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
+
Files: src/3rdParty/salomesmesh/src/MEFISTO2/*
Copyright: 2006 Laboratoire J.-L. Lions UPMC Paris
License: LGPL-2.1
On Debian systems, the complete text of the GNU Lesser General Public
License version 2.1 can be found in `/usr/share/common-licenses/LGPL-2.1'.
-
+
Files: src/Base/Base64.*
Copyright: 2004-2008 Rene Nyffenegger <rene.nyffenegger at adp-gmbh.ch>
License: other
@@ -202,25 +202,25 @@ License: GPL-2 or MIT
License: GPL-2
On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
License: MIT
Permission is hereby granted, free of charge, to any person obtaining a copy of
- this software and associated documentation files (the "Software"), to deal in
- the Software without restriction, including without limitation the rights to
- use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
- of the Software, and to permit persons to whom the Software is furnished to do
+ this software and associated documentation files (the "Software"), to deal in
+ the Software without restriction, including without limitation the rights to
+ use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies
+ of the Software, and to permit persons to whom the Software is furnished to do
so, subject to the following conditions:
.
- The above copyright notice and this permission notice shall be included in all
+ The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.
.
- THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
- IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
- FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
- AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
- LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
- OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+ AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+ OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
Files: src/Doc/Start_Page.html
@@ -229,14 +229,14 @@ License: GPL-2 or MIT or BSD
License: GPL-2
On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
License: MIT
See above for the text of this license.
-
+
License: BSD
See above for the text of this license.
-
+
Files: src/Gui/iisTaskPanel/src/*
Copyright: http://www.ii-system.com
License: LGPL
@@ -247,13 +247,13 @@ Files: src/Mod/Draft/*
Copyright: 2009-2010 Yorik van Havre, Werner Mayer, Martin Burbaum, Ken Cline
License: GPL-2+
On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
Files: src/Mod/Draft/importAirfoilDAT.py
Copyright: 2010 Heiko Jakob <heiko.jakob at gediegos.de>
License: LGPL-2+
On Debian systems, the complete text of the GNU General
- Public License can be found in `/usr/share/common-licenses/GPL-2'.
+ Public License can be found in `/usr/share/common-licenses/GPL-2'.
Files: src/Mod/Mesh/App/Core/Projection.cpp src/Mod/Mesh/App/Core/Projection.h src/Mod/Mesh/App/Core/Triangulation.cpp src/Mod/Mesh/App/Core/Triangulation.h
Copyright: 2005 Werner Mayer <werner.wm.mayer at gmx.de>
@@ -337,13 +337,12 @@ License: LGPL-2+
On Debian systems, the complete text of the GNU Lesser General Public
License version 2 can be found in `/usr/share/common-licenses/LGPL-2'.
-Files: data/examples/DrawingExample.FCStd data/examples/PartDesignExample.FCStd data/examples/RobotExample.FCStd data/examples/Schenkel.stp
+Files: data/examples/DrawingExample.FCStd data/examples/PartDesignExample.FCStd data/examples/RobotExample.FCStd data/examples/Schenkel.stp
Copyright: 2011 Juergen Riegel <juergen.riegel at web.de>
License: CC-BY-SA
Creative Commons Attribution Share Alike license.
-
-Files: data/examples/EngineBlock.FCStd
+
+Files: data/examples/EngineBlock.FCStd
Copyright: 2011 Werner Mayer <wmayer at users.sourceforge.net>
License: CC-BY-SA
Creative Commons Attribution Share Alike license.
-
diff --git a/debian/freecad.install b/debian/freecad.install
index 9b3eab8..30e2fa0 100644
--- a/debian/freecad.install
+++ b/debian/freecad.install
@@ -1,7 +1,7 @@
-usr/bin/ usr/lib/freecad/
-usr/lib/ usr/lib/freecad/
+debian/freecad.desktop usr/share/applications
+debian/menu usr/share/menu/freecad
usr/Mod usr/lib/freecad/
+usr/bin/ usr/lib/freecad/
usr/data/Mod usr/lib/freecad/data
usr/data/freeca*.* /usr/share/freecad/
-debian/freecad.desktop usr/share/applications
-debian/menu usr/share/menu/freecad
+usr/lib/ usr/lib/freecad/
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/freecad.git
More information about the debian-science-commits
mailing list