r3042 - in packages/opencpn/trunk/debian: . patches
hamish-guest at alioth.debian.org
hamish-guest at alioth.debian.org
Tue Aug 2 11:29:52 UTC 2011
Author: hamish-guest
Date: 2011-08-02 11:29:51 +0000 (Tue, 02 Aug 2011)
New Revision: 3042
Modified:
packages/opencpn/trunk/debian/changelog
packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch
packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
Log:
Packaged for upstream version 2.5.0
Modified: packages/opencpn/trunk/debian/changelog
===================================================================
--- packages/opencpn/trunk/debian/changelog 2011-07-20 11:27:53 UTC (rev 3041)
+++ packages/opencpn/trunk/debian/changelog 2011-08-02 11:29:51 UTC (rev 3042)
@@ -1,11 +1,17 @@
-opencpn (2.4.708+dfsg-1) unstable; urgency=low
+opencpn (2.5.0-1) unstable; urgency=low
+ * Packaged for upstream version 2.5.0
+ * Drop most of TinyXML patch (superseded by upstream)
+ * Closing ITP. (Closes: #538067)
+
+ -- Hamish B <hamish_b at yahoo.com> Tue, 02 Aug 2011 22:36:56 +1200
+
+opencpn (2.4.708-0) unstable; urgency=low
+
[ Anton Martchukov ]
* 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)
[ Hamish B ]
* FindTinyXML.cmake now included by upstream
Modified: packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch 2011-07-20 11:27:53 UTC (rev 3041)
+++ packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch 2011-08-02 11:29:51 UTC (rev 3042)
@@ -2,8 +2,8 @@
Author: Hamish B <hamish_b yahoo com>
Index: opencpn/src/about.cpp
===================================================================
---- opencpn.orig/src/about.cpp 2011-06-20 20:53:28.910938614 +1200
-+++ opencpn/src/about.cpp 2011-06-20 20:53:34.422923130 +1200
+--- opencpn.orig/src/about.cpp 2011-08-02 22:59:00.202915243 +1200
++++ opencpn/src/about.cpp 2011-08-02 22:59:00.210927964 +1200
@@ -452,7 +452,8 @@
wxString def_lang_canonical = wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT)->CanonicalName;
Modified: packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch 2011-07-20 11:27:53 UTC (rev 3041)
+++ packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch 2011-08-02 11:29:51 UTC (rev 3042)
@@ -1,52 +1,16 @@
Description: Use system's copy of the TinyXML library
Author: Hamish B <hamish_b yahoo com>
-Index: opencpn/CMakeLists.txt
+Index: opencpn/include/gpxdocument.h
===================================================================
---- 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)
+--- opencpn.orig/include/gpxdocument.h 2011-08-02 23:09:19.967165256 +1200
++++ opencpn/include/gpxdocument.h 2011-08-02 23:09:48.359953077 +1200
+@@ -29,7 +29,9 @@
- # For convenience we define the sources as a variable. You can add
-@@ -276,7 +277,6 @@
- include/ais.h
- include/pluginmanager.h
- include/ocpn_plugin.h
-- include/tinystr.h
- include/gpxdocument.h
- )
-
-@@ -303,7 +303,6 @@
- src/about.cpp
- src/ais.cpp
- src/pluginmanager.cpp
-- src/tinystr.cpp
- src/gpxdocument.cpp
- )
-
-@@ -670,6 +669,7 @@
- ${GETTEXT_LIBRARY}
- ${BZIP2_LIBRARIES}
- ${ZLIB_LIBRARY}
-+ ${TINYXML_LIBRARIES}
- )
-
- IF(TINYXML_FOUND)
-Index: opencpn-2.4.708/include/gpxdocument.h
-===================================================================
---- 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>
#include <tinyxml.h>
--#include <tinystr.h>
++#ifndef TIXML_USE_STL
+ #include <tinystr.h>
++#endif
#include <stdio.h>
const wxString GpxxColorNames[] = { _("Black"), _("DarkRed"), _("DarkGreen"), _("DarkYellow"), _("DarkBlue"), _("DarkMagenta"), _("DarkCyan"), _("LightGray"), _("DarkGray"), _("Red"), _("Green"), _("Yellow"), _("Blue"), _("Magenta"), _("Cyan"), _("White") };//The last color defined by Garmin is transparent - we ignore it
Modified: packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch 2011-07-20 11:27:53 UTC (rev 3041)
+++ packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch 2011-08-02 11:29:51 UTC (rev 3042)
@@ -4,9 +4,9 @@
Author: Hamish B <hamish_b yahoo com>
Index: opencpn/src/chart1.cpp
===================================================================
---- opencpn.orig/src/chart1.cpp 2011-06-29 21:34:10.275910232 +1200
-+++ opencpn/src/chart1.cpp 2011-06-29 21:51:42.763171105 +1200
-@@ -2328,8 +2328,9 @@
+--- opencpn.orig/src/chart1.cpp 2011-08-02 22:27:50.202928736 +1200
++++ opencpn/src/chart1.cpp 2011-08-02 22:28:33.191166883 +1200
+@@ -2384,8 +2384,9 @@
// Establish the WorldVectorShoreline Dataset location
@@ -20,8 +20,8 @@
// Reload the config data, to pick up any missing data class configuration info
Index: opencpn/src/wvschart.cpp
===================================================================
---- opencpn.orig/src/wvschart.cpp 2011-06-29 21:34:10.323339524 +1200
-+++ opencpn/src/wvschart.cpp 2011-06-29 21:51:42.795910230 +1200
+--- opencpn.orig/src/wvschart.cpp 2011-08-02 22:27:50.206918980 +1200
++++ opencpn/src/wvschart.cpp 2011-08-02 22:28:33.195176364 +1200
@@ -50,7 +50,8 @@
{
pwvs_home_dir = new wxString(wvs_chart_home);
More information about the Pkg-grass-devel
mailing list