r3030 - in packages/opencpn/trunk/debian: . patches

[hamish-guest at alioth.debian.org]

Author: hamish-guest
Date: 2011-06-30 02:57:47 +0000 (Thu, 30 Jun 2011)
New Revision: 3030

Added:
   packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch
Removed:
   packages/opencpn/trunk/debian/TODO
Modified:
   packages/opencpn/trunk/debian/changelog
   packages/opencpn/trunk/debian/patches/series
   packages/opencpn/trunk/debian/rules
Log:
Use system's TinyXML instead of embedded copy

Deleted: packages/opencpn/trunk/debian/TODO
===================================================================
--- packages/opencpn/trunk/debian/TODO	2011-06-30 02:06:22 UTC (rev 3029)
+++ packages/opencpn/trunk/debian/TODO	2011-06-30 02:57:47 UTC (rev 3030)
@@ -1,4 +0,0 @@
--Build-Depend on libtinyxml-dev and add any patches needed to build against the system version.
-  -at the start of the debian/rules file, rm unused embedded source files, rendering them unusable.
-
-

Modified: packages/opencpn/trunk/debian/changelog
===================================================================
--- packages/opencpn/trunk/debian/changelog	2011-06-30 02:06:22 UTC (rev 3029)
+++ packages/opencpn/trunk/debian/changelog	2011-06-30 02:57:47 UTC (rev 3030)
@@ -4,6 +4,7 @@
   * 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 <hamish_b at yahoo.com>  Wed, 29 Jun 2011 20:56:53 +1200

Modified: packages/opencpn/trunk/debian/patches/series
===================================================================
--- packages/opencpn/trunk/debian/patches/series	2011-06-30 02:06:22 UTC (rev 3029)
+++ packages/opencpn/trunk/debian/patches/series	2011-06-30 02:57:47 UTC (rev 3030)
@@ -1,3 +1,4 @@
 use_xtide_coastline.patch
 ref_debian_gpl2.patch
 ref_debian_doc_dir.patch
+use_pkg_tinyxml.patch

Added: packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch
===================================================================
--- packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch	                        (rev 0)
+++ packages/opencpn/trunk/debian/patches/use_pkg_tinyxml.patch	2011-06-30 02:57:47 UTC (rev 3030)
@@ -0,0 +1,41 @@
+Description: Use system's copy of the TinyXML library
+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
+@@ -126,6 +126,8 @@
+     INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR})
+     FIND_PACKAGE(ZLIB REQUIRED)
+     INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR})
++    FIND_PACKAGE(TinyXML REQUIRED)
++    INCLUDE_DIRECTORIES(${TINYXML_INCLUDE_DIR})
+ ENDIF(UNIX)
+ 
+ # For convenience we define the sources as a variable. You can add 
+@@ -224,7 +226,6 @@
+                 include/pluginmanager.h
+                 include/ocpn_plugin.h
+ 		include/tinystr.h
+-		include/tinyxml.h
+ 		include/gpxdocument.h
+ )
+ 
+@@ -251,9 +252,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 +604,7 @@
+       ${GETTEXT_LIBRARY}
+       ${BZIP2_LIBRARIES}
+       ${ZLIB_LIBRARY}
++      ${TINYXML_LIBRARIES}
+ )
+ ENDIF(UNIX)
+ 

Modified: packages/opencpn/trunk/debian/rules
===================================================================
--- packages/opencpn/trunk/debian/rules	2011-06-30 02:06:22 UTC (rev 3029)
+++ packages/opencpn/trunk/debian/rules	2011-06-30 02:57:47 UTC (rev 3030)
@@ -18,11 +18,8 @@
 	# Remove embedded stuff which will go unused
 	rm -rf $(CURDIR)/plugins/grib_pi/src/zlib-1.2.3/
 	rm -rf $(CURDIR)/plugins/grib_pi/src/bzip2/
-	# TODO:
-	#rm -f $(CURDIR)/include/tinyxml.h
-	#rm -f $(CURDIR)/include/tinystr.h
-	#rm -f $(CURDIR)/src/tinyxml*.cpp
-	#rm -f $(CURDIR)/src/tinystr.cpp
+	rm -f $(CURDIR)/include/tinyxml.h
+	rm -f $(CURDIR)/src/tinyxml*.cpp
 	dh_auto_configure
 
 override_dh_install: