← Back to branch summary

~ubuntu-branches/ubuntu/precise/ginkgocadx/precise

« back to all changes in this revision

Viewing changes to debian/patches/do_not_install_to_usr_share.patch

  • Committer: Bazaar Package Importer
  • Author(s): Andreas Tille
  • Date: 2011-05-02 08:09:26 UTC
  • Revision ID: james.westby@ubuntu.com-20110502080926-tfd00s81ak843xk3
Tags: 2.4.1.1-1
http://bugs.debian.org/628106
Initial release (Closes: #628106)

Show diffs side-by-side

added added

removed removed

Lines of Context:
debian/patches/do_not_install_to_usr_share.patch
 
1
Index: ginkgocadx-2.4.1.1/src/cadxcore/CMakeLists.txt
 
2
===================================================================
 
3
--- ginkgocadx-2.4.1.1.orig/src/cadxcore/CMakeLists.txt 2011-05-01 12:39:24.000000000 +0200
 
4
+++ ginkgocadx-2.4.1.1/src/cadxcore/CMakeLists.txt      2011-05-11 13:24:21.000000000 +0200
 
5
@@ -120,9 +120,9 @@
 
6
        VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
 
7
        LINK_INTERFACE_LIBRARIES ""
 
8
        INSTALL_RPATH_USE_LINK_PATH TRUE )
 
9
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION share/ginkgocadx/bin)
 
10
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/ginkgocadxcore.mo DESTINATION share/ginkgocadx/bin/lang/es)
 
11
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/ginkgocadxcore.mo DESTINATION share/ginkgocadx/bin/lang/ja)
 
12
+INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx)
 
13
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/ginkgocadxcore.mo DESTINATION share/ginkgocadx/lang/es)
 
14
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/ginkgocadxcore.mo DESTINATION share/ginkgocadx/lang/ja)
 
15
 
 
16
 ################ LIBS ################
 
17
 
 
18
Index: ginkgocadx-2.4.1.1/src/cadxcore/main/entorno.cpp
 
19
===================================================================
 
20
--- ginkgocadx-2.4.1.1.orig/src/cadxcore/main/entorno.cpp       2011-05-01 12:39:25.000000000 +0200
 
21
+++ ginkgocadx-2.4.1.1/src/cadxcore/main/entorno.cpp    2011-05-11 13:24:21.000000000 +0200
 
22
@@ -116,16 +116,23 @@
 
23
        wxString pluginsDir;
 
24
        wxString langDir;
 
25
        
 
26
-       #if defined(_WINDOWS) || defined(LINUX)
 
27
+       #if defined(_WINDOWS)
 
28
                pluginsDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("Plugins");
 
29
                langDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("lang");
 
30
+       #elif defined(LINUX)
 
31
+               #if defined(CUSTOM_BUILD)
 
32
+                       pluginsDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("Plugins");
 
33
+                       langDir = executable_path.GetPath() + wxFileName::GetPathSeparator() + wxT("lang");
 
34
+               #else
 
35
+                       pluginsDir = wxStandardPaths::Get().GetPluginsDir() + wxFileName::GetPathSeparator() + wxT("Plugins");
 
36
+                       langDir = wxStandardPaths::Get().GetResourcesDir()  + wxFileName::GetPathSeparator() + wxT("lang");
 
37
+               #endif
 
38
                
 
39
        #else
 
40
                pluginsDir = wxStandardPaths::Get().GetPluginsDir();
 
41
                langDir = wxStandardPaths::Get().GetResourcesDir() + wxFileName::GetPathSeparator() + wxT("lang");
 
42
                
 
43
-       #endif
 
44
-       
 
45
+       #endif  
 
46
        
 
47
        
 
48
        m_GinkgoPluginsDir = TOPATH(pluginsDir);
 
49
Index: ginkgocadx-2.4.1.1/src/CMake/SysDefs.cmake
 
50
===================================================================
 
51
--- ginkgocadx-2.4.1.1.orig/src/CMake/SysDefs.cmake     2011-05-01 12:39:24.000000000 +0200
 
52
+++ ginkgocadx-2.4.1.1/src/CMake/SysDefs.cmake  2011-05-11 13:24:21.000000000 +0200
 
53
@@ -54,6 +54,9 @@
 
54
        IF (DEBUG)
 
55
                ADD_DEFINITIONS(-D_GINKGO_DEBUG -DVTK_DEBUG_LEAKS -DDEBUG -D__WXDEBUG__)
 
56
        ENDIF()
 
57
+       IF(CUSTOM_PACKAGE)
 
58
+               ADD_DEFINITIONS(-DCUSTOM_PACKAGE)
 
59
+       ENDIF()
 
60
 
 
61
        ADD_DEFINITIONS(-DUSING_EXTENSIONS -DGINKGO_ARCH_${ARCH})
 
62
        
 
63
Index: ginkgocadx-2.4.1.1/src/CMakeLists.txt
 
64
===================================================================
 
65
--- ginkgocadx-2.4.1.1.orig/src/CMakeLists.txt  2011-05-01 12:39:24.000000000 +0200
 
66
+++ ginkgocadx-2.4.1.1/src/CMakeLists.txt       2011-05-11 13:24:21.000000000 +0200
 
67
@@ -81,7 +81,7 @@
 
68
 ELSEIF(LINUX AND CUSTOM_PACKAGE)
 
69
        SET(GINKGO_PROJECT "ginkgo-${ARCH}" CACHE PARENT_SCOPE "")
 
70
 ELSE()
 
71
-       SET(GINKGO_PROJECT "ginkgo" CACHE PARENT_SCOPE "")
 
