crssync-install.patch

Etienne Tourigny, 2012-04-02 04:42 PM

Download (3.62 KB)

View differences:

debian/rules
30 30
	-D WITH_SPATIALITE=TRUE \
31 31
	-D WITH_MAPSERVER=TRUE \
32 32
	-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
33
	-D WITH_APIDOC=TRUE
33
	-D WITH_APIDOC=TRUE \
34
	-D CRS_SYNC=FALSE
34 35

  
35 36
ifneq (,$(findstring $(DISTRIBUTION),"lenny squeeze lucid maverick natty oneiric"))
36 37
	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
......
89 90

  
90 91
debian/build/CMakeCache.txt: $(TEMPLATES) CMakeLists.txt
91 92
	dh_testdir
92
	# Add here commands to configure the package.
93
# Add here commands to configure the package.
93 94
	[ -d debian/build ] || mkdir debian/build
94 95
	[ ! -e CMakeCache.txt ] || rm CMakeCache.txt
95 96
	cd debian/build; cmake $(CMAKE_OPTS) ../..
......
99 100
build-stamp: debian/build/CMakeCache.txt
100 101
	dh_testdir
101 102

  
102
	# Add here commands to compile the package.
103
# Add here commands to compile the package.
103 104
	$(MAKE) -C debian/build
104 105

  
105 106
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
106
	# Code to run the package test suite - and ignore the outcome for now
107
# Code to run the package test suite - and ignore the outcome for now
107 108
	LD_LIBRARY_PATH=$(PWD)/debian/build/output/lib:$(LD_LIBRARY_PATH) $(MAKE) -C debian/build test || true
108 109
endif
109 110

  
......
120 121
	rm -f i18n/*.qm
121 122
	rm -rf debian/tmp
122 123

  
123
	# Add here commands to clean up after the build process.
124
# Add here commands to clean up after the build process.
124 125
	rm -rf debian/build
125 126

  
126 127
	dh_clean
......
131 132
	dh_prep
132 133
	dh_installdirs
133 134

  
134
	# Add here commands to install the package into debian/tmp.
135
# Add here commands to install the package into debian/tmp.
135 136
	$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp
136 137

  
137
	# remove unwanted files
138
# remove unwanted files
138 139
	rm debian/tmp/usr/share/qgis/doc/api/installdox
139 140
	! [ -f debian/tmp/usr/share/qgis/doc/api/jquery.js ] || rm debian/tmp/usr/share/qgis/doc/api/jquery.js
140 141

  
141
	# Install menu pixmap
142
# Install menu pixmap
142 143
	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
143 144
	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
144 145
	install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps
......
164 165
	install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
165 166
	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
166 167
	install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
167
	
168

  
168 169
ifneq (,$(findstring $(DISTRIBUTION),"wheezy sid"))
169 170
	dh_python2 --no-guessing-versions
170 171
else
resources/CMakeLists.txt
1
# should we run crssync - this should be disabled in a package build (e.g. debian) and run in the postinst scripts instead
2
SET (CRS_SYNC TRUE CACHE BOOL "Perform CRS synchronization after installation of resource files")
3

  
1 4
INSTALL(FILES srs.db qgis.db qgis_help.db symbology-ng-style.xml spatialite.db customization.xml
2 5
        DESTINATION ${QGIS_DATA_DIR}/resources)
3 6

  
7
IF(CRS_SYNC)
8
  INSTALL(CODE "MESSAGE(\"Performing CRS synchronization with ${CMAKE_INSTALL_PREFIX}/${QGIS_LIBEXEC_DIR}/crssync ...\")")
9
  INSTALL(CODE "EXECUTE_PROCESS(COMMAND ${CMAKE_INSTALL_PREFIX}/${QGIS_LIBEXEC_DIR}/crssync)")
10
ENDIF(CRS_SYNC)
11

  
4 12
ADD_SUBDIRECTORY(context_help)
5 13
ADD_SUBDIRECTORY(function_help)