[gazebo] 03/07: Remove merged patches and update remaning ones
Jose Luis Rivero
jrivero-guest at moszumanska.debian.org
Mon Aug 3 01:14:24 UTC 2015
This is an automated email from the git hooks/post-receive script.
jrivero-guest pushed a commit to branch master
in repository gazebo.
commit bbe3d9a9a9ff3fe55f3af40e2ca40866f2e4eb3c
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Date: Sun Aug 2 21:06:28 2015 +0000
Remove merged patches and update remaning ones
---
debian/patches/0002-missing-license-files.patch | 560 ----------------------
debian/patches/0003-respect-cmake-c-flags.patch | 17 -
debian/patches/0004-update-ann-copyright.patch | 29 --
debian/patches/0005-fix-problems-on-manpage.patch | 34 +-
debian/patches/0006-remove-maiden-font.patch | 144 ------
debian/patches/0009-backport-model-path-fix.patch | 18 -
debian/patches/series | 5 -
7 files changed, 18 insertions(+), 789 deletions(-)
diff --git a/debian/patches/0002-missing-license-files.patch b/debian/patches/0002-missing-license-files.patch
deleted file mode 100644
index 62c27b0..0000000
--- a/debian/patches/0002-missing-license-files.patch
+++ /dev/null
@@ -1,560 +0,0 @@
-Description: include missing licenses in source code
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Forwarded: https://bitbucket.org/osrf/gazebo/pull-request/1464
-
-diff -r 373d07a16ed0 cmake/GPL-2
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/cmake/GPL-2 Fri Feb 27 01:55:40 2015 +0100
-@@ -0,0 +1,339 @@
-+ GNU GENERAL PUBLIC LICENSE
-+ Version 2, June 1991
-+
-+ Copyright (C) 1989, 1991 Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+ Preamble
-+
-+ The licenses for most software are designed to take away your
-+freedom to share and change it. By contrast, the GNU General Public
-+License is intended to guarantee your freedom to share and change free
-+software--to make sure the software is free for all its users. This
-+General Public License applies to most of the Free Software
-+Foundation's software and to any other program whose authors commit to
-+using it. (Some other Free Software Foundation software is covered by
-+the GNU Lesser General Public License instead.) You can apply it to
-+your programs, too.
-+
-+ When we speak of free software, we are referring to freedom, not
-+price. Our General Public Licenses are designed to make sure that you
-+have the freedom to distribute copies of free software (and charge for
-+this service if you wish), that you receive source code or can get it
-+if you want it, that you can change the software or use pieces of it
-+in new free programs; and that you know you can do these things.
-+
-+ To protect your rights, we need to make restrictions that forbid
-+anyone to deny you these rights or to ask you to surrender the rights.
-+These restrictions translate to certain responsibilities for you if you
-+distribute copies of the software, or if you modify it.
-+
-+ For example, if you distribute copies of such a program, whether
-+gratis or for a fee, you must give the recipients all the rights that
-+you have. You must make sure that they, too, receive or can get the
-+source code. And you must show them these terms so they know their
-+rights.
-+
-+ We protect your rights with two steps: (1) copyright the software, and
-+(2) offer you this license which gives you legal permission to copy,
-+distribute and/or modify the software.
-+
-+ Also, for each author's protection and ours, we want to make certain
-+that everyone understands that there is no warranty for this free
-+software. If the software is modified by someone else and passed on, we
-+want its recipients to know that what they have is not the original, so
-+that any problems introduced by others will not reflect on the original
-+authors' reputations.
-+
-+ Finally, any free program is threatened constantly by software
-+patents. We wish to avoid the danger that redistributors of a free
-+program will individually obtain patent licenses, in effect making the
-+program proprietary. To prevent this, we have made it clear that any
-+patent must be licensed for everyone's free use or not licensed at all.
-+
-+ The precise terms and conditions for copying, distribution and
-+modification follow.
-+
-+ GNU GENERAL PUBLIC LICENSE
-+ TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
-+
-+ 0. This License applies to any program or other work which contains
-+a notice placed by the copyright holder saying it may be distributed
-+under the terms of this General Public License. The "Program", below,
-+refers to any such program or work, and a "work based on the Program"
-+means either the Program or any derivative work under copyright law:
-+that is to say, a work containing the Program or a portion of it,
-+either verbatim or with modifications and/or translated into another
-+language. (Hereinafter, translation is included without limitation in
-+the term "modification".) Each licensee is addressed as "you".
-+
-+Activities other than copying, distribution and modification are not
-+covered by this License; they are outside its scope. The act of
-+running the Program is not restricted, and the output from the Program
-+is covered only if its contents constitute a work based on the
-+Program (independent of having been made by running the Program).
-+Whether that is true depends on what the Program does.
-+
-+ 1. You may copy and distribute verbatim copies of the Program's
-+source code as you receive it, in any medium, provided that you
-+conspicuously and appropriately publish on each copy an appropriate
-+copyright notice and disclaimer of warranty; keep intact all the
-+notices that refer to this License and to the absence of any warranty;
-+and give any other recipients of the Program a copy of this License
-+along with the Program.
-+
-+You may charge a fee for the physical act of transferring a copy, and
-+you may at your option offer warranty protection in exchange for a fee.
-+
-+ 2. You may modify your copy or copies of the Program or any portion
-+of it, thus forming a work based on the Program, and copy and
-+distribute such modifications or work under the terms of Section 1
-+above, provided that you also meet all of these conditions:
-+
-+ a) You must cause the modified files to carry prominent notices
-+ stating that you changed the files and the date of any change.
-+
-+ b) You must cause any work that you distribute or publish, that in
-+ whole or in part contains or is derived from the Program or any
-+ part thereof, to be licensed as a whole at no charge to all third
-+ parties under the terms of this License.
-+
-+ c) If the modified program normally reads commands interactively
-+ when run, you must cause it, when started running for such
-+ interactive use in the most ordinary way, to print or display an
-+ announcement including an appropriate copyright notice and a
-+ notice that there is no warranty (or else, saying that you provide
-+ a warranty) and that users may redistribute the program under
-+ these conditions, and telling the user how to view a copy of this
-+ License. (Exception: if the Program itself is interactive but
-+ does not normally print such an announcement, your work based on
-+ the Program is not required to print an announcement.)
-+
-+These requirements apply to the modified work as a whole. If
-+identifiable sections of that work are not derived from the Program,
-+and can be reasonably considered independent and separate works in
-+themselves, then this License, and its terms, do not apply to those
-+sections when you distribute them as separate works. But when you
-+distribute the same sections as part of a whole which is a work based
-+on the Program, the distribution of the whole must be on the terms of
-+this License, whose permissions for other licensees extend to the
-+entire whole, and thus to each and every part regardless of who wrote it.
-+
-+Thus, it is not the intent of this section to claim rights or contest
-+your rights to work written entirely by you; rather, the intent is to
-+exercise the right to control the distribution of derivative or
-+collective works based on the Program.
-+
-+In addition, mere aggregation of another work not based on the Program
-+with the Program (or with a work based on the Program) on a volume of
-+a storage or distribution medium does not bring the other work under
-+the scope of this License.
-+
-+ 3. You may copy and distribute the Program (or a work based on it,
-+under Section 2) in object code or executable form under the terms of
-+Sections 1 and 2 above provided that you also do one of the following:
-+
-+ a) Accompany it with the complete corresponding machine-readable
-+ source code, which must be distributed under the terms of Sections
-+ 1 and 2 above on a medium customarily used for software interchange; or,
-+
-+ b) Accompany it with a written offer, valid for at least three
-+ years, to give any third party, for a charge no more than your
-+ cost of physically performing source distribution, a complete
-+ machine-readable copy of the corresponding source code, to be
-+ distributed under the terms of Sections 1 and 2 above on a medium
-+ customarily used for software interchange; or,
-+
-+ c) Accompany it with the information you received as to the offer
-+ to distribute corresponding source code. (This alternative is
-+ allowed only for noncommercial distribution and only if you
-+ received the program in object code or executable form with such
-+ an offer, in accord with Subsection b above.)
-+
-+The source code for a work means the preferred form of the work for
-+making modifications to it. For an executable work, complete source
-+code means all the source code for all modules it contains, plus any
-+associated interface definition files, plus the scripts used to
-+control compilation and installation of the executable. However, as a
-+special exception, the source code distributed need not include
-+anything that is normally distributed (in either source or binary
-+form) with the major components (compiler, kernel, and so on) of the
-+operating system on which the executable runs, unless that component
-+itself accompanies the executable.
-+
-+If distribution of executable or object code is made by offering
-+access to copy from a designated place, then offering equivalent
-+access to copy the source code from the same place counts as
-+distribution of the source code, even though third parties are not
-+compelled to copy the source along with the object code.
-+
-+ 4. You may not copy, modify, sublicense, or distribute the Program
-+except as expressly provided under this License. Any attempt
-+otherwise to copy, modify, sublicense or distribute the Program is
-+void, and will automatically terminate your rights under this License.
-+However, parties who have received copies, or rights, from you under
-+this License will not have their licenses terminated so long as such
-+parties remain in full compliance.
-+
-+ 5. You are not required to accept this License, since you have not
-+signed it. However, nothing else grants you permission to modify or
-+distribute the Program or its derivative works. These actions are
-+prohibited by law if you do not accept this License. Therefore, by
-+modifying or distributing the Program (or any work based on the
-+Program), you indicate your acceptance of this License to do so, and
-+all its terms and conditions for copying, distributing or modifying
-+the Program or works based on it.
-+
-+ 6. Each time you redistribute the Program (or any work based on the
-+Program), the recipient automatically receives a license from the
-+original licensor to copy, distribute or modify the Program subject to
-+these terms and conditions. You may not impose any further
-+restrictions on the recipients' exercise of the rights granted herein.
-+You are not responsible for enforcing compliance by third parties to
-+this License.
-+
-+ 7. If, as a consequence of a court judgment or allegation of patent
-+infringement or for any other reason (not limited to patent issues),
-+conditions are imposed on you (whether by court order, agreement or
-+otherwise) that contradict the conditions of this License, they do not
-+excuse you from the conditions of this License. If you cannot
-+distribute so as to satisfy simultaneously your obligations under this
-+License and any other pertinent obligations, then as a consequence you
-+may not distribute the Program at all. For example, if a patent
-+license would not permit royalty-free redistribution of the Program by
-+all those who receive copies directly or indirectly through you, then
-+the only way you could satisfy both it and this License would be to
-+refrain entirely from distribution of the Program.
-+
-+If any portion of this section is held invalid or unenforceable under
-+any particular circumstance, the balance of the section is intended to
-+apply and the section as a whole is intended to apply in other
-+circumstances.
-+
-+It is not the purpose of this section to induce you to infringe any
-+patents or other property right claims or to contest validity of any
-+such claims; this section has the sole purpose of protecting the
-+integrity of the free software distribution system, which is
-+implemented by public license practices. Many people have made
-+generous contributions to the wide range of software distributed
-+through that system in reliance on consistent application of that
-+system; it is up to the author/donor to decide if he or she is willing
-+to distribute software through any other system and a licensee cannot
-+impose that choice.
-+
-+This section is intended to make thoroughly clear what is believed to
-+be a consequence of the rest of this License.
-+
-+ 8. If the distribution and/or use of the Program is restricted in
-+certain countries either by patents or by copyrighted interfaces, the
-+original copyright holder who places the Program under this License
-+may add an explicit geographical distribution limitation excluding
-+those countries, so that distribution is permitted only in or among
-+countries not thus excluded. In such case, this License incorporates
-+the limitation as if written in the body of this License.
-+
-+ 9. The Free Software Foundation may publish revised and/or new versions
-+of the General Public License from time to time. Such new versions will
-+be similar in spirit to the present version, but may differ in detail to
-+address new problems or concerns.
-+
-+Each version is given a distinguishing version number. If the Program
-+specifies a version number of this License which applies to it and "any
-+later version", you have the option of following the terms and conditions
-+either of that version or of any later version published by the Free
-+Software Foundation. If the Program does not specify a version number of
-+this License, you may choose any version ever published by the Free Software
-+Foundation.
-+
-+ 10. If you wish to incorporate parts of the Program into other free
-+programs whose distribution conditions are different, write to the author
-+to ask for permission. For software which is copyrighted by the Free
-+Software Foundation, write to the Free Software Foundation; we sometimes
-+make exceptions for this. Our decision will be guided by the two goals
-+of preserving the free status of all derivatives of our free software and
-+of promoting the sharing and reuse of software generally.
-+
-+ NO WARRANTY
-+
-+ 11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
-+FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW. EXCEPT WHEN
-+OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
-+PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
-+OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
-+MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. THE ENTIRE RISK AS
-+TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU. SHOULD THE
-+PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
-+REPAIR OR CORRECTION.
-+
-+ 12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
-+WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
-+REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
-+INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
-+OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
-+TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
-+YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
-+PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
-+POSSIBILITY OF SUCH DAMAGES.
-+
-+ END OF TERMS AND CONDITIONS
-+
-+ How to Apply These Terms to Your New Programs
-+
-+ If you develop a new program, and you want it to be of the greatest
-+possible use to the public, the best way to achieve this is to make it
-+free software which everyone can redistribute and change under these terms.
-+
-+ To do so, attach the following notices to the program. It is safest
-+to attach them to the start of each source file to most effectively
-+convey the exclusion of warranty; and each file should have at least
-+the "copyright" line and a pointer to where the full notice is found.
-+
-+ <one line to give the program's name and a brief idea of what it does.>
-+ Copyright (C) <year> <name of author>
-+
-+ This program is free software; you can redistribute it and/or modify
-+ it under the terms of the GNU General Public License as published by
-+ the Free Software Foundation; either version 2 of the License, or
-+ (at your option) any later version.
-+
-+ This program is distributed in the hope that it will be useful,
-+ but WITHOUT ANY WARRANTY; without even the implied warranty of
-+ MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
-+ GNU General Public License for more details.
-+
-+ You should have received a copy of the GNU General Public License along
-+ with this program; if not, write to the Free Software Foundation, Inc.,
-+ 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
-+
-+Also add information on how to contact you by electronic and paper mail.
-+
-+If the program is interactive, make it output a short notice like this
-+when it starts in an interactive mode:
-+
-+ Gnomovision version 69, Copyright (C) year name of author
-+ Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
-+ This is free software, and you are welcome to redistribute it
-+ under certain conditions; type `show c' for details.
-+
-+The hypothetical commands `show w' and `show c' should show the appropriate
-+parts of the General Public License. Of course, the commands you use may
-+be called something other than `show w' and `show c'; they could even be
-+mouse-clicks or menu items--whatever suits your program.
-+
-+You should also get your employer (if you work as a programmer) or your
-+school, if any, to sign a "copyright disclaimer" for the program, if
-+necessary. Here is a sample; alter the names:
-+
-+ Yoyodyne, Inc., hereby disclaims all copyright interest in the program
-+ `Gnomovision' (which makes passes at compilers) written by James Hacker.
-+
-+ <signature of Ty Coon>, 1 April 1989
-+ Ty Coon, President of Vice
-+
-+This General Public License does not permit incorporating your program into
-+proprietary programs. If your program is a subroutine library, you may
-+consider it more useful to permit linking proprietary applications with the
-+library. If this is what you want to do, use the GNU Lesser General
-+Public License instead of this License.
-diff -r 373d07a16ed0 deps/ann/include/ann/LGPL
---- /dev/null Thu Jan 01 00:00:00 1970 +0000
-+++ b/deps/ann/include/ann/LGPL Fri Feb 27 01:55:40 2015 +0100
-@@ -0,0 +1,165 @@
-+ GNU LESSER GENERAL PUBLIC LICENSE
-+ Version 3, 29 June 2007
-+
-+ Copyright (C) 2007 Free Software Foundation, Inc. <http://fsf.org/>
-+ Everyone is permitted to copy and distribute verbatim copies
-+ of this license document, but changing it is not allowed.
-+
-+
-+ This version of the GNU Lesser General Public License incorporates
-+the terms and conditions of version 3 of the GNU General Public
-+License, supplemented by the additional permissions listed below.
-+
-+ 0. Additional Definitions.
-+
-+ As used herein, "this License" refers to version 3 of the GNU Lesser
-+General Public License, and the "GNU GPL" refers to version 3 of the GNU
-+General Public License.
-+
-+ "The Library" refers to a covered work governed by this License,
-+other than an Application or a Combined Work as defined below.
-+
-+ An "Application" is any work that makes use of an interface provided
-+by the Library, but which is not otherwise based on the Library.
-+Defining a subclass of a class defined by the Library is deemed a mode
-+of using an interface provided by the Library.
-+
-+ A "Combined Work" is a work produced by combining or linking an
-+Application with the Library. The particular version of the Library
-+with which the Combined Work was made is also called the "Linked
-+Version".
-+
-+ The "Minimal Corresponding Source" for a Combined Work means the
-+Corresponding Source for the Combined Work, excluding any source code
-+for portions of the Combined Work that, considered in isolation, are
-+based on the Application, and not on the Linked Version.
-+
-+ The "Corresponding Application Code" for a Combined Work means the
-+object code and/or source code for the Application, including any data
-+and utility programs needed for reproducing the Combined Work from the
-+Application, but excluding the System Libraries of the Combined Work.
-+
-+ 1. Exception to Section 3 of the GNU GPL.
-+
-+ You may convey a covered work under sections 3 and 4 of this License
-+without being bound by section 3 of the GNU GPL.
-+
-+ 2. Conveying Modified Versions.
-+
-+ If you modify a copy of the Library, and, in your modifications, a
-+facility refers to a function or data to be supplied by an Application
-+that uses the facility (other than as an argument passed when the
-+facility is invoked), then you may convey a copy of the modified
-+version:
-+
-+ a) under this License, provided that you make a good faith effort to
-+ ensure that, in the event an Application does not supply the
-+ function or data, the facility still operates, and performs
-+ whatever part of its purpose remains meaningful, or
-+
-+ b) under the GNU GPL, with none of the additional permissions of
-+ this License applicable to that copy.
-+
-+ 3. Object Code Incorporating Material from Library Header Files.
-+
-+ The object code form of an Application may incorporate material from
-+a header file that is part of the Library. You may convey such object
-+code under terms of your choice, provided that, if the incorporated
-+material is not limited to numerical parameters, data structure
-+layouts and accessors, or small macros, inline functions and templates
-+(ten or fewer lines in length), you do both of the following:
-+
-+ a) Give prominent notice with each copy of the object code that the
-+ Library is used in it and that the Library and its use are
-+ covered by this License.
-+
-+ b) Accompany the object code with a copy of the GNU GPL and this license
-+ document.
-+
-+ 4. Combined Works.
-+
-+ You may convey a Combined Work under terms of your choice that,
-+taken together, effectively do not restrict modification of the
-+portions of the Library contained in the Combined Work and reverse
-+engineering for debugging such modifications, if you also do each of
-+the following:
-+
-+ a) Give prominent notice with each copy of the Combined Work that
-+ the Library is used in it and that the Library and its use are
-+ covered by this License.
-+
-+ b) Accompany the Combined Work with a copy of the GNU GPL and this license
-+ document.
-+
-+ c) For a Combined Work that displays copyright notices during
-+ execution, include the copyright notice for the Library among
-+ these notices, as well as a reference directing the user to the
-+ copies of the GNU GPL and this license document.
-+
-+ d) Do one of the following:
-+
-+ 0) Convey the Minimal Corresponding Source under the terms of this
-+ License, and the Corresponding Application Code in a form
-+ suitable for, and under terms that permit, the user to
-+ recombine or relink the Application with a modified version of
-+ the Linked Version to produce a modified Combined Work, in the
-+ manner specified by section 6 of the GNU GPL for conveying
-+ Corresponding Source.
-+
-+ 1) Use a suitable shared library mechanism for linking with the
-+ Library. A suitable mechanism is one that (a) uses at run time
-+ a copy of the Library already present on the user's computer
-+ system, and (b) will operate properly with a modified version
-+ of the Library that is interface-compatible with the Linked
-+ Version.
-+
-+ e) Provide Installation Information, but only if you would otherwise
-+ be required to provide such information under section 6 of the
-+ GNU GPL, and only to the extent that such information is
-+ necessary to install and execute a modified version of the
-+ Combined Work produced by recombining or relinking the
-+ Application with a modified version of the Linked Version. (If
-+ you use option 4d0, the Installation Information must accompany
-+ the Minimal Corresponding Source and Corresponding Application
-+ Code. If you use option 4d1, you must provide the Installation
-+ Information in the manner specified by section 6 of the GNU GPL
-+ for conveying Corresponding Source.)
-+
-+ 5. Combined Libraries.
-+
-+ You may place library facilities that are a work based on the
-+Library side by side in a single library together with other library
-+facilities that are not Applications and are not covered by this
-+License, and convey such a combined library under terms of your
-+choice, if you do both of the following:
-+
-+ a) Accompany the combined library with a copy of the same work based
-+ on the Library, uncombined with any other library facilities,
-+ conveyed under the terms of this License.
-+
-+ b) Give prominent notice with the combined library that part of it
-+ is a work based on the Library, and explaining where to find the
-+ accompanying uncombined form of the same work.
-+
-+ 6. Revised Versions of the GNU Lesser General Public License.
-+
-+ The Free Software Foundation may publish revised and/or new versions
-+of the GNU Lesser General Public License from time to time. Such new
-+versions will be similar in spirit to the present version, but may
-+differ in detail to address new problems or concerns.
-+
-+ Each version is given a distinguishing version number. If the
-+Library as you received it specifies that a certain numbered version
-+of the GNU Lesser General Public License "or any later version"
-+applies to it, you have the option of following the terms and
-+conditions either of that published version or of any later version
-+published by the Free Software Foundation. If the Library as you
-+received it does not specify a version number of the GNU Lesser
-+General Public License, you may choose any version of the GNU Lesser
-+General Public License ever published by the Free Software Foundation.
-+
-+ If the Library as you received it specifies that a proxy can decide
-+whether future versions of the GNU Lesser General Public License shall
-+apply, that proxy's public statement of acceptance of any version is
-+permanent authorization for you to choose that version for the
-+Library.
-diff -r 373d07a16ed0ebb400995f9c5c341e620682dbcb -r 916199e0c658a54096453de068d1788cdd2efade media/gui/fonts/BITSTREAM-LICENSE
---- /dev/null
-+++ b/media/gui/fonts/BITSTREAM-LICENSE
-@@ -0,0 +1,40 @@
-+Copyright (c) 2003 by Bitstream, Inc. All Rights Reserved. Bitstream Vera is a
-+trademark of Bitstream, Inc.
-+
-+Permission is hereby granted, free of charge, to any person obtaining a copy of
-+the fonts accompanying this license ("Fonts") and associated documentation
-+files (the "Font Software"), to reproduce and distribute the Font Software,
-+including without limitation the rights to use, copy, merge, publish,
-+distribute, and/or sell copies of the Font Software, and to permit persons to
-+whom the Font Software is furnished to do so, subject to the following
-+conditions:
-+
-+The above copyright and trademark notices and this permission notice shall be
-+included in all copies of one or more of the Font Software typefaces.
-+
-+The Font Software may be modified, altered, or added to, and in particular the
-+designs of glyphs or characters in the Fonts may be modified and additional
-+glyphs or characters may be added to the Fonts, only if the fonts are renamed
-+to names not containing either the words "Bitstream" or the word "Vera".
-+
-+This License becomes null and void to the extent applicable to Fonts or Font
-+Software that has been modified and is distributed under the "Bitstream Vera"
-+names.
-+
-+The Font Software may be sold as part of a larger software package but no copy
-+of one or more of the Font Software typefaces may be sold by itself.
-+
-+THE FONT SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-+IMPLIED, INCLUDING BUT NOT LIMITED TO ANY WARRANTIES OF MERCHANTABILITY,
-+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT OF COPYRIGHT, PATENT,
-+TRADEMARK, OR OTHER RIGHT. IN NO EVENT SHALL BITSTREAM OR THE GNOME FOUNDATION
-+BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, INCLUDING ANY GENERAL,
-+SPECIAL, INDIRECT, INCIDENTAL, OR CONSEQUENTIAL DAMAGES, WHETHER IN AN ACTION
-+OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF THE USE OR INABILITY TO
-+USE THE FONT SOFTWARE OR FROM OTHER DEALINGS IN THE FONT SOFTWARE.
-+
-+Except as contained in this notice, the names of Gnome, the Gnome Foundation,
-+and Bitstream Inc., shall not be used in advertising or otherwise to promote
-+the sale, use or other dealings in this Font Software without prior written
-+authorization from the Gnome Foundation or Bitstream Inc., respectively. For
-+further information, contact: fonts at gnome dot org.
diff --git a/debian/patches/0003-respect-cmake-c-flags.patch b/debian/patches/0003-respect-cmake-c-flags.patch
deleted file mode 100644
index f37a7e3..0000000
--- a/debian/patches/0003-respect-cmake-c-flags.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: do not unset CMAKE_C*_FLAGS
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Forwarded: no
-
-diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 63ea6f7..d5406f9 100644
---- a/CMakeLists.txt
-+++ b/CMakeLists.txt
-@@ -181,8 +181,6 @@ endif()
-
- #####################################
- # Handle CFlags
--unset (CMAKE_C_FLAGS_ALL CACHE)
--unset (CMAKE_CXX_FLAGS CACHE)
-
- # USE_HOST_CFLAGS (default TRUE)
- # Will check building host machine for proper cflags
diff --git a/debian/patches/0004-update-ann-copyright.patch b/debian/patches/0004-update-ann-copyright.patch
deleted file mode 100644
index 22ec8a1..0000000
--- a/debian/patches/0004-update-ann-copyright.patch
+++ /dev/null
@@ -1,29 +0,0 @@
-Description: update ann copyrigth
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Forwarded: https://bitbucket.org/osrf/gazebo/pull-request/1465
-
-
-diff -r 8279a82b2a9f deps/ann/include/ann/ANN.h
---- a/deps/ann/include/ann/ANN.h Fri Feb 27 01:57:15 2015 +0100
-+++ b/deps/ann/include/ann/ANN.h Fri Feb 27 02:02:40 2015 +0100
-@@ -5,7 +5,7 @@
- // neighbor searching.
- // Last modified: 01/27/10 (Version 1.1.2)
- //----------------------------------------------------------------------
--// Copyright (c) 1997-2010 University of Maryland and Sunil Arya and
-+// Copyright (c) 1997-2015 University of Maryland and Sunil Arya and
- // David Mount. All Rights Reserved.
- //
- // This software and related documentation is part of the Approximate
-diff -r 8279a82b2a9f deps/ann/include/ann/ANNx.h
---- a/deps/ann/include/ann/ANNx.h Fri Feb 27 01:57:15 2015 +0100
-+++ b/deps/ann/include/ann/ANNx.h Fri Feb 27 02:02:40 2015 +0100
-@@ -11,7 +11,7 @@
- //
- // Typical users of ANN should not need to access this file.
- //----------------------------------------------------------------------
--// Copyright (c) 1997-2010 University of Maryland and Sunil Arya and
-+// Copyright (c) 1997-2015 University of Maryland and Sunil Arya and
- // David Mount. All Rights Reserved.
- //
- // This software and related documentation is part of the Approximate
diff --git a/debian/patches/0005-fix-problems-on-manpage.patch b/debian/patches/0005-fix-problems-on-manpage.patch
index 306f04a..6c399bb 100644
--- a/debian/patches/0005-fix-problems-on-manpage.patch
+++ b/debian/patches/0005-fix-problems-on-manpage.patch
@@ -2,8 +2,10 @@ Description: Remove unknown roff commands
Author: Jose Luis Rivero <jrivero at osrfoundation.org>
Forwarded: no
---- gazebo-3.0.0.orig/tools/gz.1.roff
-+++ gazebo-3.0.0/tools/gz.1.roff
+diff --git a/tools/gz.1.roff b/tools/gz.1.roff
+index 1cfb9a4..4fc0c81 100644
+--- a/tools/gz.1.roff
++++ b/tools/gz.1.roff
@@ -6,9 +6,7 @@
.SH "SYNPOSIS"
\fBgz\fR \fIcommand\fR [option]\.\.\. [argument]\.\.\.
@@ -30,7 +32,7 @@ Forwarded: no
.SS debug
.sp
.nf
-@@ -61,7 +57,6 @@ return the completion list for a given c
+@@ -61,7 +57,6 @@ return the completion list for a given command.
.sp
Options:
@@ -59,7 +61,7 @@ Forwarded: no
.SS joint
.sp
.nf
-@@ -106,7 +98,6 @@ A model name and joint name are required
+@@ -106,7 +98,6 @@ A model name and joint name are required.
.sp
Options:
@@ -99,7 +101,7 @@ Forwarded: no
.TP
.B \-h, \-\-help
.
-@@ -278,7 +265,6 @@ Spawn model from SDF string, pass by a p
+@@ -286,7 +273,6 @@ Output model pose as a space separated 6\-tuple: x y z roll pitch yaw.
.B \-P, \-\-pose\-P arg pitch in radians.
.TP
.B \-Y, \-\-pose\-Y arg yaw in radians.
@@ -107,7 +109,7 @@ Forwarded: no
.SS physics
.sp
.nf
-@@ -294,7 +280,6 @@ the first world found on the Gazebo mast
+@@ -302,7 +288,6 @@ the first world found on the Gazebo master will be used.
.sp
Options:
@@ -115,15 +117,15 @@ Forwarded: no
.TP
.B \-h, \-\-help
.
-@@ -319,7 +304,6 @@ Number of iterations.
- .B \-u, \-\-update\-rate\fR=\fIarg\fR
+@@ -331,7 +316,6 @@ Target real\-time update rate.
+ .B \-o, \-\-profile\fR=\fIarg\fR
.
- Target real\-time update rate.
+ Preset physics profile.
-.UNINDENT
.SS sdf
.sp
.nf
-@@ -335,7 +319,6 @@ SDF for use with other options.
+@@ -347,7 +331,6 @@ SDF for use with other options.
.sp
Options:
@@ -131,7 +133,7 @@ Forwarded: no
.TP
.B \-h, \-\-help
.
-@@ -364,7 +347,6 @@ Version of SDF to use with other options
+@@ -376,7 +359,6 @@ Version of SDF to use with other options.
.B \-p, \-\-print\fR=\fIarg\fR
.
Print arg, useful for debugging and as a conversion tool.
@@ -139,7 +141,7 @@ Forwarded: no
.SS stats
.sp
.nf
-@@ -380,7 +362,6 @@ the Gazebo master will be used.
+@@ -392,7 +374,6 @@ the Gazebo master will be used.
.sp
Options:
@@ -147,7 +149,7 @@ Forwarded: no
.TP
.B \-h, \-\-help
.
-@@ -397,7 +378,6 @@ Duration (seconds) to run.
+@@ -409,7 +390,6 @@ Duration (seconds) to run.
.B \-p, \-\-plot
.
Output comma\-separated values, useful for processing and plotting.
@@ -155,7 +157,7 @@ Forwarded: no
.SS topic
.sp
.nf
-@@ -413,7 +393,6 @@ the Gazebo master will be used.
+@@ -425,7 +405,6 @@ the Gazebo master will be used.
.sp
Options:
@@ -163,7 +165,7 @@ Forwarded: no
.TP
.B \-h, \-\-help
.
-@@ -454,7 +433,6 @@ Output data from echo without formatting
+@@ -466,7 +445,6 @@ Output data from echo without formatting.
.B \-d, \-\-duration\fR=\fIarg\fR
.
Duration (seconds) to run. Applicable with echo, hz, and bw
@@ -171,7 +173,7 @@ Forwarded: no
.SS world
.sp
.nf
-@@ -470,7 +448,6 @@ the first world found on the Gazebo mast
+@@ -482,7 +460,6 @@ the first world found on the Gazebo master will be used.
.sp
Options:
diff --git a/debian/patches/0006-remove-maiden-font.patch b/debian/patches/0006-remove-maiden-font.patch
deleted file mode 100644
index 778df36..0000000
--- a/debian/patches/0006-remove-maiden-font.patch
+++ /dev/null
@@ -1,144 +0,0 @@
-Description: Remove maiden.ttf font. Not in use.
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Forwarded: https://bitbucket.org/osrf/gazebo/pull-request/1467
-
-diff -r 373d07a16ed0 media/fonts/CMakeLists.txt
---- a/media/fonts/CMakeLists.txt Fri Feb 27 01:28:30 2015 +0100
-+++ b/media/fonts/CMakeLists.txt Fri Feb 27 02:56:03 2015 +0100
-@@ -3,8 +3,6 @@
- font_arial.png
- font_matisse_itc.png
- Gazebo.fontdef
-- maiden.ttf
-- sample.fontdef
- solo5.ttf
- )
-
-diff -r 373d07a16ed0 media/fonts/maiden.ttf
-Binary file media/fonts/maiden.ttf has changed
-diff -r 373d07a16ed0 media/fonts/sample.fontdef
---- a/media/fonts/sample.fontdef Fri Feb 27 01:28:30 2015 +0100
-+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
-@@ -1,121 +0,0 @@
--IronMaiden
--{
-- // Blame cearny for this one!
-- type truetype
-- source maiden.ttf
-- size 48
-- resolution 96
--}
--
--StarWars
--{
-- // Now this one I agree with ;)
-- // A Star Wars font :)
-- type truetype
-- source solo5.ttf
-- size 16
-- resolution 96
--}
--
--Ogre
--{
-- type image
-- source font_matisse_itc.png
--
--glyph ! 0.0898438 0.125 0.0976563 0.1875
--glyph 0.152344 0.125 0.160156 0.1875
--glyph # 0.205078 0.125 0.232422 0.1875
--glyph $ 0.273438 0.125 0.289063 0.1875
--glyph % 0.330078 0.125 0.357422 0.1875
--glyph & 0.396484 0.125 0.416016 0.1875
--glyph ' 0.464844 0.125 0.472656 0.1875
--glyph ( 0.523438 0.125 0.539063 0.1875
--glyph ) 0.585938 0.125 0.601563 0.1875
--glyph * 0.650391 0.125 0.662109 0.1875
--glyph + 0.705078 0.125 0.732422 0.1875
--glyph , 0.777344 0.125 0.785156 0.1875
--glyph - 0.835938 0.125 0.851563 0.1875
--glyph . 0.902344 0.125 0.910156 0.1875
--glyph / 0.957031 0.125 0.980469 0.1875
--glyph 0 0.0195313 0.1875 0.0429688 0.25
--glyph 1 0.0859375 0.1875 0.101563 0.25
--glyph 2 0.146484 0.1875 0.166016 0.25
--glyph 3 0.210938 0.1875 0.226563 0.25
--glyph 4 0.271484 0.1875 0.291016 0.25
--glyph 5 0.333984 0.1875 0.353516 0.25
--glyph 6 0.396484 0.1875 0.416016 0.25
--glyph 7 0.458984 0.1875 0.478516 0.25
--glyph 8 0.521484 0.1875 0.541016 0.25
--glyph 9 0.583984 0.1875 0.603516 0.25
--glyph : 0.652344 0.1875 0.660156 0.25
--glyph ; 0.714844 0.1875 0.722656 0.25
--glyph < 0.771484 0.1875 0.791016 0.25
--glyph = 0.832031 0.1875 0.855469 0.25
--glyph > 0.896484 0.1875 0.916016 0.25
--glyph ? 0.960938 0.1875 0.976563 0.25
--glyph @ 0.0195313 0.25 0.0429688 0.3125
--glyph A 0.0839844 0.25 0.103516 0.3125
--glyph B 0.146484 0.25 0.166016 0.3125
--glyph C 0.210938 0.25 0.226563 0.3125
--glyph D 0.271484 0.25 0.291016 0.3125
--glyph E 0.335938 0.25 0.351563 0.3125
--glyph F 0.396484 0.25 0.416016 0.3125
--glyph G 0.458984 0.25 0.478516 0.3125
--glyph H 0.521484 0.25 0.541016 0.3125
--glyph I 0.589844 0.25 0.597656 0.3125
--glyph J 0.646484 0.25 0.666016 0.3125
--glyph K 0.705078 0.25 0.732422 0.3125
--glyph L 0.771484 0.25 0.791016 0.3125
--glyph M 0.824219 0.25 0.863281 0.3125
--glyph N 0.892578 0.25 0.919922 0.3125
--glyph O 0.958984 0.25 0.978516 0.3125
--glyph P 0.0195313 0.3125 0.0429688 0.375
--glyph Q 0.0820313 0.3125 0.105469 0.375
--glyph R 0.144531 0.3125 0.167969 0.375
--glyph S 0.210938 0.3125 0.226563 0.375
--glyph T 0.269531 0.3125 0.292969 0.375
--glyph U 0.333984 0.3125 0.353516 0.375
--glyph V 0.396484 0.3125 0.416016 0.375
--glyph W 0.453125 0.3125 0.484375 0.375
--glyph X 0.517578 0.3125 0.544922 0.375
--glyph Y 0.576172 0.3125 0.611328 0.375
--glyph Z 0.646484 0.3125 0.666016 0.375
--glyph [ 0.708984 0.3125 0.728516 0.375
--glyph \ 0.767578 0.3125 0.794922 0.375
--glyph ] 0.833984 0.3125 0.853516 0.375
--glyph ^ 0.896484 0.3125 0.916016 0.375
--glyph _ 0.957031 0.3125 0.980469 0.375
--glyph ` 0.0195313 0.375 0.0429688 0.4375
--glyph a 0.0839844 0.375 0.103516 0.4375
--glyph b 0.146484 0.375 0.166016 0.4375
--glyph c 0.207031 0.375 0.230469 0.4375
--glyph d 0.273438 0.375 0.289063 0.4375
--glyph e 0.333984 0.375 0.353516 0.4375
--glyph f 0.396484 0.375 0.416016 0.4375
--glyph g 0.458984 0.375 0.478516 0.4375
--glyph h 0.521484 0.375 0.541016 0.4375
--glyph i 0.587891 0.375 0.599609 0.4375
--glyph j 0.646484 0.375 0.666016 0.4375
--glyph k 0.705078 0.375 0.732422 0.4375
--glyph l 0.771484 0.375 0.791016 0.4375
--glyph m 0.816406 0.375 0.871094 0.4375
--glyph n 0.888672 0.375 0.923828 0.4375
--glyph o 0.958984 0.375 0.978516 0.4375
--glyph p 0.0195313 0.4375 0.0429688 0.5
--glyph q 0.0839844 0.4375 0.103516 0.5
--glyph r 0.146484 0.4375 0.166016 0.5
--glyph s 0.208984 0.4375 0.228516 0.5
--glyph t 0.271484 0.4375 0.291016 0.5
--glyph u 0.332031 0.4375 0.355469 0.5
--glyph v 0.386719 0.4375 0.425781 0.5
--glyph w 0.445313 0.4375 0.492188 0.5
--glyph x 0.521484 0.4375 0.541016 0.5
--glyph y 0.583984 0.4375 0.603516 0.5
--glyph z 0.646484 0.4375 0.666016 0.5
--glyph { 0.710938 0.4375 0.726563 0.5
--glyph | 0.773438 0.4375 0.789063 0.5
--glyph } 0.835938 0.4375 0.851563 0.5
--glyph ~ 0.884766 0.4375 0.927734 0.5
--
--}
--
-
diff --git a/debian/patches/0009-backport-model-path-fix.patch b/debian/patches/0009-backport-model-path-fix.patch
deleted file mode 100644
index b0907e1..0000000
--- a/debian/patches/0009-backport-model-path-fix.patch
+++ /dev/null
@@ -1,18 +0,0 @@
-Description: Preserve previous GAZEBO_MODEL_PATH values when sourcing setup.sh
-Author: Jose Luis Rivero <jrivero at osrfoundation.org>
-Forwarded: https://bitbucket.org/osrf/gazebo/pull-request/1430
-
-diff --git a/cmake/setup.sh.in b/cmake/setup.sh.in
---- a/cmake/setup.sh.in
-+++ b/cmake/setup.sh.in
-@@ -1,7 +1,7 @@
- export GAZEBO_MASTER_URI=http://@GAZEBO_DEFAULT_MASTER_HOST@:@GAZEBO_DEFAULT_MASTER_PORT@
- export GAZEBO_MODEL_DATABASE_URI=@GAZEBO_MODEL_DATABASE_URI@
--export GAZEBO_RESOURCE_PATH=@GAZEBO_RESOURCE_PATH@
--export GAZEBO_PLUGIN_PATH=@GAZEBO_PLUGIN_PATH@
--export GAZEBO_MODEL_PATH=@GAZEBO_MODEL_PATH@
-+export GAZEBO_RESOURCE_PATH=@GAZEBO_RESOURCE_PATH@:${GAZEBO_RESOURCE_PATH}
-+export GAZEBO_PLUGIN_PATH=@GAZEBO_PLUGIN_PATH@:${GAZEBO_PLUGIN_PATH}
-+export GAZEBO_MODEL_PATH=@GAZEBO_MODEL_PATH@:${GAZEBO_MODEL_PATH}
- export LD_LIBRARY_PATH=${LD_LIBRARY_PATH}:@GAZEBO_PLUGIN_PATH@
- export OGRE_RESOURCE_PATH=@OGRE_RESOURCE_PATH@
diff --git a/debian/patches/series b/debian/patches/series
index 61fcee2..cf315e2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,2 @@
-0002-missing-license-files.patch
-0003-respect-cmake-c-flags.patch
-0004-update-ann-copyright.patch
0005-fix-problems-on-manpage.patch
-0006-remove-maiden-font.patch
0008-arial-font-removed-in-dfsg.patch
-0009-backport-model-path-fix.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/gazebo.git
More information about the debian-science-commits
mailing list