summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorPietro Cerutti <gahr@FreeBSD.org>2014-04-22 11:41:18 +0000
committerPietro Cerutti <gahr@FreeBSD.org>2014-04-22 11:41:18 +0000
commit942f0dee50939a4f2b171a58013019eb8c0e1b96 (patch)
treef5792b4ec5e6e0610a36b600e4b83b235f74f65a
parent- Fix CONFLICTS to silence portlint warnings (diff)
graphics/tulip -- depend on graphics/png
Notes
Notes: svn path=/head/; revision=351810
-rw-r--r--graphics/tulip/Makefile59
-rw-r--r--graphics/tulip/distinfo6
-rw-r--r--graphics/tulip/files/patch-CMakeLists.txt26
-rw-r--r--graphics/tulip/files/patch-UseTulip.cmake49
-rw-r--r--graphics/tulip/files/patch-dirent15
-rw-r--r--graphics/tulip/files/patch-library-tulip-include-tulip_ConsoleUtils.h11
-rw-r--r--graphics/tulip/files/patch-library-tulip-src_CMakeLists.txt11
-rw-r--r--graphics/tulip/files/patch-opengl81
-rw-r--r--graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp11
-rw-r--r--graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt13
-rw-r--r--graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp43
-rw-r--r--graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp15
-rw-r--r--graphics/tulip/files/patch-software-crash_handling_StackWalker.h11
-rw-r--r--graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h11
-rw-r--r--graphics/tulip/files/patch-software-tulip-src_main.cpp12
-rw-r--r--graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp12
-rw-r--r--graphics/tulip/files/patch-thirdparty-OGDF-ogdf-basic_basic.h11
-rw-r--r--graphics/tulip/files/patch-thirdparty-OGDF-src-basic_System.cpp83
-rw-r--r--graphics/tulip/files/patch-thirdparty-ftgl-CMakeLists.txt10
-rw-r--r--graphics/tulip/files/patch-thirdparty_CMakeLists.txt11
-rw-r--r--graphics/tulip/pkg-plist680
21 files changed, 524 insertions, 657 deletions
diff --git a/graphics/tulip/Makefile b/graphics/tulip/Makefile
index 68907dc0437b..2b11c8f4aafd 100644
--- a/graphics/tulip/Makefile
+++ b/graphics/tulip/Makefile
@@ -2,53 +2,50 @@
# $FreeBSD$
PORTNAME= tulip
-PORTVERSION= 3.8.0
-PORTREVISION= 3
+PORTVERSION= 4.5.0
CATEGORIES= graphics
MASTER_SITES= SF/auber/${PORTNAME}/${PORTNAME}-${PORTVERSION}
-DISTFILES= ${DISTNAME}-src${EXTRACT_SUFX}
+DISTNAME= ${PORTNAME}-${PORTVERSION}_src
MAINTAINER= gahr@FreeBSD.org
-COMMENT= A system dedicated to the visualization of huge graphs
+COMMENT= System dedicated to the visualization of huge graphs
-LIB_DEPENDS= libfreetype.so:${PORTSDIR}/print/freetype2 \
- gzstream.0:${PORTSDIR}/devel/gzstream \
- ftgl.2:${PORTSDIR}/graphics/ftgl \
- qscintilla2:${PORTSDIR}/devel/qscintilla2 \
- jpeg.11:${PORTSDIR}/graphics/jpeg
+OPTIONS_DEFINE= DOCS
-USE_QT4= corelib moc_build uic_build rcc_build gui opengl xml network qmake_build \
- designer assistant assistantclient
+LIB_DEPENDS= libexecinfo.so:${PORTSDIR}/devel/libexecinfo \
+ libQxtCore.so:${PORTSDIR}/devel/libqxt \
+ libOGDF.so:${PORTSDIR}/math/ogdf \
+ libpng.so:${PORTSDIR}/graphics/png
+
+USES= cmake:outsource compiler:c++11-lib shebangfix dos2unix
+SHEBANG_FILES= tulip-config.in
+DOS2UNIX_FILES= software/tulip/src/main.cpp
+USE_CXXSTD= c++11
USE_GL= glew glut
USE_GNOME= libxml2
USE_PYTHON= yes
-USES= cmake:outsource
-CMAKE_ARGS+= -DLOCALBASE:PATH=${LOCALBASE} \
- -DPYTHON_INCLUDEDIR:PATH=${PYTHON_INCLUDEDIR}
-USE_LDCONFIG= ${PREFIX}/lib/tlp
+USE_QT4= corelib moc_build uic_build rcc_build gui opengl xml network qmake_build \
+ designer assistant assistantclient
+CXXFLAGS+= -fPIC -I${LOCALBASE}/include -DNDEBUG -g -O0
+LDFLAGS+= -L${LOCALBASE}/lib
+CMAKE_ARGS+= -DPYTHON_INCLUDEDIR:PATH=${PYTHON_INCLUDEDIR} \
+ -DLOCALBASE:PATH=${LOCALBASE} \
+ -DOGDFLibrary=${LOCALBASE}/lib/libOGDF.so \
+ -DOGDFInclude=${LOCALBASE}/include
+USE_LDCONFIG= ${PREFIX}/lib/tulip
-WRKSRC= ${WRKDIR}/${DISTNAME}-src
+WRKSRC= ${WRKDIR}/${PORTNAME}
PLIST_SUB+= TULIP_VERSION=${PORTVERSION} \
TULIP_VERS=${PORTVERSION:R}
-NO_STAGE= yes
-.include <bsd.port.pre.mk>
-
-.if ${ARCH} == "amd64" || ${ARCH} == "ia64"
-CFLAGS+= -fPIC
-.endif
-
-.if ${OSVERSION} < 800000
-BROKEN= does not compile on FreeBSD 7.X
-.endif
+.include <bsd.port.options.mk>
-.if !defined(NOPORTDOCS)
-DISTFILES+= ${PORTNAME}-${PORTVERSION}-html.tar.bz2
+.if ${PORT_OPTIONS:MDOCS}
PORTDOCS= *
post-install:
- ${INSTALL} -d ${DOCSDIR}
- (cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}-html && ${COPYTREE_SHARE} \* ${DOCSDIR})
+ ${INSTALL} -d ${STAGEDIR}${DOCSDIR}
+ (cd ${WRKDIR}/${PORTNAME}-${PORTVERSION}-html && ${COPYTREE_SHARE} \* ${STAGEDIR}${DOCSDIR})
.endif
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/tulip/distinfo b/graphics/tulip/distinfo
index e8aa87187aeb..8bdbeb1727bb 100644
--- a/graphics/tulip/distinfo
+++ b/graphics/tulip/distinfo
@@ -1,4 +1,2 @@
-SHA256 (tulip-3.8.0-src.tar.gz) = 2b938ec1894b81bdd798d04d172a853dbd99b8660895c1dc3e8e2019fb1e42d4
-SIZE (tulip-3.8.0-src.tar.gz) = 23052697
-SHA256 (tulip-3.8.0-html.tar.bz2) = fcc9d7db32cb4d8a0c4f27693bae54a5c5482ca513d652effcbae21687ea75a0
-SIZE (tulip-3.8.0-html.tar.bz2) = 48553953
+SHA256 (tulip-4.5.0_src.tar.gz) = b3c776e2f029765749b93ea0b396faea7922341d2b57fc83024d21a1df5abfa5
+SIZE (tulip-4.5.0_src.tar.gz) = 78391448
diff --git a/graphics/tulip/files/patch-CMakeLists.txt b/graphics/tulip/files/patch-CMakeLists.txt
deleted file mode 100644
index 65c865621971..000000000000
--- a/graphics/tulip/files/patch-CMakeLists.txt
+++ /dev/null
@@ -1,26 +0,0 @@
---- CMakeLists.txt.orig 2012-06-13 09:46:31.000000000 +0200
-+++ CMakeLists.txt 2012-06-13 09:49:10.000000000 +0200
-@@ -277,8 +277,8 @@
- SET(TulipBitmapInstallDir ${TulipShareInstallDir}/bitmaps)
- SET(TulipAppleResourcesDir ${TulipAppleContentsDir}/Resources)
- ELSE()
--SET(TulipLibInstallDir lib)
--SET(TulipPluginsInstallDir ${TulipLibInstallDir}/tulip)
-+SET(TulipLibInstallDir lib/tlp)
-+SET(TulipPluginsInstallDir ${TulipLibInstallDir})
- SET(TulipBinInstallDir bin)
- SET(TulipIncludeInstallDir include)
- SET(TulipShareInstallDir share/tulip)
-@@ -409,6 +409,12 @@
- STRING(COMPARE EQUAL "${UNAME_OUT}" "ia64" I64)
- ENDIF(NOT I64)
- IF(NOT I64)
-+ STRING(COMPARE EQUAL "${UNAME_OUT}" "amd64" I64)
-+ENDIF(NOT I64)
-+IF(NOT I64)
-+ STRING(COMPARE EQUAL "${UNAME_OUT}" "sparc64" I64)
-+ENDIF(NOT I64)
-+IF(NOT I64)
- STRING(COMPARE EQUAL "${UNAME_OUT}" "Power Macintosh" MACPPC)
- ENDIF(NOT I64)
- IF(I64)
diff --git a/graphics/tulip/files/patch-UseTulip.cmake b/graphics/tulip/files/patch-UseTulip.cmake
deleted file mode 100644
index 902d0759a462..000000000000
--- a/graphics/tulip/files/patch-UseTulip.cmake
+++ /dev/null
@@ -1,49 +0,0 @@
-CMake 2.8.12 fix.
-
-http://cmake.org/gitweb?p=cmake.git;a=commitdiff;h=9ce60ff509c4ff27fe861fc5b2080f50897a68c4
-changed the arguments of the internal macros QT4_EXTRACT_OPTIONS and
-QT4_CREATE_MOC_COMMAND which the port uses directly, so we have to adapt.
-
-Tulip 4.x should not have this problem, as it removed its QT4_* macro wrappers.
---- UseTulip.cmake.orig 2012-06-11 10:46:14.000000000 +0300
-+++ UseTulip.cmake 2013-11-03 19:16:59.000000000 +0200
-@@ -1,5 +1,5 @@
- MACRO (TULIP_QT4_WRAP_UI outfiles )
-- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
-+ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN})
- FOREACH (it ${ui_files})
- GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
- GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-@@ -13,7 +13,7 @@
- ENDMACRO (TULIP_QT4_WRAP_UI)
-
- MACRO (TULIP_QT4_WRAP_UI_IN_INCLUDE outfiles )
-- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
-+ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN})
- FOREACH (it ${ui_files})
- GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
- GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-@@ -27,7 +27,7 @@
- ENDMACRO (TULIP_QT4_WRAP_UI_IN_INCLUDE)
-
- MACRO (TULIP_QT4_WRAP_UI_IN_INCLUDE_TULIP outfiles )
-- QT4_EXTRACT_OPTIONS(ui_files ui_options ${ARGN})
-+ QT4_EXTRACT_OPTIONS(ui_files ui_options ui_target ${ARGN})
- FOREACH (it ${ui_files})
- GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
- GET_FILENAME_COMPONENT(infile ${it} ABSOLUTE)
-@@ -42,12 +42,12 @@
-
- MACRO (TULIP_QT4_WRAP_CPP outfiles )
- QT4_GET_MOC_FLAGS(moc_flags)
-- QT4_EXTRACT_OPTIONS(moc_files moc_options ${ARGN})
-+ QT4_EXTRACT_OPTIONS(moc_files moc_options moc_target ${ARGN})
- FOREACH (it ${moc_files})
- GET_FILENAME_COMPONENT(outfile ${it} NAME_WE)
- GET_FILENAME_COMPONENT(it ${it} ABSOLUTE)
- SET(outfile ${CMAKE_CURRENT_BINARY_DIR}/moc_${outfile}.cpp)
-- QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}")
-+ QT4_CREATE_MOC_COMMAND(${it} ${outfile} "${moc_flags}" "${moc_options}" "${moc_target}")
- SET(${outfiles} ${${outfiles}} ${outfile})
- ENDFOREACH(it)
- ENDMACRO (TULIP_QT4_WRAP_CPP)
diff --git a/graphics/tulip/files/patch-dirent b/graphics/tulip/files/patch-dirent
index 7e59b11a6f9b..c489f8c11373 100644
--- a/graphics/tulip/files/patch-dirent
+++ b/graphics/tulip/files/patch-dirent
@@ -1,6 +1,6 @@
---- library/tulip/src/PluginLibraryLoader.cpp.orig 2012-06-11 09:46:14.000000000 +0200
-+++ library/tulip/src/PluginLibraryLoader.cpp 2012-06-13 09:50:05.000000000 +0200
-@@ -191,7 +191,14 @@
+--- library/tulip-core/src/PluginLibraryLoader.cpp.orig 2014-03-25 10:10:30.000000000 +0100
++++ library/tulip-core/src/PluginLibraryLoader.cpp 2014-04-01 13:50:00.000000000 +0200
+@@ -130,7 +130,14 @@
}
// accepts only file whose name matches *.so or *.dylib
@@ -15,12 +15,3 @@
#if !defined(__APPLE__)
const char *suffix = ".so";
const unsigned long suffix_len = 3;
-@@ -216,7 +223,7 @@
- struct dirent **namelist;
- n = scandir((const char *) _pluginPath.c_str(),
- &namelist,
--#if !(defined(__APPLE__) || defined(__FreeBSD__))
-+#if !defined(__APPLE__)
- (int (*) (const dirent *))
- #endif
- __tulip_select_libs,
diff --git a/graphics/tulip/files/patch-library-tulip-include-tulip_ConsoleUtils.h b/graphics/tulip/files/patch-library-tulip-include-tulip_ConsoleUtils.h
deleted file mode 100644
index 7cfad6b8b119..000000000000
--- a/graphics/tulip/files/patch-library-tulip-include-tulip_ConsoleUtils.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- library/tulip/include/tulip/ConsoleUtils.h.orig 2012-02-24 08:48:00.000000000 +0100
-+++ library/tulip/include/tulip/ConsoleUtils.h 2012-02-24 11:18:11.000000000 +0100
-@@ -31,7 +31,7 @@
- #include <io.h>
- #endif
-
--#if defined(__linux) || defined(__APPLE__)
-+#if defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__)
-
- #include <termios.h>
- #include <sys/ioctl.h>
diff --git a/graphics/tulip/files/patch-library-tulip-src_CMakeLists.txt b/graphics/tulip/files/patch-library-tulip-src_CMakeLists.txt
deleted file mode 100644
index 18dd1ce4801b..000000000000
--- a/graphics/tulip/files/patch-library-tulip-src_CMakeLists.txt
+++ /dev/null
@@ -1,11 +0,0 @@
---- library/tulip/src/CMakeLists.txt.orig 2012-02-23 14:11:43.000000000 +0100
-+++ library/tulip/src/CMakeLists.txt 2012-02-23 14:11:49.000000000 +0100
-@@ -86,8 +86,6 @@
- SET_TARGET_PROPERTIES(${LibTulipName} PROPERTIES LINK_FLAGS " /NODEFAULTLIB:LIBCMT.lib ")
- ENDIF()
- ENDIF()
--ELSE(WIN32)
-- TARGET_LINK_LIBRARIES(${LibTulipName} dl)
- ENDIF(WIN32)
-
- INSTALL(TARGETS ${LibTulipName}
diff --git a/graphics/tulip/files/patch-opengl b/graphics/tulip/files/patch-opengl
deleted file mode 100644
index 26440ffdaf89..000000000000
--- a/graphics/tulip/files/patch-opengl
+++ /dev/null
@@ -1,81 +0,0 @@
---- library/tulip-qt/src/CMakeLists.txt.orig 2012-06-13 09:54:25.000000000 +0200
-+++ library/tulip-qt/src/CMakeLists.txt 2012-06-13 09:54:41.000000000 +0200
-@@ -194,7 +194,7 @@
- ADD_DEFINITIONS(-DQT_DLL)
- ADD_DEFINITIONS(-DQT_THREAD_SUPPORT)
-
--INCLUDE_DIRECTORIES(../include/ ../include/tulip ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip)
-+INCLUDE_DIRECTORIES(../include/ ../include/tulip ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip ${OPENGL_INCLUDE_DIR})
- ADD_LIBRARY(${LibTulipQtName} SHARED ${tulip-qt_UI_SRCS} ${tulip-qt_MOC_SRCS} ${tulip-qt_RCC_SRCS} ${tulip-qt_LIB_SRCS})
- TARGET_LINK_LIBRARIES(${LibTulipQtName} ${GLEW_LIBRARY})
- TARGET_LINK_LIBRARIES(${LibTulipQtName} ${OPENGL_glu_LIBRARY})
---- software/tulip/src/CMakeLists.txt.orig 2012-02-22 16:57:38.000000000 +0100
-+++ software/tulip/src/CMakeLists.txt 2012-02-22 16:58:06.000000000 +0100
-@@ -33,7 +33,7 @@
- TULIP_QT4_WRAP_CPP(tulip_MOC_SRCS ${tulip_MOC} OPTIONS "-DQT_MINOR_REL=${QT_VERSION_MINOR}")
- QT4_ADD_RESOURCES(tulip_RCC_SRCS ${tulip_RCC})
-
--INCLUDE_DIRECTORIES(../include/ ${TulipBuildInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip ${PROJECT_BINARY_DIR}/software/tulip/include ${TulipInclude} ${TulipQtInclude} ${TulipOGLInclude} ${TulipPluginsManagerInclude})
-+INCLUDE_DIRECTORIES(../include/ ${TulipBuildInclude} ${TulipQtBuildInclude} ${PROJECT_BINARY_DIR}/library/tulip-qt/include/tulip ${PROJECT_BINARY_DIR}/software/tulip/include ${TulipInclude} ${TulipQtInclude} ${TulipOGLInclude} ${TulipPluginsManagerInclude} ${OPENGL_INCLUDE_DIR})
- INCLUDE_DIRECTORIES(${CMAKE_SOURCE_DIR}/software/crash_handling)
-
- SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_MINOR_REL=${QT_VERSION_MINOR}")
---- plugins/colors/CMakeLists.txt.orig 2011-08-04 11:14:55.000000000 +0200
-+++ plugins/colors/CMakeLists.txt 2011-08-04 11:15:05.000000000 +0200
-@@ -1,4 +1,4 @@
--INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${CMAKE_CURRENT_BINARY_DIR} .)
-+INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${CMAKE_CURRENT_BINARY_DIR} . ${OPENGL_INCLUDE_DIR})
-
- ##----------------------------------------------------------------------------------------------------------------------------
- SET(ColorMapping_SRCS
---- plugins/view/spreadsheet/CMakeLists.txt.orig 2011-08-04 11:53:35.000000000 +0200
-+++ plugins/view/spreadsheet/CMakeLists.txt 2011-08-04 11:53:48.000000000 +0200
-@@ -1,6 +1,6 @@
- INCLUDE("${PROJECT_SOURCE_DIR}/${TulipUseFile}")
-
--INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${CMAKE_CURRENT_BINARY_DIR} .)
-+INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${CMAKE_CURRENT_BINARY_DIR} . ${OPENGL_INCLUDE_DIR})
-
- SET(spreadsheet_LIB_SRCS
- SpreadView.cpp
---- plugins/view/pythonscriptview/CMakeLists.txt.orig 2012-02-22 16:59:26.000000000 +0100
-+++ plugins/view/pythonscriptview/CMakeLists.txt 2012-02-22 16:59:54.000000000 +0100
-@@ -6,7 +6,7 @@
- INCLUDE("${PROJECT_SOURCE_DIR}/${TulipUseFile}")
-
- # Force to use SIP headers located in thirdparty and not those installed in the system
--INCLUDE_DIRECTORIES(BEFORE ${SIP_INCLUDE_DIR})
-+INCLUDE_DIRECTORIES(BEFORE ${SIP_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
- INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${QT_INCLUDE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${CMAKE_CURRENT_SOURCE_DIR} ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH})
-
- SET(pythonscriptview_LIB_SRCS
---- plugins/interactor/CMakeLists.txt.orig 2011-08-04 12:22:38.000000000 +0200
-+++ plugins/interactor/CMakeLists.txt 2011-08-04 12:22:48.000000000 +0200
-@@ -1,4 +1,4 @@
--INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude})
-+INCLUDE_DIRECTORIES(${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${TulipQtInclude} ${OPENGL_INCLUDE_DIR})
-
- ##----------------------------------------------------------------------------------------------------------------------------
- SET(InteractorNavigation_SRCS
---- library/tulip-python/tulip-ogl/CMakeLists.txt.orig 2012-06-13 10:59:41.000000000 +0200
-+++ library/tulip-python/tulip-ogl/CMakeLists.txt 2012-06-13 11:00:08.000000000 +0200
-@@ -41,7 +41,7 @@
- # instead of those installed in the system
- INCLUDE_DIRECTORIES(BEFORE ${SIP_INCLUDE_DIR})
-
--INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${LIBXML2_INCLUDE_DIR})
-+INCLUDE_DIRECTORIES(${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${TulipInclude} ${TulipBuildInclude} ${TulipOGLInclude} ${LIBXML2_INCLUDE_DIR} ${OPENGL_INCLUDE_DIR})
-
- ADD_LIBRARY(${LibTulipOglPythonName} SHARED ${TULIPOGL_PYTHON_BINDINGS_SRC})
-
---- library/tulip-python/tulipgui/CMakeLists.txt.orig 2012-06-13 11:04:02.000000000 +0200
-+++ library/tulip-python/tulipgui/CMakeLists.txt 2012-06-13 11:04:21.000000000 +0200
-@@ -30,7 +30,7 @@
- # instead of those installed in the system
- INCLUDE_DIRECTORIES(BEFORE ${SIP_INCLUDE_DIR})
-
--INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}/QtOpenGL ${TulipInclude} ${TulipOGLInclude} ${TulipQtInclude} ${TulipQtBuildInclude} ${TulipBuildInclude})
-+INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR} ${CMAKE_CURRENT_BINARY_DIR} ${PYTHON_INCLUDE_DIR} ${PYTHON_INCLUDE_PATH} ${QT_INCLUDE_DIR} ${QT_INCLUDE_DIR}/QtOpenGL ${TulipInclude} ${TulipOGLInclude} ${TulipQtInclude} ${TulipQtBuildInclude} ${TulipBuildInclude} ${OPENGL_INCLUDE_DIR})
-
- ADD_LIBRARY(tulipgui SHARED ${TULIP_GUI_PYTHON_BINDINGS_SRC})
-
diff --git a/graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp b/graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp
new file mode 100644
index 000000000000..71fdaa4192cd
--- /dev/null
+++ b/graphics/tulip/files/patch-plugins-view-HistogramView_HistogramStatistics.cpp
@@ -0,0 +1,11 @@
+--- plugins/view/HistogramView/HistogramStatistics.cpp.orig 2014-04-18 12:05:56.000000000 +0200
++++ plugins/view/HistogramView/HistogramStatistics.cpp 2014-04-18 12:07:56.000000000 +0200
+@@ -30,7 +30,7 @@
+ #include "HistoStatsConfigWidget.h"
+ #include "HistogramView.h"
+
+-#if defined(_MSC_VER) || (defined(__clang_major__) && __clang_major__ > 4)
++#if defined(_MSC_VER) || (defined(__clang_major__) && __clang_major__ > 4) || defined(__FreeBSD__)
+
+ #include <functional>
+
diff --git a/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt b/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt
deleted file mode 100644
index dbef230d0e7d..000000000000
--- a/graphics/tulip/files/patch-software-crash_handling_CMakeLists.txt
+++ /dev/null
@@ -1,13 +0,0 @@
---- software/crash_handling/CMakeLists.txt.orig 2012-02-23 12:13:29.000000000 +0100
-+++ software/crash_handling/CMakeLists.txt 2012-02-23 12:13:58.000000000 +0100
-@@ -27,10 +27,6 @@
-
- ADD_LIBRARY(crash_handling STATIC ${LIB_SRCS})
-
--IF(UNIX)
-- TARGET_LINK_LIBRARIES(crash_handling dl)
--ENDIF(UNIX)
--
- IF(HAVE_BFD)
- TARGET_LINK_LIBRARIES(crash_handling bfd)
- ENDIF(HAVE_BFD)
diff --git a/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp b/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp
deleted file mode 100644
index 5e390354869c..000000000000
--- a/graphics/tulip/files/patch-software-crash_handling_CrashHandling.cpp
+++ /dev/null
@@ -1,43 +0,0 @@
---- ./software/crash_handling/CrashHandling.cpp.orig 2012-02-24 13:54:53.000000000 +0100
-+++ ./software/crash_handling/CrashHandling.cpp 2012-02-24 15:15:51.000000000 +0100
-@@ -31,11 +31,11 @@
- /*
- Linux/MacOS-specific handling
- */
--#if defined(__linux) || defined(__APPLE__)
-+#if defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__)
-
- #include "UnixSignalInterposer.h"
-
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__FreeBSD__)
- #include <sys/ucontext.h>
- #else
-
-@@ -54,7 +54,17 @@
-
- // Get the address at the time the signal was raised from the EIP (x86) or RIP (x86_64)
-
--#ifndef __APPLE__
-+#ifdef __FreeBSD__
-+
-+ ucontext_t * uc = reinterpret_cast<ucontext_t *>(ucontext);
-+#ifndef I64
-+ void *callerAddress = reinterpret_cast<void *>(uc->uc_mcontext.mc_eip);
-+#else
-+ void *callerAddress = reinterpret_cast<void *>(uc->uc_mcontext.mc_rip);
-+#endif
-+
-+#else
-+#ifndef (__APPLE__)
-
- sig_ucontext_t * uc = reinterpret_cast<sig_ucontext_t *>(ucontext);
- #ifdef I64
-@@ -73,6 +83,7 @@
- #endif
-
- #endif
-+#endif
-
- std::cerr << TLP_PLATEFORM_HEADER << " " << OS_PLATFORM << std::endl
- << TLP_ARCH_HEADER << " " << OS_ARCHITECTURE << std::endl
diff --git a/graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp b/graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp
deleted file mode 100644
index ff68635bbab5..000000000000
--- a/graphics/tulip/files/patch-software-crash_handling_StackWalker.cpp
+++ /dev/null
@@ -1,15 +0,0 @@
---- software/crash_handling/StackWalker.cpp.orig 2012-02-24 15:18:04.000000000 +0100
-+++ software/crash_handling/StackWalker.cpp 2012-02-24 15:23:54.000000000 +0100
-@@ -29,10 +29,10 @@
- printCallStack(std::cerr, maxDepth);
- }
-
--#if defined(__linux) || defined(__APPLE__)
-+#if defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__)
-
- #include <cxxabi.h>
--#ifndef __APPLE__
-+#if !defined(__APPLE__) && !defined(__FreeBSD__)
- #include <execinfo.h>
- #else
- #include <dlfcn.h>
diff --git a/graphics/tulip/files/patch-software-crash_handling_StackWalker.h b/graphics/tulip/files/patch-software-crash_handling_StackWalker.h
deleted file mode 100644
index 380cc1c282ac..000000000000
--- a/graphics/tulip/files/patch-software-crash_handling_StackWalker.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- software/crash_handling/StackWalker.h.orig 2012-02-24 15:16:55.000000000 +0100
-+++ software/crash_handling/StackWalker.h 2012-02-24 15:17:07.000000000 +0100
-@@ -83,7 +83,7 @@
-
- };
-
--#if defined(__linux) || defined(__APPLE__)
-+#if defined(__linux) || defined(__APPLE__) || defined(__FreeBSD__)
-
- #include <map>
-
diff --git a/graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h b/graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h
new file mode 100644
index 000000000000..75c5c7779678
--- /dev/null
+++ b/graphics/tulip/files/patch-software-tulip-include_TulipPerspectiveProcessHandler.h
@@ -0,0 +1,11 @@
+--- software/tulip/include/TulipPerspectiveProcessHandler.h.orig 2014-04-18 11:41:35.000000000 +0200
++++ software/tulip/include/TulipPerspectiveProcessHandler.h 2014-04-18 11:47:38.000000000 +0200
+@@ -27,6 +27,8 @@
+
+ #include <QTcpServer>
+
++#include <ctime>
++
+ // Some utility class used in crash handler dialog designer form
+
+ class SelectionButton: public QPushButton {
diff --git a/graphics/tulip/files/patch-software-tulip-src_main.cpp b/graphics/tulip/files/patch-software-tulip-src_main.cpp
new file mode 100644
index 000000000000..44e54e6071a5
--- /dev/null
+++ b/graphics/tulip/files/patch-software-tulip-src_main.cpp
@@ -0,0 +1,12 @@
+--- software/tulip/src/main.cpp.orig 2014-04-18 11:56:26.000000000 +0200
++++ software/tulip/src/main.cpp 2014-04-18 11:56:38.000000000 +0200
+@@ -119,7 +119,9 @@
+ }
+
+ int main(int argc, char **argv) {
++#ifndef __FreeBSD__
+ start_crash_handler();
++#endif
+
+
+
diff --git a/graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp b/graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp
new file mode 100644
index 000000000000..103a0d4c48b1
--- /dev/null
+++ b/graphics/tulip/files/patch-software-tulip_perspective-src_main.cpp
@@ -0,0 +1,12 @@
+--- software/tulip_perspective/src/main.cpp.orig 2014-04-18 11:58:12.000000000 +0200
++++ software/tulip_perspective/src/main.cpp 2014-04-18 11:58:27.000000000 +0200
+@@ -129,7 +129,9 @@
+ }
+
+ int main(int argc,char **argv) {
++#ifndef __FreeBSD__
+ start_crash_handler();
++#endif
+
+ QString appName("Tulip ");
+ QString iconPath;
diff --git a/graphics/tulip/files/patch-thirdparty-OGDF-ogdf-basic_basic.h b/graphics/tulip/files/patch-thirdparty-OGDF-ogdf-basic_basic.h
deleted file mode 100644
index 1671b2cca646..000000000000
--- a/graphics/tulip/files/patch-thirdparty-OGDF-ogdf-basic_basic.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- thirdparty/OGDF/ogdf/basic/basic.h.orig 2011-08-02 12:31:30.000000000 +0200
-+++ thirdparty/OGDF/ogdf/basic/basic.h 2011-08-02 12:31:51.000000000 +0200
-@@ -161,7 +161,7 @@
- #endif
-
- // Note: Apple OS X machines will be both OGDF_SYSTEM_UNIX and OGDF_SYSTEM_OSX
--#if defined(__APPLE__)
-+#if defined(__APPLE__) || defined(__FreeBSD__)
- #define OGDF_SYSTEM_OSX
- #endif
-
diff --git a/graphics/tulip/files/patch-thirdparty-OGDF-src-basic_System.cpp b/graphics/tulip/files/patch-thirdparty-OGDF-src-basic_System.cpp
deleted file mode 100644
index 62dcf694f39c..000000000000
--- a/graphics/tulip/files/patch-thirdparty-OGDF-src-basic_System.cpp
+++ /dev/null
@@ -1,83 +0,0 @@
---- thirdparty/OGDF/src/basic/System.cpp.orig 2012-06-11 09:46:14.000000000 +0200
-+++ thirdparty/OGDF/src/basic/System.cpp 2012-06-13 09:51:21.000000000 +0200
-@@ -51,6 +51,12 @@
- #include <mach/vm_statistics.h>
- #include <mach/mach.h>
- #include <mach/machine.h>
-+#elif defined(__FreeBSD__)
-+#include <stdlib.h>
-+#include <sys/types.h>
-+#include <sys/sysctl.h>
-+#include <sys/user.h>
-+#include <libutil.h>
- #elif defined(OGDF_SYSTEM_UNIX)
- #include <malloc.h>
- #endif
-@@ -310,6 +316,47 @@
- return 0;
- }
-
-+
-+#elif __FreeBSD__
-+
-+long long System::physicalMemory()
-+{
-+ unsigned long long value;
-+ size_t size = sizeof( value );
-+ if (sysctlbyname("hw.physmem", &value, &size, NULL, 0) !=-1)
-+ return value;
-+ else
-+ return 0;
-+}
-+
-+long long System::availablePhysicalMemory()
-+{
-+ unsigned long long pageSize, freePages, inactPages;
-+ long long result;
-+ size_t size = sizeof( pageSize );
-+ sysctlbyname("hw.pagesize", &pageSize, &size, NULL, 0);
-+ sysctlbyname("vm.stats.vm.v_free_count", &freePages, &size, NULL, 0);
-+ sysctlbyname("vm.stats.vm.v_inactive_count", &inactPages, &size, NULL, 0);
-+
-+ result = (unsigned long long)(freePages + inactPages) * pageSize;
-+ return result;
-+}
-+
-+
-+size_t System::memoryUsedByProcess()
-+{
-+#if __FreeBSD_version >= 900035
-+ int pid = getpid();
-+ struct kinfo_proc *kp;
-+
-+ if ((kp = kinfo_getproc(pid))) {
-+ return (kp->ki_size);
-+ }
-+#endif
-+
-+ return 0;
-+}
-+
- #else
- // LINUX, NOT MAC OS
- long long System::physicalMemory()
-@@ -396,6 +443,19 @@
- {
- return mstats().chunks_free;
- }
-+
-+#elif __FreeBSD__
-+
-+size_t System::memoryAllocatedByMalloc()
-+{
-+ return 0;
-+}
-+
-+size_t System::memoryInFreelistOfMalloc()
-+{
-+ return 0;
-+}
-+
- #else
-
- size_t System::memoryAllocatedByMalloc()
diff --git a/graphics/tulip/files/patch-thirdparty-ftgl-CMakeLists.txt b/graphics/tulip/files/patch-thirdparty-ftgl-CMakeLists.txt
deleted file mode 100644
index e6b48cb465d8..000000000000
--- a/graphics/tulip/files/patch-thirdparty-ftgl-CMakeLists.txt
+++ /dev/null
@@ -1,10 +0,0 @@
---- thirdparty/ftgl/CMakeLists.txt.orig 2013-12-24 22:28:17.000000000 +0200
-+++ thirdparty/ftgl/CMakeLists.txt 2013-12-24 22:28:03.000000000 +0200
-@@ -104,6 +104,7 @@
-
- INCLUDE_DIRECTORIES(${CMAKE_CURRENT_SOURCE_DIR})
- INCLUDE_DIRECTORIES(${FREETYPE_INCLUDE_DIRS})
-+INCLUDE_DIRECTORIES(${OPENGL_INCLUDE_DIR})
-
- ADD_LIBRARY(ftgl SHARED ${ftgl_SRCS} ${ftgl_headers_SRCS} ${ftglyph_SRCS} ${ftfont_SRCS} ${ftlayout_SRCS})
- TARGET_LINK_LIBRARIES(ftgl ${OPENGL_gl_LIBRARY} ${OPENGL_glu_LIBRARY} ${FREETYPE_LIBRARY})
diff --git a/graphics/tulip/files/patch-thirdparty_CMakeLists.txt b/graphics/tulip/files/patch-thirdparty_CMakeLists.txt
new file mode 100644
index 000000000000..aef3c66204a7
--- /dev/null
+++ b/graphics/tulip/files/patch-thirdparty_CMakeLists.txt
@@ -0,0 +1,11 @@
+--- thirdparty/CMakeLists.txt.orig 2014-04-18 10:22:25.000000000 +0200
++++ thirdparty/CMakeLists.txt 2014-04-18 10:22:30.000000000 +0200
+@@ -2,7 +2,7 @@
+
+ ADD_SUBDIRECTORY(gzstream)
+ ADD_SUBDIRECTORY(ftgl)
+-ADD_SUBDIRECTORY(OGDF)
++#ADD_SUBDIRECTORY(OGDF)
+ ADD_SUBDIRECTORY(quazip)
+ ADD_SUBDIRECTORY(yajl)
+ ADD_SUBDIRECTORY(qxt)
diff --git a/graphics/tulip/pkg-plist b/graphics/tulip/pkg-plist
index bdcd29013a44..c6068a1973b9 100644
--- a/graphics/tulip/pkg-plist
+++ b/graphics/tulip/pkg-plist
@@ -1,85 +1,64 @@
bin/tulip
bin/tulip-config
-bin/tulip_app
-bin/tulip_need_restart
+bin/tulip_perspective
+include/tulip/APIDataBase.h
include/tulip/AbstractGlCurve.h
include/tulip/AbstractProperty.h
-include/tulip/AbstractView.h
include/tulip/AcyclicTest.h
include/tulip/Algorithm.h
+include/tulip/Animation.h
include/tulip/Array.h
-include/tulip/AugmentedDisplayDialog.h
-include/tulip/AugmentedDisplayDialogData.h
-include/tulip/BaseGraphicsViewComponent.h
-include/tulip/BaseGraphicsViewComponentMacro.h
+include/tulip/AutoCompletionDataBase.h
include/tulip/Bfs.h
include/tulip/BiconnectedTest.h
-include/tulip/BooleanAlgorithm.h
include/tulip/BooleanProperty.h
include/tulip/BoundingBox.h
include/tulip/CSVContentHandler.h
include/tulip/CSVGraphImport.h
include/tulip/CSVGraphMappingConfigurationWidget.h
-include/tulip/CSVGraphMappingConfigurationWidgetData.h
include/tulip/CSVImportConfigurationWidget.h
-include/tulip/CSVImportConfigurationWidgetData.h
include/tulip/CSVImportWizard.h
-include/tulip/CSVImportWizardData.h
include/tulip/CSVParser.h
include/tulip/CSVParserConfigurationWidget.h
-include/tulip/CSVParserConfigurationWidgetData.h
+include/tulip/CachedPropertyAnimation.h
include/tulip/Camera.h
-include/tulip/ChooseFileNameDialogData.h
+include/tulip/CaptionGraphicsItem.h
+include/tulip/CaptionGraphicsSubItems.h
+include/tulip/CaptionItem.h
include/tulip/Circle.h
+include/tulip/ClearableLineEdit.h
include/tulip/Color.h
-include/tulip/ColorAlgorithm.h
include/tulip/ColorButton.h
include/tulip/ColorProperty.h
+include/tulip/ColorPropertyAnimation.h
include/tulip/ColorScale.h
+include/tulip/ColorScaleButton.h
include/tulip/ColorScaleConfigDialog.h
-include/tulip/ColorScaleConfigDialogData.h
include/tulip/ColorScaleWidget.h
include/tulip/ConcatIterator.h
include/tulip/ConnectedTest.h
include/tulip/ConsoleUtils.h
-include/tulip/Controller.h
-include/tulip/ControllerAlgorithmTools.h
-include/tulip/ControllerPluginsManager.h
-include/tulip/ControllerViewsManager.h
-include/tulip/ControllerViewsTools.h
include/tulip/ConvexHull.h
include/tulip/Coord.h
-include/tulip/CoordWidget.h
-include/tulip/CoordWidgetData.h
+include/tulip/CoordEditor.h
include/tulip/CopyPropertyDialog.h
-include/tulip/CopyPropertyDialogData.h
include/tulip/Curves.h
include/tulip/DataSet.h
include/tulip/Delaunay.h
-include/tulip/DoubleAlgorithm.h
include/tulip/DoubleProperty.h
+include/tulip/DoublePropertyAnimation.h
include/tulip/DoubleStringsListSelectionWidget.h
-include/tulip/DoubleStringsListSelectionWidgetData.h
+include/tulip/DownloadManager.h
+include/tulip/DragHandle.h
include/tulip/DrawingTools.h
include/tulip/Edge.h
include/tulip/EdgeExtremityGlyph.h
include/tulip/EdgeExtremityGlyphManager.h
-include/tulip/ElementPropertiesWidget.h
-include/tulip/ElementPropertiesWidgetPlugin.h
-include/tulip/ElementPropertiesWidgetUI.h
include/tulip/ExportModule.h
-include/tulip/ExtendedClusterOperation.h
include/tulip/Face.h
include/tulip/FaceIterator.h
-include/tulip/FileNameEditorWidget.h
-include/tulip/FileNameEditorWidgetData.h
-include/tulip/FindSelectionData.h
-include/tulip/FindSelectionWidget.h
include/tulip/ForEach.h
-include/tulip/ForegroundEntity.h
-include/tulip/GWOverviewWidget.h
-include/tulip/GWOverviewWidgetData.h
-include/tulip/GWOverviewWidgetPlugin.h
+include/tulip/GLInteractor.h
include/tulip/Gl2DRect.h
include/tulip/GlAbstractPolygon.h
include/tulip/GlAxis.h
@@ -98,14 +77,17 @@ include/tulip/GlConvexGraphHull.h
include/tulip/GlConvexHull.h
include/tulip/GlCubicBSplineInterpolation.h
include/tulip/GlCurve.h
-include/tulip/GlCylinder.h
include/tulip/GlDisplayListManager.h
include/tulip/GlEdge.h
include/tulip/GlEntity.h
include/tulip/GlFeedBackBuilder.h
include/tulip/GlFeedBackRecorder.h
+include/tulip/GlGlyphRenderer.h
include/tulip/GlGraphComposite.h
+include/tulip/GlGraphHighDetailsRenderer.h
include/tulip/GlGraphInputData.h
+include/tulip/GlGraphLowDetailsRenderer.h
+include/tulip/GlGraphRenderer.h
include/tulip/GlGraphRenderingParameters.h
include/tulip/GlGraphStaticData.h
include/tulip/GlGrid.h
@@ -118,16 +100,13 @@ include/tulip/GlLine.h
include/tulip/GlLines.h
include/tulip/GlMainView.h
include/tulip/GlMainWidget.h
-include/tulip/GlMainWidgetGraphicsView.h
-include/tulip/GlMainWidgetItem.h
-include/tulip/GlMainWidgetPlugin.h
-include/tulip/GlMetaNode.h
+include/tulip/GlMainWidgetGraphicsItem.h
include/tulip/GlMetaNodeRenderer.h
-include/tulip/GlMetaNodeTrueRenderer.h
include/tulip/GlNode.h
include/tulip/GlNominativeAxis.h
include/tulip/GlOffscreenRenderer.h
include/tulip/GlOpenUniformCubicBSpline.h
+include/tulip/GlOverviewGraphicsItem.h
include/tulip/GlPentagon.h
include/tulip/GlPolyQuad.h
include/tulip/GlPolygon.h
@@ -136,7 +115,6 @@ include/tulip/GlQuad.h
include/tulip/GlQuadTreeLODCalculator.h
include/tulip/GlQuantitativeAxis.h
include/tulip/GlRect.h
-include/tulip/GlRectTextured.h
include/tulip/GlRegularPolygon.h
include/tulip/GlScene.h
include/tulip/GlSceneObserver.h
@@ -145,7 +123,9 @@ include/tulip/GlSceneZoomAndPan.h
include/tulip/GlSelectSceneVisitor.h
include/tulip/GlShaderProgram.h
include/tulip/GlSimpleEntity.h
+include/tulip/GlSimpleEntityItemModel.h
include/tulip/GlSphere.h
+include/tulip/GlStar.h
include/tulip/GlTLPFeedBackBuilder.h
include/tulip/GlTextureManager.h
include/tulip/GlTools.h
@@ -155,35 +135,31 @@ include/tulip/GlVertexArrayVisitor.h
include/tulip/GlXMLTools.h
include/tulip/Glyph.h
include/tulip/GlyphManager.h
+include/tulip/GlyphRenderer.h
include/tulip/Graph.h
+include/tulip/GraphAbstract.h
include/tulip/GraphDecorator.h
+include/tulip/GraphElementModel.h
+include/tulip/GraphHierarchiesModel.h
include/tulip/GraphMeasure.h
+include/tulip/GraphModel.h
+include/tulip/GraphNeedsSavingObserver.h
+include/tulip/GraphPropertiesModel.h
include/tulip/GraphPropertiesSelectionWidget.h
-include/tulip/GraphPropertiesTableWidget.h
include/tulip/GraphProperty.h
+include/tulip/GraphTableItemDelegate.h
+include/tulip/GraphTest.h
include/tulip/GraphTools.h
-include/tulip/GraphicsWidgetBase.h
-include/tulip/GridOptionsData.h
-include/tulip/GridOptionsWidget.h
include/tulip/ImportModule.h
-include/tulip/IntegerAlgorithm.h
include/tulip/IntegerProperty.h
include/tulip/Interactor.h
-include/tulip/InteractorChainOfResponsibility.h
-include/tulip/InteractorComponent.h
-include/tulip/InteractorManager.h
+include/tulip/InteractorComposite.h
include/tulip/ItemsListWidget.h
include/tulip/Iterator.h
-include/tulip/LayerManagerWidget.h
-include/tulip/LayerManagerWidgetData.h
-include/tulip/LayoutAlgorithm.h
include/tulip/LayoutProperty.h
-include/tulip/ListPropertyWidgetData.h
-include/tulip/MainController.h
+include/tulip/LayoutPropertyAnimation.h
include/tulip/MapIterator.h
include/tulip/Matrix.h
-include/tulip/MethodFactory.h
-include/tulip/Morphing.h
include/tulip/MouseBoxZoomer.h
include/tulip/MouseEdgeBendEditor.h
include/tulip/MouseEdgeBuilder.h
@@ -196,254 +172,324 @@ include/tulip/MouseShowElementInfos.h
include/tulip/MutableContainer.h
include/tulip/Node.h
include/tulip/NodeLinkDiagramComponent.h
+include/tulip/NodeLinkDiagramComponentInteractor.h
+include/tulip/NumericProperty.h
include/tulip/Observable.h
-include/tulip/ObservableGraph.h
-include/tulip/ObservableProperty.h
include/tulip/OcclusionTest.h
include/tulip/OpenGlConfigManager.h
-include/tulip/OpenGlErrorViewer.h
include/tulip/Ordering.h
include/tulip/OuterPlanarTest.h
+include/tulip/ParameterListModel.h
include/tulip/ParametricCurves.h
+include/tulip/Perspective.h
+include/tulip/PlaceHolderWidget.h
include/tulip/PlanarConMap.h
include/tulip/PlanarityTest.h
include/tulip/Plugin.h
include/tulip/PluginContext.h
include/tulip/PluginLibraryLoader.h
+include/tulip/PluginLister.h
include/tulip/PluginLoader.h
include/tulip/PluginLoaderTxt.h
+include/tulip/PluginModel.h
include/tulip/PluginProgress.h
-include/tulip/PluginProgressWidget.h
-include/tulip/PluginProgressWidgetData.h
-include/tulip/PreferenceManager.h
+include/tulip/ProcessingAnimationItem.h
+include/tulip/PropertyAlgorithm.h
+include/tulip/PropertyAnimation.h
include/tulip/PropertyCreationDialog.h
-include/tulip/PropertyCreationDialogData.h
-include/tulip/PropertyDialog.h
-include/tulip/PropertyDialogData.h
include/tulip/PropertyInterface.h
include/tulip/PropertyTypes.h
-include/tulip/PropertyWidget.h
-include/tulip/PropertyWidgetPlugin.h
+include/tulip/PropertyWrapper.h
+include/tulip/PythonCodeEditor.h
+include/tulip/PythonCppTypesConverter.h
+include/tulip/PythonEditorsTabWidget.h
+include/tulip/PythonInterpreter.cxx
+include/tulip/PythonInterpreter.h
+include/tulip/PythonShellWidget.h
+include/tulip/PythonVersionChecker.h
include/tulip/QGlBufferManager.h
include/tulip/QGlPixelBufferManager.h
include/tulip/QtGlSceneZoomAndPanAnimator.h
-include/tulip/QtOpenGlErrorViewer.h
-include/tulip/QtOpenGlErrorViewerWithAskAgainDialogData.h
-include/tulip/QtProgress.h
+include/tulip/QuaZIPFacade.h
include/tulip/QuadTree.h
+include/tulip/QuickAccessBar.h
include/tulip/Rectangle.h
-include/tulip/Reflect.h
-include/tulip/RenderingParametersDialog.h
-include/tulip/RenderingParametersDialogData.h
-include/tulip/SGHierarchyWidget.h
-include/tulip/SGHierarchyWidgetPlugin.h
+include/tulip/RenamePropertyDialog.h
+include/tulip/SceneConfigWidget.h
+include/tulip/SceneLayersConfigWidget.h
+include/tulip/ScrollPopupButton.h
+include/tulip/SerializableType.h
include/tulip/SimplePluginProgress.h
+include/tulip/SimplePluginProgressWidget.h
include/tulip/SimpleStringsListSelectionWidget.h
-include/tulip/SimpleStringsListSelectionWidgetData.h
include/tulip/SimpleTest.h
include/tulip/Size.h
-include/tulip/SizeAlgorithm.h
include/tulip/SizeProperty.h
-include/tulip/SizeWidget.h
-include/tulip/SizeWidgetData.h
-include/tulip/SmallMultiplesNavigatorComponent.h
-include/tulip/SmallMultiplesView.h
+include/tulip/SizePropertyAnimation.h
include/tulip/SnapshotDialog.h
-include/tulip/SnapshotDialogData.h
include/tulip/SortIterator.h
include/tulip/StableIterator.h
include/tulip/StlFunctions.h
include/tulip/StlIterator.h
include/tulip/StoredType.h
-include/tulip/StringAlgorithm.h
include/tulip/StringCollection.h
include/tulip/StringProperty.h
include/tulip/StringsListSelectionWidget.h
include/tulip/StringsListSelectionWidgetInterface.h
-include/tulip/TabWidget.h
-include/tulip/TabWidgetData.h
-include/tulip/TabWidgetHidableMenuGraphicsProxy.h
-include/tulip/TemplateFactory.h
-include/tulip/TextEditDialog.h
-include/tulip/TextEditDialogData.h
-include/tulip/TextRenderer.h
-include/tulip/ThreadedComputeProperty.h
-include/tulip/TlpNetworkAccess.h
+include/tulip/SystemDefinition.h
+include/tulip/TemplateAlgorithm.h
include/tulip/TlpQtTools.h
include/tulip/TlpTools.h
include/tulip/TreeTest.h
+include/tulip/TreeViewComboBox.h
include/tulip/TriconnectedTest.h
include/tulip/TulipException.h
-include/tulip/TulipPlugin.h
+include/tulip/TulipFileDescriptorWidget.h
+include/tulip/TulipFont.h
+include/tulip/TulipFontDialog.h
+include/tulip/TulipItemDelegate.h
+include/tulip/TulipItemEditorCreators.h
+include/tulip/TulipMetaTypes.h
+include/tulip/TulipMimes.h
+include/tulip/TulipModel.h
+include/tulip/TulipParallelAnimationGroup.h
+include/tulip/TulipPluginHeaders.h
+include/tulip/TulipProject.h
include/tulip/TulipRelease.h
include/tulip/TulipSettings.h
-include/tulip/TulipTableWidget.h
+include/tulip/TulipViewSettings.h
+include/tulip/TypeInterface.h
include/tulip/Vector.h
include/tulip/VectorCast.h
+include/tulip/VectorEditionWidget.h
+include/tulip/VectorPropertyAnimation.h
include/tulip/View.h
-include/tulip/ViewPluginsManager.h
+include/tulip/ViewWidget.h
include/tulip/WithDependency.h
include/tulip/WithParameter.h
+include/tulip/Workspace.h
+include/tulip/WorkspaceExposeWidget.h
+include/tulip/WorkspacePanel.h
+include/tulip/YajlFacade.h
include/tulip/conversioniterator.h
include/tulip/cxx/AbstractProperty.cxx
include/tulip/cxx/Array.cxx
+include/tulip/cxx/CachedPropertyAnimation.cxx
include/tulip/cxx/Circle.cxx
+include/tulip/cxx/DataSet.cxx
include/tulip/cxx/Graph.cxx
+include/tulip/cxx/GraphPropertiesModel.cxx
include/tulip/cxx/Matrix.cxx
-include/tulip/cxx/Reflect.cxx
-include/tulip/cxx/TemplateFactory.cxx
+include/tulip/cxx/MutableContainer.cxx
+include/tulip/cxx/PropertyAnimation.cxx
+include/tulip/cxx/TulipItemDelegate.cxx
+include/tulip/cxx/TulipItemEditorCreators.cxx
include/tulip/cxx/Vector.cxx
+include/tulip/cxx/VectorPropertyAnimation.cxx
+include/tulip/cxx/minmaxproperty.cxx
include/tulip/filteriterator.h
include/tulip/memorypool.h
-include/tulip/stlfilteriterator.h
+include/tulip/minmaxproperty.h
include/tulip/tulipconf.h
include/tulip/tuliphash.h
include/tulip/uniqueiterator.h
include/tulip/vectorgraph.h
include/tulip/vectorgraphproperty.h
-lib/tlp/glyphs/libBillboard-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libChristmasTree-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libCircle-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libCone-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libCross-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libCube-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libCubeOutlinedTransparent-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libCylinder-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libDiamond-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libGlowSphere-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libHalfCylinder-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libHexagone-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libPentagone-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libRing-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libRoundedBox-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libSphere-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libSquare-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libTriangle-%%TULIP_VERSION%%.so
-lib/tlp/glyphs/libWindow-%%TULIP_VERSION%%.so
-lib/tlp/interactors/libInteractorAddEdge-%%TULIP_VERSION%%.so
-lib/tlp/interactors/libInteractorAddNode-%%TULIP_VERSION%%.so
-lib/tlp/interactors/libInteractorDeleteElement-%%TULIP_VERSION%%.so
-lib/tlp/interactors/libInteractorEditEdgeBends-%%TULIP_VERSION%%.so
-lib/tlp/interactors/libInteractorGetInformation-%%TULIP_VERSION%%.so
-lib/tlp/interactors/libInteractorMagicSelection-%%TULIP_VERSION%%.so
-lib/tlp/interactors/libInteractorNavigation-%%TULIP_VERSION%%.so
-lib/tlp/interactors/libInteractorRectangleZoom-%%TULIP_VERSION%%.so
-lib/tlp/interactors/libInteractorSelection-%%TULIP_VERSION%%.so
-lib/tlp/interactors/libInteractorSelectionModifier-%%TULIP_VERSION%%.so
-lib/tlp/libAdjacencyMatrixImport-%%TULIP_VERSION%%.so
-lib/tlp/libAutoSize-%%TULIP_VERSION%%.so
-lib/tlp/libBetweennessCentrality-%%TULIP_VERSION%%.so
-lib/tlp/libBiconnectedComponent-%%TULIP_VERSION%%.so
-lib/tlp/libBubbleTree-%%TULIP_VERSION%%.so
-lib/tlp/libCircular-%%TULIP_VERSION%%.so
-lib/tlp/libClusterMetric-%%TULIP_VERSION%%.so
-lib/tlp/libColorMapping-%%TULIP_VERSION%%.so
-lib/tlp/libCompleteGraph-%%TULIP_VERSION%%.so
-lib/tlp/libCompleteTree-%%TULIP_VERSION%%.so
-lib/tlp/libConeTreeExtended-%%TULIP_VERSION%%.so
-lib/tlp/libConnectedComponent-%%TULIP_VERSION%%.so
-lib/tlp/libConnectedComponentPacking-%%TULIP_VERSION%%.so
-lib/tlp/libConvolutionClustering-%%TULIP_VERSION%%.so
-lib/tlp/libDagLevelMetric-%%TULIP_VERSION%%.so
-lib/tlp/libDegreeMetric-%%TULIP_VERSION%%.so
-lib/tlp/libDendrogram-%%TULIP_VERSION%%.so
-lib/tlp/libDepthMetric-%%TULIP_VERSION%%.so
-lib/tlp/libDotImport-%%TULIP_VERSION%%.so
-lib/tlp/libEccentricity-%%TULIP_VERSION%%.so
-lib/tlp/libEqualValueClustering-%%TULIP_VERSION%%.so
-lib/tlp/libFileSystem-%%TULIP_VERSION%%.so
-lib/tlp/libFitToLabels-%%TULIP_VERSION%%.so
-lib/tlp/libGMLExport-%%TULIP_VERSION%%.so
-lib/tlp/libGMLImport-%%TULIP_VERSION%%.so
-lib/tlp/libGemLayout-%%TULIP_VERSION%%.so
-lib/tlp/libGrid-%%TULIP_VERSION%%.so
-lib/tlp/libHierarchicalClustering-%%TULIP_VERSION%%.so
-lib/tlp/libHierarchicalGraph-%%TULIP_VERSION%%.so
-lib/tlp/libIdMetric-%%TULIP_VERSION%%.so
-lib/tlp/libImportPajek-%%TULIP_VERSION%%.so
-lib/tlp/libImportUCINET-%%TULIP_VERSION%%.so
-lib/tlp/libImprovedWalker-%%TULIP_VERSION%%.so
-lib/tlp/libInducedSubGraphSelection-%%TULIP_VERSION%%.so
-lib/tlp/libKruskal-%%TULIP_VERSION%%.so
-lib/tlp/libLeafMetric-%%TULIP_VERSION%%.so
-lib/tlp/libLoopSelection-%%TULIP_VERSION%%.so
-lib/tlp/libMetricSizeMapping-%%TULIP_VERSION%%.so
-lib/tlp/libMixedModel-%%TULIP_VERSION%%.so
-lib/tlp/libMultipleSelection-%%TULIP_VERSION%%.so
-lib/tlp/libNodeMetric-%%TULIP_VERSION%%.so
-lib/tlp/libOGDF.so
-lib/tlp/libPathLengthMetric-%%TULIP_VERSION%%.so
-lib/tlp/libPlanarGraph-%%TULIP_VERSION%%.so
-lib/tlp/libQuotientClustering-%%TULIP_VERSION%%.so
-lib/tlp/libRandom-%%TULIP_VERSION%%.so
-lib/tlp/libRandomGraph-%%TULIP_VERSION%%.so
-lib/tlp/libRandomMetric-%%TULIP_VERSION%%.so
-lib/tlp/libRandomSimpleGraph-%%TULIP_VERSION%%.so
-lib/tlp/libRandomTree-%%TULIP_VERSION%%.so
-lib/tlp/libRandomTreeGeneral-%%TULIP_VERSION%%.so
-lib/tlp/libReachableSubGraphSelection-%%TULIP_VERSION%%.so
-lib/tlp/libSmallWorldGraph-%%TULIP_VERSION%%.so
-lib/tlp/libSpanningDagSelection-%%TULIP_VERSION%%.so
-lib/tlp/libSpanningTreeSelection-%%TULIP_VERSION%%.so
-lib/tlp/libSquarifiedTreeMap-%%TULIP_VERSION%%.so
-lib/tlp/libStrahlerMetric-%%TULIP_VERSION%%.so
-lib/tlp/libStrengthClustering-%%TULIP_VERSION%%.so
-lib/tlp/libStrengthMetric-%%TULIP_VERSION%%.so
-lib/tlp/libStrongComponent-%%TULIP_VERSION%%.so
-lib/tlp/libTreeLeaf-%%TULIP_VERSION%%.so
-lib/tlp/libTreeRadial-%%TULIP_VERSION%%.so
-lib/tlp/libTreeReingoldAndTilforExtended-%%TULIP_VERSION%%.so
-lib/tlp/libTutte-%%TULIP_VERSION%%.so
-lib/tlp/libWebImport-%%TULIP_VERSION%%.so
-lib/tlp/libDelaunay-%%TULIP_VERSION%%.so
-lib/tlp/libVoronoi-%%TULIP_VERSION%%.so
-lib/tlp/libGEXFImport-%%TULIP_VERSION%%.so
-lib/tlp/libftgl.so
-lib/tlp/libgzstream.so
-lib/tlp/libogdfballoon-%%TULIP_VERSION%%.so
-lib/tlp/libogdfcircular-%%TULIP_VERSION%%.so
-lib/tlp/libogdfdavidsonharel-%%TULIP_VERSION%%.so
-lib/tlp/libogdfdominance-%%TULIP_VERSION%%.so
-lib/tlp/libogdffastmultipoleembedder-%%TULIP_VERSION%%.so
-lib/tlp/libogdffastmultipolemultilevelembedder-%%TULIP_VERSION%%.so
-lib/tlp/libogdffm3-%%TULIP_VERSION%%.so
-lib/tlp/libogdffrutchermanreingold-%%TULIP_VERSION%%.so
-lib/tlp/libogdfgemfrick-%%TULIP_VERSION%%.so
-lib/tlp/libogdfkamadakawai-%%TULIP_VERSION%%.so
-lib/tlp/libogdfmmmexamplefastlayout-%%TULIP_VERSION%%.so
-lib/tlp/libogdfmmmexamplenicelayout-%%TULIP_VERSION%%.so
-lib/tlp/libogdfmmmexamplenotwistlayout-%%TULIP_VERSION%%.so
-lib/tlp/libogdfplanarizationgrid-%%TULIP_VERSION%%.so
-lib/tlp/libogdfstressmajorization-%%TULIP_VERSION%%.so
-lib/tlp/libogdfsugiyama-%%TULIP_VERSION%%.so
-lib/tlp/libogdftree-%%TULIP_VERSION%%.so
-lib/tlp/libogdfupwardplanarization-%%TULIP_VERSION%%.so
-lib/tlp/libogdfvisibility-%%TULIP_VERSION%%.so
-lib/tlp/libtulip-%%TULIP_VERS%%.so
-lib/tlp/libtulip-ogdf-%%TULIP_VERS%%.so
-lib/tlp/libtulip-ogl-%%TULIP_VERS%%.so
-lib/tlp/libtulip-qt4-%%TULIP_VERS%%.so
-lib/tlp/python/sip.so
-lib/tlp/python/stl.so
-lib/tlp/python/tulip.so
-lib/tlp/python/tulipplugins.py
-lib/tlp/python/tulipogl.so
-lib/tlp/python/tulipgui.so
-lib/tlp/view/libSpreadSheet-%%TULIP_VERSION%%.so
-lib/tlp/view/libpythonscriptview-%%TULIP_VERSION%%.so
+include/tulip2ogdf/OGDFLayoutPluginBase.h
+include/tulip2ogdf/TulipToOGDF.h
+lib/libftgl-tulip-%%TULIP_VERS%%.so
+lib/libftgl-tulip-%%TULIP_VERS%%.so.2
+lib/libftgl-tulip-%%TULIP_VERS%%.so.2.1
+lib/libgzstream-tulip-%%TULIP_VERS%%.so
+lib/libgzstream-tulip-%%TULIP_VERS%%.so.0
+lib/libquazip-tulip-%%TULIP_VERS%%.so
+lib/libquazip-tulip-%%TULIP_VERS%%.so.1
+lib/libquazip-tulip-%%TULIP_VERS%%.so.1.0.0
+lib/libqxt-tulip-%%TULIP_VERS%%.so
+lib/libqxt-tulip-%%TULIP_VERS%%.so.0
+lib/libtulip-core-%%TULIP_VERS%%.so
+lib/libtulip-gui-%%TULIP_VERS%%.so
+lib/libtulip-ogdf-%%TULIP_VERS%%.so
+lib/libtulip-ogl-%%TULIP_VERS%%.so
+lib/libtulip-python-%%TULIP_VERS%%.so
+lib/libyajl-tulip-%%TULIP_VERS%%.so
+lib/libyajl-tulip-%%TULIP_VERS%%.so.2
+lib/libyajl-tulip-%%TULIP_VERS%%.so.2.0.1
+lib/python/facebook.py
+lib/python/sip.so
+lib/python/stl.so
+lib/python/tulip.so
+lib/python/tulip_facebook.py
+lib/python/tulipgui.so
+lib/python/tulipogl.so
+lib/python/tulipplugins.py
+lib/tulip/glyph/libBillboard-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libChristmasTree-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libCircle-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libCone-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libCross-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libCube-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libCubeOutlinedTransparent-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libCylinder-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libDiamond-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libGlowSphere-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libHalfCylinder-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libHexagone-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libPentagone-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libRing-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libRoundedBox-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libSphere-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libSquare-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libStar-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libTriangle-%%TULIP_VERSION%%.so
+lib/tulip/glyph/libWindow-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libFishEyeInteractor-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libInteractorAddNodeEdge-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libInteractorDeleteElement-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libInteractorEditEdgeBends-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libInteractorGetInformation-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libInteractorNavigation-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libInteractorRectangleZoom-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libInteractorSelection-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libInteractorSelectionModifier-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libMouseLassoNodesSelector-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libMouseMagnifyingGlass-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libNeighborhoodHighlighter-%%TULIP_VERSION%%.so
+lib/tulip/interactor/libPathFinder-%%TULIP_VERSION%%.so
+lib/tulip/libAcyclic-%%TULIP_VERSION%%.so
+lib/tulip/libAdjacencyMatrixImport-%%TULIP_VERSION%%.so
+lib/tulip/libAutoSize-%%TULIP_VERSION%%.so
+lib/tulip/libBetweennessCentrality-%%TULIP_VERSION%%.so
+lib/tulip/libBiconnected-%%TULIP_VERSION%%.so
+lib/tulip/libBiconnectedComponent-%%TULIP_VERSION%%.so
+lib/tulip/libBubbleTree-%%TULIP_VERSION%%.so
+lib/tulip/libCircular-%%TULIP_VERSION%%.so
+lib/tulip/libClusterMetric-%%TULIP_VERSION%%.so
+lib/tulip/libColorMapping-%%TULIP_VERSION%%.so
+lib/tulip/libCompleteGraph-%%TULIP_VERSION%%.so
+lib/tulip/libCompleteTree-%%TULIP_VERSION%%.so
+lib/tulip/libConeTreeExtended-%%TULIP_VERSION%%.so
+lib/tulip/libConnected-%%TULIP_VERSION%%.so
+lib/tulip/libConnectedComponent-%%TULIP_VERSION%%.so
+lib/tulip/libConnectedComponentPacking-%%TULIP_VERSION%%.so
+lib/tulip/libConvolutionClustering-%%TULIP_VERSION%%.so
+lib/tulip/libDagLevelMetric-%%TULIP_VERSION%%.so
+lib/tulip/libDegreeMetric-%%TULIP_VERSION%%.so
+lib/tulip/libDelaunay-%%TULIP_VERSION%%.so
+lib/tulip/libDendrogram-%%TULIP_VERSION%%.so
+lib/tulip/libDepthMetric-%%TULIP_VERSION%%.so
+lib/tulip/libDotImport-%%TULIP_VERSION%%.so
+lib/tulip/libEccentricity-%%TULIP_VERSION%%.so
+lib/tulip/libEdgeBundling-%%TULIP_VERSION%%.so
+lib/tulip/libEmptyGraph-%%TULIP_VERSION%%.so
+lib/tulip/libEqualValueClustering-%%TULIP_VERSION%%.so
+lib/tulip/libFacebookImport-%%TULIP_VERSION%%.so
+lib/tulip/libFastOverlapRemoval-%%TULIP_VERSION%%.so
+lib/tulip/libFileSystem-%%TULIP_VERSION%%.so
+lib/tulip/libGEXFImport-%%TULIP_VERSION%%.so
+lib/tulip/libGMLExport-%%TULIP_VERSION%%.so
+lib/tulip/libGMLImport-%%TULIP_VERSION%%.so
+lib/tulip/libGemLayout-%%TULIP_VERSION%%.so
+lib/tulip/libGrid-%%TULIP_VERSION%%.so
+lib/tulip/libGrip-%%TULIP_VERSION%%.so
+lib/tulip/libHierarchicalClustering-%%TULIP_VERSION%%.so
+lib/tulip/libHierarchicalGraph-%%TULIP_VERSION%%.so
+lib/tulip/libIdMetric-%%TULIP_VERSION%%.so
+lib/tulip/libImportPajek-%%TULIP_VERSION%%.so
+lib/tulip/libImportUCINET-%%TULIP_VERSION%%.so
+lib/tulip/libImprovedWalker-%%TULIP_VERSION%%.so
+lib/tulip/libInducedSubGraphSelection-%%TULIP_VERSION%%.so
+lib/tulip/libKCores-%%TULIP_VERSION%%.so
+lib/tulip/libKruskal-%%TULIP_VERSION%%.so
+lib/tulip/libLeafMetric-%%TULIP_VERSION%%.so
+lib/tulip/libLinLog-%%TULIP_VERSION%%.so
+lib/tulip/libLinkCommunities-%%TULIP_VERSION%%.so
+lib/tulip/libLoopSelection-%%TULIP_VERSION%%.so
+lib/tulip/libLouvainClustering-%%TULIP_VERSION%%.so
+lib/tulip/libMCLClustering-%%TULIP_VERSION%%.so
+lib/tulip/libMetricSizeMapping-%%TULIP_VERSION%%.so
+lib/tulip/libMixedModel-%%TULIP_VERSION%%.so
+lib/tulip/libMultipleSelection-%%TULIP_VERSION%%.so
+lib/tulip/libNodeMetric-%%TULIP_VERSION%%.so
+lib/tulip/libOuterplanar-%%TULIP_VERSION%%.so
+lib/tulip/libPageRank-%%TULIP_VERSION%%.so
+lib/tulip/libPathLengthMetric-%%TULIP_VERSION%%.so
+lib/tulip/libPerfectLayout-%%TULIP_VERSION%%.so
+lib/tulip/libPlanarGraph-%%TULIP_VERSION%%.so
+lib/tulip/libPlanarity-%%TULIP_VERSION%%.so
+lib/tulip/libPolyominoPacking-%%TULIP_VERSION%%.so
+lib/tulip/libQuotientClustering-%%TULIP_VERSION%%.so
+lib/tulip/libRandom-%%TULIP_VERSION%%.so
+lib/tulip/libRandomGraph-%%TULIP_VERSION%%.so
+lib/tulip/libRandomMetric-%%TULIP_VERSION%%.so
+lib/tulip/libRandomSimpleGraph-%%TULIP_VERSION%%.so
+lib/tulip/libRandomTree-%%TULIP_VERSION%%.so
+lib/tulip/libRandomTreeGeneral-%%TULIP_VERSION%%.so
+lib/tulip/libReachableSubGraphSelection-%%TULIP_VERSION%%.so
+lib/tulip/libSVGExport-%%TULIP_VERSION%%.so
+lib/tulip/libSimple-%%TULIP_VERSION%%.so
+lib/tulip/libSmallWorldGraph-%%TULIP_VERSION%%.so
+lib/tulip/libSpanningDagSelection-%%TULIP_VERSION%%.so
+lib/tulip/libSpanningTreeSelection-%%TULIP_VERSION%%.so
+lib/tulip/libSquarifiedTreeMap-%%TULIP_VERSION%%.so
+lib/tulip/libStrahlerMetric-%%TULIP_VERSION%%.so
+lib/tulip/libStrengthClustering-%%TULIP_VERSION%%.so
+lib/tulip/libStrengthMetric-%%TULIP_VERSION%%.so
+lib/tulip/libStrongComponent-%%TULIP_VERSION%%.so
+lib/tulip/libToLabels-%%TULIP_VERSION%%.so
+lib/tulip/libTree-%%TULIP_VERSION%%.so
+lib/tulip/libTreeLeaf-%%TULIP_VERSION%%.so
+lib/tulip/libTreeRadial-%%TULIP_VERSION%%.so
+lib/tulip/libTreeReingoldAndTilforExtended-%%TULIP_VERSION%%.so
+lib/tulip/libTriconnected-%%TULIP_VERSION%%.so
+lib/tulip/libTutte-%%TULIP_VERSION%%.so
+lib/tulip/libVoronoi-%%TULIP_VERSION%%.so
+lib/tulip/libWebImport-%%TULIP_VERSION%%.so
+lib/tulip/libWelshPowell-%%TULIP_VERSION%%.so
+lib/tulip/libogdfballoon-%%TULIP_VERSION%%.so
+lib/tulip/libogdfcircular-%%TULIP_VERSION%%.so
+lib/tulip/libogdfdavidsonharel-%%TULIP_VERSION%%.so
+lib/tulip/libogdfdominance-%%TULIP_VERSION%%.so
+lib/tulip/libogdffastmultipoleembedder-%%TULIP_VERSION%%.so
+lib/tulip/libogdffastmultipolemultilevelembedder-%%TULIP_VERSION%%.so
+lib/tulip/libogdffm3-%%TULIP_VERSION%%.so
+lib/tulip/libogdffrutchermanreingold-%%TULIP_VERSION%%.so
+lib/tulip/libogdfgemfrick-%%TULIP_VERSION%%.so
+lib/tulip/libogdfkamadakawai-%%TULIP_VERSION%%.so
+lib/tulip/libogdfmmmexamplefastlayout-%%TULIP_VERSION%%.so
+lib/tulip/libogdfmmmexamplenicelayout-%%TULIP_VERSION%%.so
+lib/tulip/libogdfmmmexamplenotwistlayout-%%TULIP_VERSION%%.so
+lib/tulip/libogdfplanarizationgrid-%%TULIP_VERSION%%.so
+lib/tulip/libogdfstressmajorization-%%TULIP_VERSION%%.so
+lib/tulip/libogdfsugiyama-%%TULIP_VERSION%%.so
+lib/tulip/libogdftree-%%TULIP_VERSION%%.so
+lib/tulip/libogdfupwardplanarization-%%TULIP_VERSION%%.so
+lib/tulip/libogdfvisibility-%%TULIP_VERSION%%.so
+lib/tulip/libreverseedges-%%TULIP_VERSION%%.so
+lib/tulip/perspective/libGraphPerspective-%%TULIP_VERSION%%.so
+lib/tulip/view/libGeographicView-%%TULIP_VERSION%%.so
+lib/tulip/view/libHistogramView-%%TULIP_VERSION%%.so
+lib/tulip/view/libMatrixView-%%TULIP_VERSION%%.so
+lib/tulip/view/libParallelCoordinatesView-%%TULIP_VERSION%%.so
+lib/tulip/view/libPixelOrientedView-%%TULIP_VERSION%%.so
+lib/tulip/view/libSOMView-%%TULIP_VERSION%%.so
+lib/tulip/view/libScatterPlot2DView-%%TULIP_VERSION%%.so
+lib/tulip/view/libTableView-%%TULIP_VERSION%%.so
+lib/tulip/view/libpythonscriptview-%%TULIP_VERSION%%.so
%%DATADIR%%/FindGLEW.cmake
-%%DATADIR%%/FindTULIP3.cmake
-%%DATADIR%%/FindXML2.cmake
+%%DATADIR%%/FindTULIP.cmake
+%%DATADIR%%/TulipUseFile.cmake
+%%DATADIR%%/apiFiles/PyQt4.api
%%DATADIR%%/apiFiles/Python-2.4.api
%%DATADIR%%/apiFiles/Python-2.5.api
%%DATADIR%%/apiFiles/Python-2.6.api
%%DATADIR%%/apiFiles/Python-2.7.api
%%DATADIR%%/apiFiles/Python-3.1.api
%%DATADIR%%/apiFiles/Python-3.2.api
-%%DATADIR%%/apiFiles/PyQt4.api
+%%DATADIR%%/apiFiles/Python-3.3.api
+%%DATADIR%%/apiFiles/tulip.api
%%DATADIR%%/apiFiles/tulipgui.api
%%DATADIR%%/apiFiles/tulipogl.api
-%%DATADIR%%/apiFiles/tulip.api
%%DATADIR%%/bitmaps/arrowSprite.png
%%DATADIR%%/bitmaps/candiSprite.png
%%DATADIR%%/bitmaps/colorscales/BiologicalHeatMap.png
@@ -468,28 +514,170 @@ lib/tlp/view/libpythonscriptview-%%TULIP_VERSION%%.so
%%DATADIR%%/bitmaps/edgeSpring.png
%%DATADIR%%/bitmaps/font.ttf
%%DATADIR%%/bitmaps/fontb.ttf
+%%DATADIR%%/bitmaps/fonts/FreeMono/FreeMono.ttf
+%%DATADIR%%/bitmaps/fonts/FreeMono/FreeMono_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/FreeMono/FreeMono_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/FreeMono/FreeMono_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/FreeSans/FreeSans.ttf
+%%DATADIR%%/bitmaps/fonts/FreeSans/FreeSans_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/FreeSans/FreeSans_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/FreeSans/FreeSans_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/FreeSerif/FreeSerif.ttf
+%%DATADIR%%/bitmaps/fonts/FreeSerif/FreeSerif_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/FreeSerif/FreeSerif_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/FreeSerif/FreeSerif_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Garuda/Garuda.ttf
+%%DATADIR%%/bitmaps/fonts/Garuda/Garuda_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/Garuda/Garuda_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Garuda/Garuda_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Kinnari/Kinnari.ttf
+%%DATADIR%%/bitmaps/fonts/Kinnari/Kinnari_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/Kinnari/Kinnari_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Kinnari/Kinnari_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/LiberationMono/LiberationMono.ttf
+%%DATADIR%%/bitmaps/fonts/LiberationMono/LiberationMono_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/LiberationMono/LiberationMono_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/LiberationMono/LiberationMono_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/LiberationSans/LiberationSans.ttf
+%%DATADIR%%/bitmaps/fonts/LiberationSans/LiberationSans_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/LiberationSans/LiberationSans_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/LiberationSans/LiberationSans_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/LiberationSerif/LiberationSerif.ttf
+%%DATADIR%%/bitmaps/fonts/LiberationSerif/LiberationSerif_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/LiberationSerif/LiberationSerif_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/LiberationSerif/LiberationSerif_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Loma/Loma.ttf
+%%DATADIR%%/bitmaps/fonts/Loma/Loma_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/Loma/Loma_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Loma/Loma_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Norasi/Norasi.ttf
+%%DATADIR%%/bitmaps/fonts/Norasi/Norasi_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/Norasi/Norasi_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Norasi/Norasi_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Purisa/Purisa.ttf
+%%DATADIR%%/bitmaps/fonts/Purisa/Purisa_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/Purisa/Purisa_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Purisa/Purisa_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Sawasdee/Sawasdee.ttf
+%%DATADIR%%/bitmaps/fonts/Sawasdee/Sawasdee_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/Sawasdee/Sawasdee_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Sawasdee/Sawasdee_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgMono/TlwgMono.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgMono/TlwgMono_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgMono/TlwgMono_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgMono/TlwgMono_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgTypewriter/TlwgTypewriter.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgTypewriter/TlwgTypewriter_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgTypewriter/TlwgTypewriter_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgTypewriter/TlwgTypewriter_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgTypist/TlwgTypist.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgTypist/TlwgTypist_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgTypist/TlwgTypist_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgTypist/TlwgTypist_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgTypo/TlwgTypo.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgTypo/TlwgTypo_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgTypo/TlwgTypo_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/TlwgTypo/TlwgTypo_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Ubuntu/Ubuntu.ttf
+%%DATADIR%%/bitmaps/fonts/Ubuntu/Ubuntu_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/Ubuntu/Ubuntu_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Ubuntu/Ubuntu_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Umpush/Umpush.ttf
+%%DATADIR%%/bitmaps/fonts/Umpush/Umpush_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/Umpush/Umpush_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Umpush/Umpush_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Waree/Waree.ttf
+%%DATADIR%%/bitmaps/fonts/Waree/Waree_Bold.ttf
+%%DATADIR%%/bitmaps/fonts/Waree/Waree_Bold_Italic.ttf
+%%DATADIR%%/bitmaps/fonts/Waree/Waree_Italic.ttf
%%DATADIR%%/bitmaps/halfCylinderTexture.png
-%%DATADIR%%/bitmaps/headerlogo.bmp
%%DATADIR%%/bitmaps/logo.bmp
-%%DATADIR%%/bitmaps/logo32x32.bmp
%%DATADIR%%/bitmaps/logo32x32.ico
%%DATADIR%%/bitmaps/logolabri.jpg
-%%DATADIR%%/bitmaps/logotulip.jpg
%%DATADIR%%/bitmaps/radialGradientTexture.png
%%DATADIR%%/bitmaps/roundTexture.png
-%%DATADIR%%/bitmaps/tex_back.png
+%%DATADIR%%/bitmaps/samplePictures/1221.png
+%%DATADIR%%/bitmaps/samplePictures/1291.png
+%%DATADIR%%/bitmaps/samplePictures/1531.png
+%%DATADIR%%/bitmaps/samplePictures/1861.jpg
+%%DATADIR%%/bitmaps/samplePictures/741.png
+%%DATADIR%%/bitmaps/samplePictures/891.png
%%DATADIR%%/bitmaps/titlebarGradient.png
%%DATADIR%%/bitmaps/welcomelogo.bmp
-%%DATADIR%%/tulip380.qch
-%%DATADIR%%/tulip380.qhc
+%%DATADIR%%/wizards/README.txt
+%%DATADIR%%/wizards/tlpalgorithm/algorithm.cmake
+%%DATADIR%%/wizards/tlpalgorithm/algorithmplugin.cpp
+%%DATADIR%%/wizards/tlpalgorithm/algorithmplugin.h
+%%DATADIR%%/wizards/tlpalgorithm/logo.png
+%%DATADIR%%/wizards/tlpalgorithm/wizard.xml
+%%DATADIR%%/wizards/tlpexport/export.cmake
+%%DATADIR%%/wizards/tlpexport/exportplugin.cpp
+%%DATADIR%%/wizards/tlpexport/exportplugin.h
+%%DATADIR%%/wizards/tlpexport/logo.png
+%%DATADIR%%/wizards/tlpexport/wizard.xml
+%%DATADIR%%/wizards/tlpimport/import.cmake
+%%DATADIR%%/wizards/tlpimport/importplugin.cpp
+%%DATADIR%%/wizards/tlpimport/importplugin.h
+%%DATADIR%%/wizards/tlpimport/logo.png
+%%DATADIR%%/wizards/tlpimport/wizard.xml
+%%DATADIR%%/wizards/tlpinteractor/interactor.cmake
+%%DATADIR%%/wizards/tlpinteractor/interactor.cpp
+%%DATADIR%%/wizards/tlpinteractor/interactor.h
+%%DATADIR%%/wizards/tlpinteractor/logo.png
+%%DATADIR%%/wizards/tlpinteractor/wizard.xml
+%%DATADIR%%/wizards/tlpmain/logo.png
+%%DATADIR%%/wizards/tlpmain/main.cmake
+%%DATADIR%%/wizards/tlpmain/main.cpp
+%%DATADIR%%/wizards/tlpmain/wizard.xml
+%%DATADIR%%/wizards/tlpproperty/logo.png
+%%DATADIR%%/wizards/tlpproperty/property.cmake
+%%DATADIR%%/wizards/tlpproperty/propertyplugin.cpp
+%%DATADIR%%/wizards/tlpproperty/propertyplugin.h
+%%DATADIR%%/wizards/tlpproperty/wizard.xml
+%%DATADIR%%/wizards/tlpview/logo.png
+%%DATADIR%%/wizards/tlpview/view.cmake
+%%DATADIR%%/wizards/tlpview/view.cpp
+%%DATADIR%%/wizards/tlpview/view.h
+%%DATADIR%%/wizards/tlpview/wizard.xml
+@dirrm %%DATADIR%%/wizards/tlpview
+@dirrm %%DATADIR%%/wizards/tlpproperty
+@dirrm %%DATADIR%%/wizards/tlpmain
+@dirrm %%DATADIR%%/wizards/tlpinteractor
+@dirrm %%DATADIR%%/wizards/tlpimport
+@dirrm %%DATADIR%%/wizards/tlpexport
+@dirrm %%DATADIR%%/wizards/tlpalgorithm
+@dirrm %%DATADIR%%/wizards
+@dirrm %%DATADIR%%/bitmaps/samplePictures
+@dirrm %%DATADIR%%/bitmaps/fonts/Waree
+@dirrm %%DATADIR%%/bitmaps/fonts/Umpush
+@dirrm %%DATADIR%%/bitmaps/fonts/Ubuntu
+@dirrm %%DATADIR%%/bitmaps/fonts/TlwgTypo
+@dirrm %%DATADIR%%/bitmaps/fonts/TlwgTypist
+@dirrm %%DATADIR%%/bitmaps/fonts/TlwgTypewriter
+@dirrm %%DATADIR%%/bitmaps/fonts/TlwgMono
+@dirrm %%DATADIR%%/bitmaps/fonts/Sawasdee
+@dirrm %%DATADIR%%/bitmaps/fonts/Purisa
+@dirrm %%DATADIR%%/bitmaps/fonts/Norasi
+@dirrm %%DATADIR%%/bitmaps/fonts/Loma
+@dirrm %%DATADIR%%/bitmaps/fonts/LiberationSerif
+@dirrm %%DATADIR%%/bitmaps/fonts/LiberationSans
+@dirrm %%DATADIR%%/bitmaps/fonts/LiberationMono
+@dirrm %%DATADIR%%/bitmaps/fonts/Kinnari
+@dirrm %%DATADIR%%/bitmaps/fonts/Garuda
+@dirrm %%DATADIR%%/bitmaps/fonts/FreeSerif
+@dirrm %%DATADIR%%/bitmaps/fonts/FreeSans
+@dirrm %%DATADIR%%/bitmaps/fonts/FreeMono
+@dirrm %%DATADIR%%/bitmaps/fonts
@dirrm %%DATADIR%%/bitmaps/colorscales
@dirrm %%DATADIR%%/bitmaps
@dirrm %%DATADIR%%/apiFiles
@dirrm %%DATADIR%%
-@dirrm lib/tlp/view
-@dirrm lib/tlp/interactors
-@dirrm lib/tlp/glyphs
-@dirrm lib/tlp/python
-@dirrm lib/tlp
+@dirrm lib/tulip/view
+@dirrm lib/tulip/perspective
+@dirrm lib/tulip/interactor
+@dirrm lib/tulip/glyph
+@dirrm lib/tulip
+@dirrm lib/python
+@dirrm include/tulip2ogdf
@dirrm include/tulip/cxx
@dirrm include/tulip