Author: hamish-guest
Date: 2011-07-01 03:38:47 +0000 (Fri, 01 Jul 2011)
New Revision: 3031
Modified:
packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch
packages/opencpn/trunk/debian/rules
Log:
TinyXML dep: tinystr.h is only required if TINYXML_USE_STL is disabled, but
libtinyxml2.5.3 defines it.
Modified: packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch 2011-06-30
02:57:47 UTC (rev 3030)
+++ packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch 2011-07-01
03:38:47 UTC (rev 3031)
@@ -2,8 +2,8 @@
Author: Hamish B <hamish_b yahoo com>
Index: opencpn/CMakeLists.txt
===================================================================
---- opencpn.orig/CMakeLists.txt 2011-06-30 14:40:47.014926145 +1200
-+++ opencpn/CMakeLists.txt 2011-06-30 14:42:57.935949014 +1200
+--- 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 @@
INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
FIND_PACKAGE(ZLIB REQUIRED)
@@ -13,25 +13,27 @@
ENDIF(UNIX)
# For convenience we define the sources as a variable. You can add
-@@ -224,7 +226,6 @@
+@@ -223,8 +225,6 @@
+ include/ais.h
include/pluginmanager.h
include/ocpn_plugin.h
- include/tinystr.h
+- include/tinystr.h
- include/tinyxml.h
include/gpxdocument.h
)
-@@ -251,9 +252,6 @@
+@@ -251,10 +251,6 @@
src/about.cpp
src/ais.cpp
src/pluginmanager.cpp
- src/tinyxml.cpp
- src/tinyxmlerror.cpp
- src/tinyxmlparser.cpp
- src/tinystr.cpp
+- src/tinystr.cpp
src/gpxdocument.cpp
)
-@@ -606,6 +604,7 @@
+
+@@ -606,6 +602,7 @@
${GETTEXT_LIBRARY}
${BZIP2_LIBRARIES}
${ZLIB_LIBRARY}
@@ -39,3 +41,15 @@
)
ENDIF(UNIX)
+Index: opencpn/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
+@@ -29,7 +29,6 @@
+
+ #include <wx/wx.h>
+ #include <tinyxml.h>
+-#include <tinystr.h>
+ #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/rules
===================================================================
--- packages/opencpn/trunk/debian/rules 2011-06-30 02:57:47 UTC (rev 3030)
+++ packages/opencpn/trunk/debian/rules 2011-07-01 03:38:47 UTC (rev 3031)
@@ -19,7 +19,9 @@
rm -rf $(CURDIR)/plugins/grib_pi/src/zlib-1.2.3/
rm -rf $(CURDIR)/plugins/grib_pi/src/bzip2/
rm -f $(CURDIR)/include/tinyxml.h
+ rm -f $(CURDIR)/include/tinystr.h
rm -f $(CURDIR)/src/tinyxml*.cpp
+ rm -f $(CURDIR)/src/tinystr.cpp
dh_auto_configure
override_dh_install:
_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
