Author: hamish-guest Date: 2011-05-26 08:53:03 +0000 (Thu, 26 May 2011) New Revision: 3001
Removed: packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch Modified: packages/opencpn/trunk/debian/changelog packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch packages/opencpn/trunk/debian/patches/series packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch Log: Packaged for upstream git beta version 2.4.523 Modified: packages/opencpn/trunk/debian/changelog =================================================================== --- packages/opencpn/trunk/debian/changelog 2011-05-24 13:10:54 UTC (rev 3000) +++ packages/opencpn/trunk/debian/changelog 2011-05-26 08:53:03 UTC (rev 3001) @@ -1,3 +1,10 @@ +opencpn (2.4.523-1) unstable; urgency=low + + * Packaged for upstream git beta version 2.4.523 + * Zlib patch merged upstream + + -- Hamish B <hamis...@yahoo.com> Tue, 24 May 2011 20:09:18 +1200 + opencpn (2.4.506-1) unstable; urgency=low * Packaged for upstream git beta version 2.4.506 Modified: packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch =================================================================== --- packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch 2011-05-24 13:10:54 UTC (rev 3000) +++ packages/opencpn/trunk/debian/patches/ref_debian_doc_dir.patch 2011-05-26 08:53:03 UTC (rev 3001) @@ -2,9 +2,9 @@ Author: Hamish B <hamish_b yahoo com> Index: opencpn/src/about.cpp =================================================================== ---- opencpn.orig/src/about.cpp 2011-04-21 01:00:16.956585284 +1200 -+++ opencpn/src/about.cpp 2011-04-21 01:01:57.900856458 +1200 -@@ -397,7 +397,8 @@ +--- opencpn.orig/src/about.cpp 2011-05-24 20:03:38.014938255 +1200 ++++ opencpn/src/about.cpp 2011-05-24 20:03:45.214915189 +1200 +@@ -449,7 +449,8 @@ wxString def_lang_canonical = wxLocale::GetLanguageInfo(wxLANGUAGE_DEFAULT)->CanonicalName; wxString help_locn = _T("doc/help_"); Deleted: packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch =================================================================== --- packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch 2011-05-24 13:10:54 UTC (rev 3000) +++ packages/opencpn/trunk/debian/patches/rm_embedded_zlib.patch 2011-05-26 08:53:03 UTC (rev 3001) @@ -1,66 +0,0 @@ -Description: Use system's zlib, bzip2 instead of embedded copy. -Origin: Pavel on the OpenCPN forum - http://www.cruisersforum.com/forums/f134/opencpn-build-on-debian-35977-8.html#post667326 -Author: Hamish B <hamish_b yahoo com> -Index: opencpn/plugins/grib_pi/CMakeLists.txt -=================================================================== ---- opencpn.orig/plugins/grib_pi/CMakeLists.txt 2011-04-15 23:21:38.285860737 +1200 -+++ opencpn/plugins/grib_pi/CMakeLists.txt 2011-04-16 03:22:20.561110795 +1200 -@@ -78,7 +78,12 @@ - src/GribReader.cpp - src/GribRecord.cpp - src/zuFile.cpp -- src/IsoLine.cpp -+ src/IsoLine.cpp -+) -+ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_GRIB}) -+ -+IF(NOT UNIX) -+ SET(SRC_BZIP - src/bzip2/bzlib.c - src/bzip2/blocksort.c - src/bzip2/compress.c -@@ -86,11 +91,12 @@ - src/bzip2/decompress.c - src/bzip2/huffman.c - src/bzip2/randtable.c -- ) --ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_GRIB}) -+ ) -+ ADD_LIBRARY(${PACKAGE_NAME} SHARED ${SRC_BZIP}) - --INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/zlib-1.2.3) --INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/bzip2) -+ INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/zlib-1.2.3) -+ INCLUDE_DIRECTORIES(${PLUGIN_SOURCE_DIR}/src/bzip2) -+ENDIF(NOT UNIX) - - IF(WIN32) - SET(OPENCPN_IMPORT_LIB "../../${CMAKE_CFG_INTDIR}/${PARENT}") -Index: opencpn/CMakeLists.txt -=================================================================== ---- opencpn.orig/CMakeLists.txt 2011-04-16 02:55:53.636598695 +1200 -+++ opencpn/CMakeLists.txt 2011-04-16 03:21:52.989110463 +1200 -@@ -111,6 +111,13 @@ - - FIND_PACKAGE(Gettext REQUIRED) - -+IF(UNIX) -+ FIND_PACKAGE(BZip2 REQUIRED) -+ INCLUDE_DIRECTORIES(${BZIP2_INCLUDE_DIR}) -+ FIND_PACKAGE(ZLIB REQUIRED) -+ INCLUDE_DIRECTORIES(${ZLIB_INCLUDE_DIR}) -+ENDIF(UNIX) -+ - # For convenience we define the sources as a variable. You can add - # header files and cpp/c files and CMake will sort them out - -@@ -500,6 +507,8 @@ - TARGET_LINK_LIBRARIES(${PACKAGE_NAME} - ${OPENGL_LIBRARIES} - ${GETTEXT_LIBRARY} -+ ${BZIP2_LIBRARIES} -+ ${ZLIB_LIBRARY} - ) - ENDIF(UNIX) - Modified: packages/opencpn/trunk/debian/patches/series =================================================================== --- packages/opencpn/trunk/debian/patches/series 2011-05-24 13:10:54 UTC (rev 3000) +++ packages/opencpn/trunk/debian/patches/series 2011-05-26 08:53:03 UTC (rev 3001) @@ -1,5 +1,4 @@ fix-plugin-path.patch -rm_embedded_zlib.patch use_xtide_coastline.patch ref_debian_gpl2.patch ref_debian_doc_dir.patch Modified: packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch =================================================================== --- packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch 2011-05-24 13:10:54 UTC (rev 3000) +++ packages/opencpn/trunk/debian/patches/use_xtide_coastline.patch 2011-05-26 08:53:03 UTC (rev 3001) @@ -4,9 +4,9 @@ Author: Hamish B <hamish_b yahoo com> Index: opencpn/src/chart1.cpp =================================================================== ---- opencpn.orig/src/chart1.cpp 2011-04-21 00:09:08.208588848 +1200 -+++ opencpn/src/chart1.cpp 2011-04-21 00:11:15.816860473 +1200 -@@ -1401,8 +1401,9 @@ +--- opencpn.orig/src/chart1.cpp 2011-05-24 19:46:54.491952983 +1200 ++++ opencpn/src/chart1.cpp 2011-05-24 19:59:59.886929260 +1200 +@@ -2205,8 +2205,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-04-21 00:12:26.016601391 +1200 -+++ opencpn/src/wvschart.cpp 2011-04-21 00:13:13.188610696 +1200 +--- opencpn.orig/src/wvschart.cpp 2011-05-24 19:46:54.516175613 +1200 ++++ opencpn/src/wvschart.cpp 2011-05-24 19:59:59.898963894 +1200 @@ -52,7 +52,8 @@ { pwvs_home_dir = new wxString(wvs_chart_home); _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel