Author: antonm-guest Date: 2011-07-09 18:15:45 +0000 (Sat, 09 Jul 2011) New Revision: 3034
Modified: packages/opencpn/trunk/debian/changelog packages/opencpn/trunk/debian/copyright packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch packages/opencpn/trunk/debian/watch Log: Packaged for upstream 2.4.708, DEP-5 copyright file. Modified: packages/opencpn/trunk/debian/changelog =================================================================== --- packages/opencpn/trunk/debian/changelog 2011-07-09 17:46:51 UTC (rev 3033) +++ packages/opencpn/trunk/debian/changelog 2011-07-09 18:15:45 UTC (rev 3034) @@ -1,11 +1,20 @@ -opencpn (2.4.628-1) unstable; urgency=low +opencpn (2.4.708+dfsg-1) unstable; urgency=low + * Packaged for upstream git beta version 2.4.708 + * Fixed use_pkg_tinyxml.patch to apply cleanly with upstream changes + * Added "dfsg" to version number + * Added DEP-5 machine-readable copyright file + * Closing ITP. (Closes: #538067) + + -- Anton Martchukov <[email protected]> Sat, 09 Jul 2011 17:13:00 +0400 + +opencpn (2.4.628-0) unstable; urgency=low + * Packaged for upstream git beta version 2.4.628 * Drop plugin path patch (merged upstream) * Reset unreleased package versions to x.y.z-0 in Debian changelog * Remove some embedded files in the source package which are unused * Use system's TinyXML instead of embedded copy - * Closing ITP. (Closes: #538067) -- Hamish B <[email protected]> Wed, 29 Jun 2011 20:56:53 +1200 Modified: packages/opencpn/trunk/debian/copyright =================================================================== --- packages/opencpn/trunk/debian/copyright 2011-07-09 17:46:51 UTC (rev 3033) +++ packages/opencpn/trunk/debian/copyright 2011-07-09 18:15:45 UTC (rev 3034) @@ -1,46 +1,176 @@ -This work was packaged for Debian by: +Format: http://dep.debian.net/deps/dep5 +Upstream-Name: opencpn +Source: http://sourceforge.net/projects/opencpn/files/ - Anton Martchukov <[email protected]> on Sat, 26 Jun 2010 02:17:46 +0400 - with help from the DebianGIS team. +Files: * +Copyright: 2008-2011 David S Register <[email protected]> + 2008-2011 Contributors, see src/about.cpp AuthorText[] +License: GPL-2.0+ -It was downloaded from http://sourceforge.net/projects/opencpn/ +Files: debian/* +Copyright: 2010-2011 Anton Martchukov <[email protected]> + 2010-2011 DebianGIS Team http://wiki.debian.org/DebianGis +License: GPL-2.0+ -Upstream Author(s): +Files: debian/cmake_Modules/FindTinyXML.cmake +Copyright: 2006-2008 The EVEmu Team http://trac.evemu.org +License: GPL-2.0+ - David S Register <[email protected]> - OpenCPN Lead Developer - Other contributing authors are listed in src/about.cpp AuthorText[]. +Files: src/garmin/jeeps/* +Copyright: 1999-2000 Alan Bleasby + 2004-2006 Robert Lipe <[email protected]> + 2007 Achim Schumacher + 2010 Martin Buck +License: GPL-2.0+ -Copyright: +Files: src/mygdal/* +Copyright: 1998-2011 GDAL/OGR Project http://www.gdal.org/ +License: Expat - Copyright (C) 2008-2011 David S Register <[email protected]> +Files: src/myiso8211/* +Copyright: 1999 Frank Warmerdam <[email protected]> +License: Expat -License: +Files: src/nmea0183/* plugins/*/src/nmea0183/* +Copyright: 2010 Samuel R. Blackburn + 2010-2011 David S Register <[email protected]> +License: GPL-2.0+ - You are free to distribute this software under the terms of - the GNU General Public License version 2. - - On Debian systems, the complete text of the GNU General Public - License can be found in the file `/usr/share/common-licenses/GPL-2'. +Files: plugins/grib_pi/src/Grib* plugins/grib_pi/src/Iso* plugins/grib_pi/src/ZuFile +Copyright: 2008 Jacques Zaninetti http://www.zygrib.org +License: GPL-3.0+ - from src/about.c: - For Developer Reference, the included source code - elements are licensed as follows: +Files: data/s57data/* +Copyright: 2000-2001 Sylvain Duclos <[email protected]> + 2010 David S. Register <[email protected]> + 2010 by Pavel Kalian" <[email protected]> +License: GPL-2.0+ - wxWidgets LGPL - s52cnsy&s52plib GPL - seriallib GPL - tcmgr GPL - mygdal BSD, compatible with GPL - nmea0183 Owner License, compatible with GPL - triangles Public Domain see tri.c, compatible with GPL - wvschart Public Domain see wvschart.cpp, compatible with GPL +Files: data/sounds/* +Copyright: 2010 Warzyniec Szwaja +License: GPL-2.0+ +Files: data/wvsdata/* +Copyright: National Geophysical Data Center (NGDC) +License: public-domain + World Vector Shoreline is a U.S. Government work and is not eligible for + U.S. copyright protection. -The Debian packaging is: +Files: data/tcdata/* +Copyright: National Oceanic and Atmospheric Administration + 2010 Dave Flater <[email protected]> + 2010-2011 David S Register <[email protected]> +License: + The data are licensed as follows, from + http://www.flaterco.com/xtide/harmonics_boilerplate.txt : + . + ********* NOT FOR NAVIGATION ******** + . + *** DO NOT RELY ON THIS DATA FILE FOR DECISIONS THAT CAN RESULT IN *** + *** HARM TO ANYONE OR ANYTHING. *** + . + Highly trustworthy tide predictions cannot be achieved on a zero + budget. If you need guaranteed results, don't use these data! + Contact the tide authority for your region (NOAA in the U.S.). + . + This data file is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without any warranty that its use will NOT + INFRINGE ANY RIGHTS, and without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. + . + WHOEVER CHOOSES TO REDISTRIBUTE THESE DATA ASSUMES ALL LIABILITY + ASSOCIATED THEREWITH. NEITHER DAVID FLATER NOR ANYONE ELSE INVOLVED + SHALL BE LIABLE PERSONALLY OR OTHERWISE FOR ANY LOSSES THAT THE + REDISTRIBUTOR MIGHT SUFFER AS A CONSEQUENCE OF ANY CLAIMS, BOGUS OR + OTHERWISE, THAT ARE MADE TO THESE DATA. + . + --- Copyright statements --- + . + United States: Data published by the U.S. government is by law + non-proprietary. Stations in the U.S., territories of the U.S., + commonwealths associated with the U.S., and countries with a Compact + of Free Association with the U.S. have been included. A few other + stations available from the NOS web site have been dropped. + . + Notice available on the NOS web site at + http://tidesandcurrents.noaa.gov/disclaimers.html as of + 2007-05-30: + . + The information on government servers are in the public domain, + unless specifically annotated otherwise, and may be used freely by + the public. Before using information obtained from this server, + special attention should be given to the date and time of the data + and products being displayed. This information shall not be + modified in content and then presented as official government + material. + . + The user assumes the entire risk related to its use of these + data. NOS is providing these data "as is," and NOS disclaims any + and all warranties, whether express or implied, including (without + limitation) any implied warranties of merchantability or fitness + for a particular purpose. In no event will NOS be liable to you or + to any third party for any direct, indirect, incidental, + consequential, special or exemplary damages or lost profit + resulting from any use or misuse of this data. + . + NOS requests that attribution be given whenever NOS material is + reproduced and re-disseminated. Pursuant to 17 U.S.C. 403, third + parties producing copyrighted (compilation) works consisting + predominantly of material created by Federal Government employees + are encouraged to provide notice with such work(s) identifying the + U.S. Government material incorporated and stating that such + material is not subject to copyright protection. + +License: GPL-2.0+ + This package 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 package 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, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 2 can be found in "/usr/share/common-licenses/GPL-2". - Copyright (C) 2010-2011 Anton Martchukov <[email protected]>, - and the DebianGIS team. +License: GPL-3.0+ + This package 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 3 of the License, or + (at your option) any later version. + . + This package 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, see <http://www.gnu.org/licenses/> + . + On Debian systems, the complete text of the GNU General + Public License version 3 can be found in "/usr/share/common-licenses/GPL-3". -The FindTinyXML.cmake file in the Debian packaging is (c) 2006-2008 The EVEmu -Team, GPL>=2. http://trac.evemu.org - +License: Expat + 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 so, subject to + the following conditions: + . + 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 SOFTWARE. Modified: packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch =================================================================== --- packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch 2011-07-09 17:46:51 UTC (rev 3033) +++ packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch 2011-07-09 18:15:45 UTC (rev 3034) @@ -2,49 +2,46 @@ Author: Hamish B <hamish_b yahoo com> Index: opencpn/CMakeLists.txt =================================================================== ---- opencpn.orig/CMakeLists.txt 2011-07-01 11:55:11.290937381 +1200 -+++ opencpn/CMakeLists.txt 2011-07-01 15:23:02.090948646 +1200 -@@ -126,6 +126,8 @@ +--- opencpn.orig/CMakeLists.txt 2011-07-09 18:33:01.292126460 +0400 ++++ opencpn/CMakeLists.txt 2011-07-09 18:52:35.488126851 +0400 +@@ -178,7 +178,8 @@ INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) FIND_PACKAGE(ZLIB REQUIRED) INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) +- FIND_PACKAGE(TinyXML) + FIND_PACKAGE(TinyXML REQUIRED) + INCLUDE_DIRECTORIES(${TINYXML_INCLUDE_DIR}) ENDIF(UNIX) # For convenience we define the sources as a variable. You can add -@@ -223,8 +225,6 @@ +@@ -276,7 +277,6 @@ include/ais.h include/pluginmanager.h include/ocpn_plugin.h - include/tinystr.h -- include/tinyxml.h include/gpxdocument.h ) -@@ -251,10 +251,6 @@ +@@ -303,7 +303,6 @@ src/about.cpp src/ais.cpp src/pluginmanager.cpp -- src/tinyxml.cpp -- src/tinyxmlerror.cpp -- src/tinyxmlparser.cpp - src/tinystr.cpp src/gpxdocument.cpp ) -@@ -606,6 +602,7 @@ +@@ -670,6 +669,7 @@ ${GETTEXT_LIBRARY} ${BZIP2_LIBRARIES} ${ZLIB_LIBRARY} + ${TINYXML_LIBRARIES} - ) - ENDIF(UNIX) + ) -Index: opencpn/include/gpxdocument.h + IF(TINYXML_FOUND) +Index: opencpn-2.4.708/include/gpxdocument.h =================================================================== ---- opencpn.orig/include/gpxdocument.h 2011-07-01 15:25:22.290911324 +1200 -+++ opencpn/include/gpxdocument.h 2011-07-01 15:25:34.522922563 +1200 +--- opencpn-2.4.708.orig/include/gpxdocument.h 2011-07-09 18:53:08.484126861 +0400 ++++ opencpn-2.4.708/include/gpxdocument.h 2011-07-09 18:53:19.240126866 +0400 @@ -29,7 +29,6 @@ #include <wx/wx.h> Modified: packages/opencpn/trunk/debian/watch =================================================================== --- packages/opencpn/trunk/debian/watch 2011-07-09 17:46:51 UTC (rev 3033) +++ packages/opencpn/trunk/debian/watch 2011-07-09 18:15:45 UTC (rev 3034) @@ -1,2 +1,3 @@ version=3 +opts=dversionmangle=s/\+dfsg// \ http://sf.net/opencpn/OpenCPN-([\d\.]+)-Source\.tar\.gz _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