72
+       SET(GINKGO_PROJECT "ginkgocadx" CACHE PARENT_SCOPE "")
 
73
 ENDIF()
 
74
 
 
75
 SET(GINKGO_PLUGINS "" CACHE PARENT_SCOPE "")
 
76
Index: ginkgocadx-2.4.1.1/src/fooextension/CMakeLists.txt
 
77
===================================================================
 
78
--- ginkgocadx-2.4.1.1.orig/src/fooextension/CMakeLists.txt     2011-05-01 12:39:25.000000000 +0200
 
79
+++ ginkgocadx-2.4.1.1/src/fooextension/CMakeLists.txt  2011-05-11 13:24:21.000000000 +0200
 
80
@@ -33,11 +33,11 @@
 
81
 IF(LINUX AND NOT CUSTOM_PACKAGE)
 
82
        SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
 
83
        SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
 
84
-       SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
 
85
+       SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
 
86
        SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
87
-       LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin" isSystemDir)
 
88
+       LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx" isSystemDir)
 
89
        IF("${isSystemDir}" STREQUAL "-1")
 
90
-               SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
 
91
+               SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
 
92
        ENDIF()
 
93
 ENDIF()
 
94
 
 
95
@@ -47,7 +47,7 @@
 
96
        VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
 
97
        LINK_INTERFACE_LIBRARIES ""
 
98
        INSTALL_RPATH_USE_LINK_PATH TRUE )
 
99
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION share/ginkgocadx/bin/Plugins)
 
100
+INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx/Plugins)
 
101
 
 
102
 ################ LIBS ################
 
103
 
 
104
Index: ginkgocadx-2.4.1.1/src/ginkgo/CMakeLists.txt
 
105
===================================================================
 
106
--- ginkgocadx-2.4.1.1.orig/src/ginkgo/CMakeLists.txt   2011-05-01 12:39:25.000000000 +0200
 
107
+++ ginkgocadx-2.4.1.1/src/ginkgo/CMakeLists.txt        2011-05-11 13:24:21.000000000 +0200
 
108
@@ -11,11 +11,11 @@
 
109
 IF(LINUX AND NOT CUSTOM_PACKAGE)
 
110
        SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
 
111
        SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
 
112
-       SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
 
113
+       SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
 
114
        SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
115
-       LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin" isSystemDir)
 
116
+       LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx" isSystemDir)
 
117
        IF("${isSystemDir}" STREQUAL "-1")
 
118
-               SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
 
119
+               SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
 
120
        ENDIF()
 
121
 ENDIF()
 
122
 
 
123
@@ -23,9 +23,9 @@
 
124
 TARGET_LINK_LIBRARIES(${PROJECT_NAME} CADxCore)
 
125
 SET_TARGET_PROPERTIES(${PROJECT_NAME} PROPERTIES
 
126
        LINK_INTERFACE_LIBRARIES ""
 
127
-       CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
 
128
+       CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
 
129
 
 
130
-INSTALL(TARGETS ${PROJECT_NAME} DESTINATION share/ginkgocadx/bin)
 
131
+INSTALL(TARGETS ${PROJECT_NAME} DESTINATION bin)
 
132
 
 
133
 IF(USE_CUSTOM_WX)
 
134
         ADD_DEFINITIONS(${wxWidgets_defines})
 
135
Index: ginkgocadx-2.4.1.1/src/visualizator/CMakeLists.txt
 
136
===================================================================
 
137
--- ginkgocadx-2.4.1.1.orig/src/visualizator/CMakeLists.txt     2011-05-01 12:39:24.000000000 +0200
 
138
+++ ginkgocadx-2.4.1.1/src/visualizator/CMakeLists.txt  2011-05-11 13:24:21.000000000 +0200
 
139
@@ -52,11 +52,11 @@
 
140
 IF(LINUX AND NOT CUSTOM_PACKAGE)
 
141
        SET(CMAKE_SKIP_BUILD_RPATH  FALSE)
 
142
        SET(CMAKE_BUILD_WITH_INSTALL_RPATH FALSE) 
 
143
-       SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
 
144
+       SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
 
145
        SET(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
146
-       LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin" isSystemDir)
 
147
+       LIST(FIND CMAKE_PLATFORM_IMPLICIT_LINK_DIRECTORIES "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx" isSystemDir)
 
148
        IF("${isSystemDir}" STREQUAL "-1")
 
149
-               SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/share/ginkgocadx/bin")
 
150
+               SET(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_PREFIX}/lib/ginkgocadx")
 
151
        ENDIF()
 
152
 ENDIF()
 
153
 
 
154
@@ -66,9 +66,9 @@
 
155
        VERSION "${GINKGO_VERSION}" SOVERSION "${GINKGO_VERSION}"
 
156
        LINK_INTERFACE_LIBRARIES ""
 
157
        INSTALL_RPATH_USE_LINK_PATH TRUE )
 
158
-INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION share/ginkgocadx/bin/Plugins)
 
159
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/visualizator.mo DESTINATION share/ginkgocadx/bin/lang/es)
 
160
-INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/ja/visualizator.mo DESTINATION share/ginkgocadx/bin/lang/ja)
 
161
+INSTALL(TARGETS ${PROJECT_NAME} LIBRARY DESTINATION lib/ginkgocadx/Plugins)
 
162
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/es/visualizator.mo DESTINATION share/ginkgocadx/lang/es)
 
163
+INSTALL(FILES ${CMAKE_CURRENT_SOURCE_DIR}/lang/ja/visualizator.mo DESTINATION share/ginkgocadx/lang/ja)
 
164
 
 
165
 ################ LIBS ################
 
166