Author: frankie Date: 2007-10-31 14:32:51 +0000 (Wed, 31 Oct 2007) New Revision: 1250
Modified: packages/qgis/trunk/debian/changelog packages/qgis/trunk/debian/patches/00list packages/qgis/trunk/debian/patches/cmake.dpatch packages/qgis/trunk/debian/qgis.install Log: Initial fixes Modified: packages/qgis/trunk/debian/changelog =================================================================== --- packages/qgis/trunk/debian/changelog 2007-10-31 12:28:28 UTC (rev 1249) +++ packages/qgis/trunk/debian/changelog 2007-10-31 14:32:51 UTC (rev 1250) @@ -4,8 +4,9 @@ * New upstream release. This is the first version with a true python-enabled support. * Changed deprecated ${Source-Version} in ${binary:Version}. * Fixed lintian error: debian-rules-ignores-make-clean-error. + * Unapply all previous patches - -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Wed, 17 Oct 2007 13:10:22 +0200 + -- Francesco Paolo Lovergine <[EMAIL PROTECTED]> Wed, 31 Oct 2007 13:44:25 +0100 qgis (0.8.1-2) unstable; urgency=medium Modified: packages/qgis/trunk/debian/patches/00list =================================================================== --- packages/qgis/trunk/debian/patches/00list 2007-10-31 12:28:28 UTC (rev 1249) +++ packages/qgis/trunk/debian/patches/00list 2007-10-31 14:32:51 UTC (rev 1250) @@ -1,4 +1,4 @@ -cmake -composer +#cmake +#composer #georef #grid_maker Modified: packages/qgis/trunk/debian/patches/cmake.dpatch =================================================================== --- packages/qgis/trunk/debian/patches/cmake.dpatch 2007-10-31 12:28:28 UTC (rev 1249) +++ packages/qgis/trunk/debian/patches/cmake.dpatch 2007-10-31 14:32:51 UTC (rev 1250) @@ -5,196 +5,3 @@ ## DP: No description. @DPATCH@ -diff -urNad qgis~/CMakeLists.txt qgis/CMakeLists.txt ---- qgis~/CMakeLists.txt 2007-06-28 13:35:49.000000000 +0200 -+++ qgis/CMakeLists.txt 2007-06-29 15:26:22.000000000 +0200 -@@ -21,7 +21,7 @@ - # it's possible to set PLUGINS_ALSO_BINARIES to TRUE - # then some plugins that can run as standalone apps will be built - # also as standalone apps --SET (PLUGINS_ALSO_BINARIES FALSE) -+SET (PLUGINS_ALSO_BINARIES FALSE) - - - # try to configure and build GRASS plugin by default -diff -urNad qgis~/cmake/FindGDAL.cmake qgis/cmake/FindGDAL.cmake ---- qgis~/cmake/FindGDAL.cmake 2007-06-28 13:29:53.000000000 +0200 -+++ qgis/cmake/FindGDAL.cmake 2007-06-29 15:26:07.000000000 +0200 -@@ -37,7 +37,7 @@ - EXEC_PROGRAM(${GDAL_CONFIG} - ARGS --prefix - OUTPUT_VARIABLE GDAL_PREFIX) -- SET(GDAL_INCLUDE_DIR ${GDAL_PREFIX}/include CACHE STRING INTERNAL) -+ SET(GDAL_INCLUDE_DIR ${GDAL_PREFIX}/include/gdal CACHE STRING INTERNAL) - - ## extract link dirs for rpath - EXEC_PROGRAM(${GDAL_CONFIG} -diff -urNad qgis~/src/plugins/grid_maker/CMakeLists.txt qgis/src/plugins/grid_maker/CMakeLists.txt ---- qgis~/src/plugins/grid_maker/CMakeLists.txt 2007-06-28 13:31:56.000000000 +0200 -+++ qgis/src/plugins/grid_maker/CMakeLists.txt 2007-06-29 15:26:07.000000000 +0200 -@@ -1,82 +1,83 @@ -- --######################################################## --# Files -- --SET (GRID_COMMON_SRCS -- plugingui.cpp -- graticulecreator.cpp -- utils.c -- shpopen.c -- dbfopen.c --) -- --SET (GRID_SRCS -- plugin.cpp -- ${GRID_COMMON_SRCS} --) -- --SET (GRID_BINARY_SRCS -- main.cpp -- ${GRID_COMMON_SRCS} --) -- --SET (GRID_UIS pluginguibase.ui) -- --SET (GRID_COMMON_MOC_HDRS plugingui.h) -- --SET (GRID_MOC_HDRS plugin.h) -- --SET (GRID_RCCS gridmaker_plugin.qrc) -- --######################################################## --# Build -- --QT4_WRAP_UI (GRID_UIS_H ${GRID_UIS}) -- --QT4_WRAP_CPP (GRID_COMMON_MOC_SRCS ${GRID_COMMON_MOC_HDRS}) -- --QT4_WRAP_CPP (GRID_MOC_SRCS ${GRID_MOC_HDRS}) -- --QT4_ADD_RESOURCES(GRID_RCC_SRCS ${GRID_RCCS}) -- --ADD_LIBRARY (gridmakerplugin MODULE ${GRID_SRCS} ${GRID_MOC_SRCS} ${GRID_COMMON_MOC_SRCS} ${GRID_RCC_SRCS} ${GRID_UIS_H}) -- --INCLUDE_DIRECTORIES( -- ${CMAKE_CURRENT_BINARY_DIR} -- ../../core ../../core/raster ../../core/renderer ../../core/symbology -- ../../gui -- ${CMAKE_CURRENT_BINARY_DIR}/../../ui -- .. -- ${GEOS_INCLUDE_DIR} -- ${PROJ_INCLUDE_DIR} -- ${GDAL_INCLUDE_DIR} --) -- --TARGET_LINK_LIBRARIES(gridmakerplugin -- ${QT_LIBRARIES} -- ${PROJ_LIBRARY} -- ${GDAL_LIBRARIES} -- qgis_core --) -- --IF (PLUGINS_ALSO_BINARIES) -- -- ADD_EXECUTABLE (gridmaker ${GRID_BINARY_SRCS} ${GRID_COMMON_MOC_SRCS} ${GRID_RCC_SRCS}) -- -- TARGET_LINK_LIBRARIES(gridmaker -- ${QT_LIBRARIES} -- qgis_core -- ) -- --ENDIF (PLUGINS_ALSO_BINARIES) -- --######################################################## --# Install -- --INSTALL(TARGETS gridmakerplugin -- RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} -- LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}) -- --IF (PLUGINS_ALSO_BINARIES) -- INSTALL(TARGETS gridmaker RUNTIME DESTINATION ${QGIS_BIN_DIR}) --ENDIF (PLUGINS_ALSO_BINARIES) -+ -+######################################################## -+# Files -+ -+SET (GRID_COMMON_SRCS -+ plugingui.cpp -+ graticulecreator.cpp -+ utils.c -+ shpopen.c -+ dbfopen.c -+) -+ -+SET (GRID_SRCS -+ plugin.cpp -+ ${GRID_COMMON_SRCS} -+) -+ -+SET (GRID_BINARY_SRCS -+ main.cpp -+ ${GRID_COMMON_SRCS} -+) -+ -+SET (GRID_UIS pluginguibase.ui) -+ -+SET (GRID_COMMON_MOC_HDRS plugingui.h) -+ -+SET (GRID_MOC_HDRS plugin.h) -+ -+SET (GRID_RCCS gridmaker_plugin.qrc) -+ -+######################################################## -+# Build -+ -+QT4_WRAP_UI (GRID_UIS_H ${GRID_UIS}) -+ -+QT4_WRAP_CPP (GRID_COMMON_MOC_SRCS ${GRID_COMMON_MOC_HDRS}) -+ -+QT4_WRAP_CPP (GRID_MOC_SRCS ${GRID_MOC_HDRS}) -+ -+QT4_ADD_RESOURCES(GRID_RCC_SRCS ${GRID_RCCS}) -+ -+ADD_LIBRARY (gridmakerplugin MODULE ${GRID_SRCS} ${GRID_MOC_SRCS} ${GRID_COMMON_MOC_SRCS} ${GRID_RCC_SRCS} ${GRID_UIS_H}) -+ -+INCLUDE_DIRECTORIES( -+ ${CMAKE_CURRENT_BINARY_DIR} -+ ../../core ../../core/raster ../../core/renderer ../../core/symbology -+ ../../gui -+ ../../ui -+ ${CMAKE_CURRENT_BINARY_DIR}/../../ui -+ .. -+ ${GEOS_INCLUDE_DIR} -+ ${PROJ_INCLUDE_DIR} -+ ${GDAL_INCLUDE_DIR} -+) -+ -+TARGET_LINK_LIBRARIES(gridmakerplugin -+ ${QT_LIBRARIES} -+ ${PROJ_LIBRARY} -+ ${GDAL_LIBRARIES} -+ qgis_core -+) -+ -+IF (PLUGINS_ALSO_BINARIES) -+ -+ ADD_EXECUTABLE (gridmaker ${GRID_BINARY_SRCS} ${GRID_COMMON_MOC_SRCS} ${GRID_RCC_SRCS}) -+ -+ TARGET_LINK_LIBRARIES(gridmaker -+ ${QT_LIBRARIES} -+ qgis_core -+ ) -+ -+ENDIF (PLUGINS_ALSO_BINARIES) -+ -+######################################################## -+# Install -+ -+INSTALL(TARGETS gridmakerplugin -+ RUNTIME DESTINATION ${QGIS_PLUGIN_DIR} -+ LIBRARY DESTINATION ${QGIS_PLUGIN_DIR}) -+ -+IF (PLUGINS_ALSO_BINARIES) -+ INSTALL(TARGETS gridmaker RUNTIME DESTINATION ${QGIS_BIN_DIR}) -+ENDIF (PLUGINS_ALSO_BINARIES) Modified: packages/qgis/trunk/debian/qgis.install =================================================================== --- packages/qgis/trunk/debian/qgis.install 2007-10-31 12:28:28 UTC (rev 1249) +++ packages/qgis/trunk/debian/qgis.install 2007-10-31 14:32:51 UTC (rev 1250) @@ -9,7 +9,7 @@ usr/lib/qgis/libgpsimporterplugin.so usr/lib/qgis/libgpxprovider.so usr/lib/qgis/libgridmakerplugin.so -usr/lib/qgis/liblauncherplugin.so +#usr/lib/qgis/liblauncherplugin.so usr/lib/qgis/libnortharrowplugin.so usr/lib/qgis/libogrprovider.so usr/lib/qgis/libpggeoprocessingplugin.so _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel