Fixing OctoMap#63 (FSF address in octovis license header) for OctoMap…

… package in Fedora
FrankXie05 · Jul 1, 2014 · fe68ade · fe68ade
1 parent 118d757
commit fe68ade
Show file tree

Hide file tree

Showing 27 changed files with 185 additions and 211 deletions.
diff --git a/octovis/LICENSE.txt b/octovis/LICENSE.txt
@@ -1,13 +1,13 @@
 
 OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
-http://octomap.github.com/
+http://octomap.github.io
 
-Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
+Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
 All rights reserved.
 
 
 License for the "octovis" visualization library: GPL v2.
-octovis requires (and link against libQGLViewer (www.libqglviewer.com)
+octovis requires (and links against) libQGLViewer (www.libqglviewer.com)
 
 
 

diff --git a/octovis/include/octovis/CameraFollowMode.h b/octovis/include/octovis/CameraFollowMode.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef CAMERAFOLLOWMODE_H_

diff --git a/octovis/include/octovis/ColorOcTreeDrawer.h b/octovis/include/octovis/ColorOcTreeDrawer.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef OCTOVIS_COLOR_OCTREEDRAWER_H_

diff --git a/octovis/include/octovis/OcTreeDrawer.h b/octovis/include/octovis/OcTreeDrawer.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef OCTREEDRAWER_H_

diff --git a/octovis/include/octovis/OcTreeRecord.h b/octovis/include/octovis/OcTreeRecord.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef OCTOVIS_OC_TREE_RECORD

diff --git a/octovis/include/octovis/PointcloudDrawer.h b/octovis/include/octovis/PointcloudDrawer.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef POINTCLOUDDRAWER_H_

diff --git a/octovis/include/octovis/SceneObject.h b/octovis/include/octovis/SceneObject.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef SCENEOBJECT_H_

diff --git a/octovis/include/octovis/SelectionBox.h b/octovis/include/octovis/SelectionBox.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef SELECTIONBOX_H_

diff --git a/octovis/include/octovis/TrajectoryDrawer.h b/octovis/include/octovis/TrajectoryDrawer.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef TRAJECTORYDRAWER_H_

diff --git a/octovis/include/octovis/ViewerGui.h b/octovis/include/octovis/ViewerGui.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef VIEWERGUI_H

diff --git a/octovis/include/octovis/ViewerSettings.h b/octovis/include/octovis/ViewerSettings.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef VIEWERSETTINGS_H

diff --git a/octovis/include/octovis/ViewerSettingsPanel.h b/octovis/include/octovis/ViewerSettingsPanel.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef VIEWERSETTINGSPANEL_H

diff --git a/octovis/include/octovis/ViewerSettingsPanelCamera.h b/octovis/include/octovis/ViewerSettingsPanelCamera.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef VIEWERSETTINGSPANELFLYMODE_H

diff --git a/octovis/include/octovis/ViewerWidget.h b/octovis/include/octovis/ViewerWidget.h
@@ -1,10 +1,10 @@
 /*
- * OctoMap - An Efficient Probabilistic 3D Mapping Framework Based on Octrees
- * http://octomap.github.com/
+ * This file is part of OctoMap - An Efficient Probabilistic 3D Mapping
+ * Framework Based on Octrees
+ * http://octomap.github.io
  *
- * Copyright (c) 2009-2013, K.M. Wurm and A. Hornung, University of Freiburg
- * All rights reserved.
- * License (octovis): GNU GPL v2
+ * Copyright (c) 2009-2014, K.M. Wurm and A. Hornung, University of Freiburg
+ * All rights reserved. License for the viewer octovis: GNU GPL v2
  * http://www.gnu.org/licenses/old-licenses/gpl-2.0.txt
  *
  *
@@ -18,9 +18,8 @@
  * 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.,
- * 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
+ * You should have received a copy of the GNU General Public License
+ * along with this program. If not, see http://www.gnu.org/licenses/.
  */
 
 #ifndef VIEWERWIDGET_H_