patch_for_bug_1028.txt

patch to fix debian packaging problems. - Jürgen Fischer, 2008-04-13 11:35 AM

Download (27.4 KB)

 
1 
Index: python/plugins/plugin_installer/qgis_plugins.py
2 
===================================================================
3 
--- python/plugins/plugin_installer/qgis_plugins.py	(revision 8346)
4 
+++ python/plugins/plugin_installer/qgis_plugins.py	(working copy)
5 
@@ -1,4 +1,3 @@
6 
-#!/usr/bin/env python
7 
 """
8 
 qgis_plugins.py
9 
 author: Matthew Perry
10 
Index: debian/qgis.postrm.debhelper
11 
===================================================================
12 
--- debian/qgis.postrm.debhelper	(revision 8346)
13 
+++ debian/qgis.postrm.debhelper	(working copy)
14 
@@ -1,3 +0,0 @@
15 
-# Automatically added by dh_installmenu
16 
-if [ -x "`which update-menus 2>/dev/null`" ]; then update-menus ; fi
17 
-# End automatically added section
18 
Index: debian/control
19 
===================================================================
20 
--- debian/control	(revision 8346)
21 
+++ debian/control	(working copy)
22 
@@ -12,7 +12,7 @@
23
24 
 Package: qgis
25 
 Architecture: any
26 
-Depends: ${shlibs:Depends}, ${misc:Depends}, libqgis1
27 
+Depends: ${shlibs:Depends}, ${misc:Depends}, libqgis-core0.9, libqgis-gui0.9
28 
 Suggests: qgis-plugin-grass, python, python-qt4, python-sip4
29 
 Description: Geographic Information System (GIS)
30 
  A Geographic Information System (GIS) manages,
31 
@@ -28,22 +28,39 @@
32 
  .
33 
   Home page: http://qgis.org/
34
35 
-Package: libqgis1
36 
+Package: libqgis-core0.9
37 
 Architecture: any
38 
 Depends: ${shlibs:Depends}, ${misc:Depends}
39 
 Replaces: qgis (<=0.9.2rc1)
40 
+Conflicts: libqgis1
41 
 Description: QGIS Geographic Information System - shared library
42 
  QGIS is a Geographic Information System (GIS)
43 
  which manages, analyzes and display databases of
44 
  geographic information.
45 
  .
46 
- This package contains the shared library that
47 
+ This package contains the shared core library that
48 
  provides an interface for plugins.
49 
  .
50 
   Home page: http://qgis.org/
51
52 
+Package: libqgis-gui0.9
53 
+Architecture: any
54 
+Depends: ${shlibs:Depends}, ${misc:Depends}
55 
+Replaces: qgis (<=0.9.2rc1)
56 
+Conflicts: libqgis1
57 
+Description: QGIS Geographic Information System - shared library
58 
+ QGIS is a Geographic Information System (GIS)
59 
+ which manages, analyzes and display databases of
60 
+ geographic information.
61 
+ .
62 
+ This package contains the shared gui library that
63 
+ provides an interface for plugins.
64 
+ .
65 
+  Home page: http://qgis.org/
66 
+
67 
 Package: libqgis1-dev
68 
 Architecture: any
69 
+Section: libdevel
70 
 Depends: qgis (= ${Source-Version}), libgdal1-dev | libgdal1-1.3.2-dev , libpq-dev | postgresql-dev, libgeos-dev (>= 2.0.1-1), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.0.0), python-qt4-dev (>=4.0.0), qt4-designer (>=4.2.0)
71 
 Provides: libqgis-dev
72 
 Conflicts: libqgis-dev, qgis-dev
73 
@@ -61,9 +78,23 @@
74
75 
 Package: qgis-plugin-grass
76 
 Architecture: any
77 
-Depends: qgis (= ${Source-Version}), libgdal1-1.4.0-grass | libgdal1-1.3.2-grass
78 
+Depends: qgis (= ${Source-Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.4.0-grass | libgdal1-1.3.2-grass, libqgisgrass0.9
79 
 Description: Plugin for accessing GRASS data from QGIS
80 
  This plugin enables a GRASS data access toolbox in the QGIS
81 
  geographic data viewer.
82 
  .
83 
   Home page: http://qgis.org/
84 
+
85 
+Package: libqgisgrass0.9
86 
+Architecture: any
87 
+Depends: ${shlibs:Depends}, ${misc:Depends}
88 
+Replaces: qgis (<=0.9.2rc1)
89 
+Description: QGIS Geographic Information System - shared library
90 
+ QGIS is a Geographic Information System (GIS)
91 
+ which manages, analyzes and display databases of
92 
+ geographic information.
93 
+ .
94 
+ This package contains the shared library for the grass plugin.
95 
+ .
96 
+  Home page: http://qgis.org/
97 
+
98 
Index: debian/libqgis1.install
99 
===================================================================
100 
--- debian/libqgis1.install	(revision 8346)
101 
+++ debian/libqgis1.install	(working copy)
102 
@@ -1,5 +0,0 @@
103 
-#usr/lib/libqgis_composer.so*
104 
-usr/lib/libqgis_core.so*
105 
-/usr/lib/libqgis_gui.so
106 
-#usr/lib/libqgis_legend.so*
107 
-#usr/lib/libqgis_raster.so*
108 
Index: debian/qgis-plugin-grass.install
109 
===================================================================
110 
--- debian/qgis-plugin-grass.install	(revision 8346)
111 
+++ debian/qgis-plugin-grass.install	(working copy)
112 
@@ -1,4 +1,3 @@
113 
-usr/lib/libqgisgrass.so*
114 
 usr/lib/qgis/libgrassplugin.so
115 
 usr/lib/qgis/libgrassprovider.so
116 
 usr/share/qgis/grass/*
117 
Index: debian/libqgisgrass0.9.install
118 
===================================================================
119 
--- debian/libqgisgrass0.9.install	(revision 0)
120 
+++ debian/libqgisgrass0.9.install	(revision 0)
121 
@@ -0,0 +1 @@
122 
+usr/lib/libqgisgrass.so.*
123 
Index: debian/changelog
124 
===================================================================
125 
--- debian/changelog	(revision 8346)
126 
+++ debian/changelog	(working copy)
127 
@@ -1,3 +1,9 @@
128 
+qgis (0.9.2test2) unstable; urgency=low
129 
+
130 
+  * fixed various packaging bugs
131 
+
132 
+ -- J?rgen E. Fischer <[email protected]>  Sun, 13 Apr 2008 03:51:14 +0200
133 
+
134 
 qgis (0.9.2test1) gutsy; urgency=low
135
136 
   * Testing package to see if icons deploy
137 
Index: debian/rules
138 
===================================================================
139 
--- debian/rules	(revision 8346)
140 
+++ debian/rules	(working copy)
141 
@@ -29,8 +29,11 @@
142 
 	dh_testdir
143 
 	# Add here commands to configure the package.
144 
 	uudecode -o $(CURDIR)/src/plugins/georeferencer/pencil.png $(CURDIR)/debian/pencil.uu
145 
-	cmake -D CMAKE_INSTALL_PREFIX=/usr \
146 
-        .
147 
+	cmake \
148 
+		-D CMAKE_INSTALL_PREFIX=/usr \
149 
+		-D CMAKE_SKIP_RPATH=TRUE \
150 
+		-D BINDINGS_GLOBAL_INSTALL=TRUE \
151 
+	        .
152
153 
 build: patch build-stamp
154
155 
@@ -69,7 +72,7 @@
156
157 
 	# Install menu pixmap
158 
 	install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
159 
-	install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-icon.png
160 
+	install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis-icon.xpm
161
162 
 # Build architecture-independent files here.
163 
 binary-indep: build install
164 
@@ -86,8 +89,8 @@
165 
 	dh_installmenu
166 
 	dh_icons
167 
 	dh_desktop
168 
-	dh_installman -pqgis debian/gridmaker.1
169 
-	dh_installman -plibqgis1-dev debian/qgis-config.1
170 
+	dh_installman -pqgis qgis.man
171 
+	dh_installman -pqgis qgis_help.man
172 
 	dh_installmime -pqgis
173 
 	dh_link
174 
 	dh_strip
175 
@@ -95,7 +98,7 @@
176 
 	dh_fixperms
177 
 	dh_makeshlibs
178 
 	dh_installdeb
179 
-	dh_shlibdeps
180 
+	dh_shlibdeps  -Llibqgis_core -l/usr/lib
181 
 	dh_gencontrol
182 
 	dh_md5sums
183 
 	dh_builddeb
184 
Index: debian/qgis-icon.xpm
185 
===================================================================
186 
--- debian/qgis-icon.xpm	(revision 0)
187 
+++ debian/qgis-icon.xpm	(revision 0)
188 
@@ -0,0 +1,170 @@
189 
+/* XPM */
190 
+static char *qgis_icon[] = {
191 
+/* columns rows colors chars-per-pixel */
192 
+"32 32 132 2",
193 
+"   c #070C05",
194 
+".  c #0B2605",
195 
+"X  c #072E01",
196 
+"o  c #0A2F04",
197 
+"O  c #063300",
198 
+"+  c #083602",
199 
+"@  c #1F3E11",
200 
+"#  c #203115",
201 
+"$  c #0A4301",
202 
+"%  c #094A00",
203 
+"&  c #1A4A0D",
204 
+"*  c #095100",
205 
+"=  c #0A5B00",
206 
+"-  c #1C550D",
207 
+";  c #1E4810",
208 
+":  c #31431F",
209 
+">  c #0B6300",
210 
+",  c #0C6A00",
211 
+"<  c #156707",
212 
+"1  c #1C660B",
213 
+"2  c #1A6A09",
214 
+"3  c #0E7400",
215 
+"4  c #0F7B00",
216 
+"5  c #147605",
217 
+"6  c #147A04",
218 
+"7  c #187D07",
219 
+"8  c #20720F",
220 
+"9  c #266614",
221 
+"0  c #267B11",
222 
+"q  c #327A1A",
223 
+"w  c #364E21",
224 
+"e  c #44472C",
225 
+"r  c #505334",
226 
+"t  c #555837",
227 
+"y  c #5C5F3C",
228 
+"u  c #426E26",
229 
+"i  c #427F26",
230 
+"p  c #47722B",
231 
+"a  c #646740",
232 
+"s  c #6C6F48",
233 
+"d  c #717549",
234 
+"f  c #74794A",
235 
+"g  c #797E4E",
236 
+"h  c #7B7E51",
237 
+"j  c #7C7E5B",
238 
+"k  c #0F8001",
239 
+"l  c #118401",
240 
+"z  c #118A01",
241 
+"x  c #1A8C07",
242 
+"c  c #1C8109",
243 
+"v  c #1C8B09",
244 
+"b  c #2D8E15",
245 
+"n  c #2F9315",
246 
+"m  c #549431",
247 
+"M  c #67903F",
248 
+"N  c #53A62F",
249 
+"B  c #60A738",
250 
+"V  c #6A8F41",
251 
+"C  c #728D47",
252 
+"Z  c #78914F",
253 
+"A  c #7E8251",
254 
+"S  c #7DAD57",
255 
+"D  c #7CB255",
256 
+"F  c #808352",
257 
+"G  c #858A56",
258 
+"H  c #91975E",
259 
+"J  c #959D5F",
260 
+"K  c #83AD51",
261 
+"L  c #90A75C",
262 
+"P  c #94A85E",
263 
+"I  c #969A60",
264 
+"U  c #9EA266",
265 
+"Y  c #95A866",
266 
+"T  c #9BAC62",
267 
+"R  c #A2AA69",
268 
+"E  c #A1B866",
269 
+"W  c #A6B36A",
270 
+"Q  c #ACB26F",
271 
+"!  c #A9AD73",
272 
+"~  c #ACB672",
273 
+"^  c #B1B477",
274 
+"/  c #B7BE77",
275 
+"(  c #B8BE76",
276 
+")  c #B9BF79",
277 
+"_  c #B9C476",
278 
+"`  c #BCC47A",
279 
+"'  c #BCCD79",
280 
+"]  c #C3CB7D",
281 
+"[  c #BCBF86",
282 
+"{  c #B9C887",
283 
+"}  c #BEC98B",
284 
+"|  c #C1C483",
285 
+" . c #C7CE80",
286 
+".. c #C8CF80",
287 
+"X. c #C4CA8D",
288 
+"o. c #CCD383",
289 
+"O. c #C7DC80",
290 
+"+. c #D0D786",
291 
+"@. c #D2DB87",
292 
+"#. c #D2D788",
293 
+"$. c #D4DC88",
294 
+"%. c #C6C792",
295 
+"&. c #D1D396",
296 
+"*. c #D9DE93",
297 
+"=. c #DCDE9B",
298 
+"-. c #DCE38D",
299 
+";. c #DEE491",
300 
+":. c #DEE19B",
301 
+">. c #E4EC93",
302 
+",. c #E4E69D",
303 
+"<. c #E7E89E",
304 
+"1. c #E8E99C",
305 
+"2. c #EAF296",
306 
+"3. c #EDF599",
307 
+"4. c #F1F69D",
308 
+"5. c #F5F99F",
309 
+"6. c #D5D6A0",
310 
+"7. c #DADBA2",
311 
+"8. c #ECEEA1",
312 
+"9. c #E2E4AD",
313 
+"0. c #EEF2A3",
314 
+"q. c #F2F7A3",
315 
+"w. c #F5F9A3",
316 
+"e. c #FAFCA4",
317 
+"r. c #F2F5AB",
318 
+"t. c #F7FBAA",
319 
+"y. c #F9FAAC",
320 
+"u. c #F9FCB1",
321 
+"i. c #F3F4BA",
322 
+"p. c #FAFBBB",
323 
+"a. c #FCFCC4",
324 
+"s. c None",
325 
+/* pixels */
326 
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.l s.s.s.s.s.s.",
327 
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.z z 4 s.s.s.s.s.s.",
328 
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.z z z 3 s.s.s.s.s.s.",
329 
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.4 z z z 4 3 = s.s.s.s.s.s.",
330 
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.< , 4 3 , * s.s.s.s.s.s.",
331 
+"s.s.s.s.s.s.s.s.s.s.s.s.s.9.6.%.&.=.:.Z 9 = 3 , > % s.s.s.s.s.s.",
332 
+"s.s.s.s.s.s.s.s.s.s.a.p.u.! h s.s.` ;.O.N l 4 > * O s.s.s.s.s.s.",
333 
+"s.s.s.s.s.s.s.s.s.a.u.0.;.s s.s.s.s.' B n l 1 $ X s.s.s.s.s.s.s.",
334 
+"s.s.s.s.s.s.s.s.p.p.w.>.o.e s.s.s.s.K n v c u w s.s.s.s.s.s.s.s.",
335 
+"s.s.s.s.s.s.s.a.p.w.3.$.Q s.s.s.s.s.5 z 7 q J H s.s.s.s.s.s.s.s.",
336 
+"s.s.s.s.s.s.s.u.t.3.2.o.H s.s.s.s.l l l i C o.o.` s.s.s.s.s.s.s.",
337 
+"s.s.s.s.s.s.p.y.w.3.2.o.G s.s.s.s.l l 0 M T >.-. .s.s.s.s.s.s.s.",
338 
+"s.s.s.s.s.s.p.w.4.3.2...g s.s.s.4 l x p T o.3.>.+.s.s.s.s.s.s.s.",
339 
+"s.s.s.s.s.s.u.4.3.3.2...d s.s.3 z 3 2 U o.>[email protected] s.s.s.s.s.s.",
340 
+"s.s.s.s.s.s.y.4.3.3.2...d s.s.k l , - | ;[email protected] s.s.s.s.s.s.",
341 
+"s.s.s.s.s.s.e.4.3.3.2...d s.6 z 4 * # 1.3.3.3.2.$.G s.s.s.s.s.s.",
342 
+"s.s.s.s.s.s.w.3.3.3.2.] f 5 l x + s.s.y.4.3.3.2.o.d s.s.s.s.s.s.",
343 
+"[email protected] S D D Y ~ s.y.4.3.3.>...y s.s.s.s.s.s.",
344 
+"s.s.s.s.s.s.2.2.3.3.2.-.` { } X.,.<.8.y.q.3.3.-.` e s.s.s.s.s.s.",
345 
+"s.s.s.s.s.s.s.>[email protected] & o   I #.5.w.3.3.2.] U s.s.s.s.s.s.s.",
346 
+"s.s.s.s.s.s.s.-.>.2.2.-._ @ . s.s.>.5.3.3.2.-.U f s.s.s.s.s.s.s.",
347 
+"s.s.s.s.s.s.s.] @.>.2.-.o.: s.s.s.4.w.3.2.>.o.A s.s.s.s.s.s.s.s.",
348 
+"s.s.s.s.s.s.s.s.L o.>.>.>.A s.s.s.w.w.3.>.o.g s.s.s.s.s.s.s.s.s.",
349 
+"s.s.s.s.s.s.z x b m E ] -.] / s.s.q.w.3.o.~ s.s.s.s.s.s.s.s.s.s.",
350 
+"s.s.s.s.s.s.4 4 6 8 V P ] ] ) s.7.8.w.3.o.Q s.s.s.s.s.s.s.s.s.s.",
351 
+"s.s.s.s.s.s.$ $ % = % ; t G U ^ [ *.4.3.-.] s.s.s.i.j s.s.s.s.s.",
352 
+"s.s.s.s.s.s.s.s.s.= $ s.s.s.s.s.s.-.3.3.>.>.3.r.:.! s.s.s.s.s.s.",
353 
+"s.s.s.s.s.s.s.s.s.> $ s.s.s.s.s.s.+.-.>.>.>.3.*.| h s.s.s.s.s.s.",
354 
+"s.s.s.s.s.s.s.s.s.> s.s.s.s.s.s.s.s.( $.-.-.$.R F s.s.s.s.s.s.s.",
355 
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.a a r s.s.s.s.s.s.s.s.s.",
356 
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.",
357 
+"s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s.s."
358 
+};
359 
Index: debian/libqgis1-dev.install
360 
===================================================================
361 
--- debian/libqgis1-dev.install	(revision 8346)
362 
+++ debian/libqgis1-dev.install	(working copy)
363 
@@ -1,22 +1 @@
364 
-#usr/bin/qgis-config
365 
-#usr/lib/libqgis*a
366 
 usr/include/qgis/*
367 
-#usr/share/aclocal/qgis.m4
368 
-#usr/lib/qgis/copyrightlabelplugin.a
369 
-#usr/lib/qgis/libqgsprojectionselector.a
370 
-#usr/lib/qgis/delimitedtextplugin.a
371 
-#usr/lib/qgis/northarrowplugin.a
372 
-#usr/lib/qgis/delimitedtextprovider.a
373 
-#usr/lib/qgis/ogrprovider.a
374 
-#usr/lib/qgis/georefplugin.a
375 
-#usr/lib/qgis/pggeoprocessingplugin.a
376 
-#usr/lib/qgis/gpsimporterplugin.a
377 
-#usr/lib/qgis/postgresprovider.a
378 
-#usr/lib/qgis/gpxprovider.a
379 
-#usr/lib/qgis/scalebarplugin.a
380 
-#usr/lib/qgis/grassplugin.a
381 
-#usr/lib/qgis/spitplugin.a
382 
-#usr/lib/qgis/grassprovider.a
383 
-#usr/lib/qgis/wmsprovider.a
384 
-#usr/lib/qgis/gridmakerplugin.a
385 
-
386 
Index: debian/qgis.1
387 
===================================================================
388 
--- debian/qgis.1	(revision 8346)
389 
+++ debian/qgis.1	(working copy)
390 
@@ -1,35 +0,0 @@
391 
-.\"                                      Hey, EMACS: -*- nroff -*-
392 
-.\" First parameter, NAME, should be all caps
393 
-.\" Second parameter, SECTION, should be 1-8, maybe w/ subsection
394 
-.\" other parameters are allowed: see man(7), man(1)
395 
-.TH QGIS 1 "Januray 6, 2004"
396 
-.\" Please adjust this date whenever revising the manpage.
397 
-.\"
398 
-.\" Some roff macros, for reference:
399 
-.\" .nh        disable hyphenation
400 
-.\" .hy        enable hyphenation
401 
-.\" .ad l      left justify
402 
-.\" .ad b      justify to both left and right margins
403 
-.\" .nf        disable filling
404 
-.\" .fi        enable filling
405 
-.\" .br        insert line break
406 
-.\" .sp <n>    insert n+1 empty lines
407 
-.\" for manpage-specific macros, see man(7)
408 
-.SH NAME
409 
-qgis \- geographic data viewer
410 
-.SH SYNOPSIS
411 
-.B qgis [project-file.qgs] | [shapefile.shp] [raster-file.tif] ...
412 
-.br
413 
-.SH DESCRIPTION
414 
-This manual page documents briefly the
415 
-.B qgis
416 
-command.
417 
-This manual page was written for the Debian distribution
418 
-because the original program does not have a manual page.
419 
-.PP
420 
-\fBqgis\fP displays shapefiles, georeferenced raster files, and digital elevation models. You can specify a QGIS project file on the command line to be displayed at startup. Or you can specify a combination of multiple shapefiles and/or raster files to be displayed at startup.
421 
-.SH SEE ALSO
422 
-HTML and PDF documentation in /usr/share/doc/qgis and at http://qgis.sourceforge.net/docs/
423 
-.SH AUTHOR
424 
-This manual page was written by Steve Halasz <[email protected]>,
425 
-for the Debian project (but may be used by others).
426 
Index: debian/gridmaker.1
427 
===================================================================
428 
--- debian/gridmaker.1	(revision 8346)
429 
+++ debian/gridmaker.1	(working copy)
430 
@@ -1,11 +0,0 @@
431 
-.TH gridmaker 1 "August 2004" "gridmaker" "User Commands"
432 
-.SH NAME
433 
-gridmaker \- Graticule builder
434 
-.SH SYNOPSIS
435 
-.PP
436 
-.B gridmaker
437 
-[OPTIONS]
438 
-.SH DESCRIPTION
439 
-.PP
440 
-The \fIgridmaker\fP qgis plugin will help you to build a graticule shapefile
441 
-that you can use as an overlay within your qgis map viewer.
442 
Index: debian/qgis-config.1
443 
===================================================================
444 
--- debian/qgis-config.1	(revision 8346)
445 
+++ debian/qgis-config.1	(working copy)
446 
@@ -1,44 +0,0 @@
447 
-.TH qgis-config 1 "August 2004" "qgis-config" "User Commands"
448 
-.SH NAME
449 
-qgis-config \- returns information about installed qgis libraries and binaries
450 
-.SH SYNOPSIS
451 
-.PP
452 
-.B qgis-config
453 
-[OPTIONS]
454 
-.SH DESCRIPTION
455 
-.PP
456 
-The \fIqgis-config\fP shell script is designed to retrieve the
457 
-configuration information about the libraries and binaries dealing with
458 
-QGIS
459 
-
460 
-.SH OPTIONS
461 
-.TP
462 
-\fB\-\-cflags\fR
463 
-print the prefix used by qgis
464 
-.TP
465 
-\fB\-\-bindir\fR
466 
-print destination of executable(s)
467 
-.TP
468 
-\fB\-\-cflags\fR
469 
-print the compiler flags that are necessary to compile a
470 
-plug-inshow location of C++ header files
471 
-.TP
472 
-\fB\-\-libs\fR
473 
-print the linker flags that are necessary to link a plug-in
474 
-.TP
475 
-\fB\-\-plugindir\fR
476 
-print the path where the plugins are installed
477 
-.TP
478 
-\fB\-\-major_version\fR
479 
-print major version of qgis
480 
-.TP
481 
-\fB\-\-minor_version\fR
482 
-print minor version of qgis
483 
-.TP
484 
-\fB\-\-micro_version\fR
485 
-print micro version of qgis
486 
-.TP
487 
-\fB\-\-extra_version\fR
488 
-print extra version of qgis
489 
-\fB\-\-help\fR
490 
-show help, then exit
491 
Index: debian/qgis.menu
492 
===================================================================
493 
--- debian/qgis.menu	(revision 8346)
494 
+++ debian/qgis.menu	(working copy)
495 
@@ -1,3 +1,3 @@
496 
-?package(qgis):needs="X11" section="Apps"\
497 
-  icon="/usr/share/pixmaps/qgis-icon.png" title="QGIS"\
498 
+?package(qgis):needs="X11" section="Applications/Science/Geoscience"\
499 
+  icon="/usr/share/pixmaps/qgis-icon.xpm" title="Quantum GIS"\
500 
   command="/usr/bin/qgis"
501 
Index: debian/copyright
502 
===================================================================
503 
--- debian/copyright	(revision 8346)
504 
+++ debian/copyright	(working copy)
505 
@@ -2,19 +2,23 @@
506 
 Wed, 31 Dec 2003 10:07:40 -0500.
507
508 
 It was downloaded from:
509 
- http://qgis.sourceforge.net/downloads.html
510 
+ https://svn.osgeo.org/qgis/trunk/qgis
511
512 
 The upstream contributors are listed in the AUTHORS file.
513 
+
514 
+Copyright:
515 
+
516 
+  (C) 2008 the authors
517
518 
-This program is free software; you can redistribute it and/or
519 
-modify it under the terms of the GNU General Public License as
520 
-published by the Free Software Foundation; either version 2 of
521 
-the License, or (at your option) any later version.
522 
+  This program is free software; you can redistribute it and/or
523 
+  modify it under the terms of the GNU General Public License as
524 
+  published by the Free Software Foundation; either version 2 of
525 
+  the License, or (at your option) any later version.
526
527 
-This program is distributed in the hope that it will be useful,
528 
-but WITHOUT ANY WARRANTY; without even the implied warranty of
529 
-MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
530 
-GNU General Public License for more details.
531 
+  This program is distributed in the hope that it will be useful,
532 
+  but WITHOUT ANY WARRANTY; without even the implied warranty of
533 
+  MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
534 
+  GNU General Public License for more details.
535
536 
-On Debian systems, the complete text of the GNU General Public
537 
-License can be found in the /usr/share/common-licenses/GPL file.
538 
+  On Debian systems, the complete text of the GNU General Public
539 
+  License can be found in the /usr/share/common-licenses/GPL file.
540 
Index: debian/qgis.install
541 
===================================================================
542 
--- debian/qgis.install	(revision 8346)
543 
+++ debian/qgis.install	(working copy)
544 
@@ -1,29 +1,31 @@
545 
-#usr/bin/gridmaker
546 
 usr/bin/qgis
547 
 usr/bin/qgis_help
548 
+usr/share/qgis/doc/AUTHORS usr/share/qgis/doc/SPONSORS usr/share/qgis/doc/CODING usr/share/qgis/doc/favicon.ico usr/share/qgis/doc/index.html usr/share/qgis/doc/qgisdoc.css usr/share/qgis/doc/userguide.pdf usr/share/qgis/doc/images usr/share/doc/qgis
549 
+usr/share/pixmaps/*
550 
+usr/share/qgis/i18n/*
551 
+usr/share/qgis/images/*
552 
+usr/share/qgis/python/*
553 
+usr/share/qgis/resources/*
554 
+usr/share/qgis/svg/*
555 
+usr/share/qgis/themes/*
556 
+usr/lib/python*/site-packages/qgis/__init__.py
557 
+usr/lib/python*/site-packages/qgis/qgisconfig.py
558 
+usr/lib/python*/site-packages/qgis/*.so
559 
 usr/lib/qgis/libcopyrightlabelplugin.so
560 
 usr/lib/qgis/libdelimitedtextplugin.so
561 
+usr/lib/qgis/libdelimitedtextprovider.so
562 
+#usr/lib/qgis/libdxf2shpconverterplugin.so
563 
 usr/lib/qgis/libgeorefplugin.so
564 
 usr/lib/qgis/libgpsimporterplugin.so
565 
 usr/lib/qgis/libgpxprovider.so
566 
 usr/lib/qgis/libgridmakerplugin.so
567 
-#usr/lib/qgis/liblauncherplugin.so
568 
 usr/lib/qgis/libnortharrowplugin.so
569 
 usr/lib/qgis/libogrprovider.so
570 
 usr/lib/qgis/libpggeoprocessingplugin.so
571 
 usr/lib/qgis/libpostgresprovider.so
572 
+usr/lib/qgis/libquickprintplugin.so
573 
 usr/lib/qgis/libscalebarplugin.so
574 
 usr/lib/qgis/libspitplugin.so
575 
 usr/lib/qgis/libwfsplugin.so
576 
 usr/lib/qgis/libwfsprovider.so
577 
 usr/lib/qgis/libwmsprovider.so
578 
-usr/share/qgis/doc/* usr/share/doc/qgis
579 
-#usr/share/man/*
580 
-usr/share/pixmaps/*
581 
-usr/share/qgis/doc/*
582 
-usr/share/qgis/i18n/*
583 
-usr/share/qgis/images/*
584 
-/usr/share/qgis/python/*
585 
-usr/share/qgis/resources/*
586 
-usr/share/qgis/svg/*
587 
-usr/share/qgis/themes/*
588 
Index: debian/libqgis-gui0.9.install
589 
===================================================================
590 
--- debian/libqgis-gui0.9.install	(revision 0)
591 
+++ debian/libqgis-gui0.9.install	(revision 0)
592 
@@ -0,0 +1 @@
593 
+usr/lib/libqgis_gui.so.*
594 
Index: debian/qgis-icon.png
595 
===================================================================
596 
Cannot display: file marked as a binary type.
597 
svn:mime-type = application/octet-stream
598 
Index: debian/libqgis-core0.9.install
599 
===================================================================
600 
--- debian/libqgis-core0.9.install	(revision 0)
601 
+++ debian/libqgis-core0.9.install	(revision 0)
602 
@@ -0,0 +1 @@
603 
+usr/lib/libqgis_core.so.*
604 
Index: debian/qgis.postinst.debhelper
605 
===================================================================
606 
--- debian/qgis.postinst.debhelper	(revision 8346)
607 
+++ debian/qgis.postinst.debhelper	(working copy)
608 
@@ -1,5 +0,0 @@
609 
-# Automatically added by dh_installmenu
610 
-if [ "$1" = "configure" ] && [ -x "`which update-menus 2>/dev/null`" ]; then
611 
-	update-menus
612 
-fi
613 
-# End automatically added section
614 
Index: qgis_help.man
615 
===================================================================
616 
--- qgis_help.man	(revision 0)
617 
+++ qgis_help.man	(revision 0)
618 
@@ -0,0 +1,15 @@
619 
+.TH QGIS_HELP 1 "April 13, 2008"
620 
+.SH NAME
621 
+qgis_help \- help viewer for qgis, the geographic data viewer
622 
+.SH SYNOPSIS
623 
+.B qgis_help [helpfile]
624 
+.br
625 
+.SH DESCRIPTION
626 
+.B qgis_help
627 
+is internally used by
628 
+.B qgis
629 
+to view help files.
630 
+.SH SEE ALSO
631 
+qgis(1)
632 
+.SH AUTHOR
633 
+This manual page was written by J?rgen Fischer <[email protected]>.
634 
Index: src/plugins/CMakeLists.txt
635 
===================================================================
636 
--- src/plugins/CMakeLists.txt	(revision 8346)
637 
+++ src/plugins/CMakeLists.txt	(working copy)
638 
@@ -19,4 +19,5 @@
639 
 INSTALL(FILES qgisplugin.h qgsrendererplugin.h DESTINATION ${QGIS_INCLUDE_DIR})
640
641 
 SUBDIRS (quick_print)
642 
+#SUBDIRS (dxf2shp_converter)
643
644 
Index: src/gui/CMakeLists.txt
645 
===================================================================
646 
--- src/gui/CMakeLists.txt	(revision 8346)
647 
+++ src/gui/CMakeLists.txt	(working copy)
648 
@@ -65,6 +65,10 @@
649
650 
 ADD_LIBRARY(qgis_gui SHARED ${QGIS_GUI_SRCS} ${QGIS_GUI_MOC_SRCS})
651
652 
+SET_TARGET_PROPERTIES(qgis_gui PROPERTIES
653 
+			VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
654 
+			SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
655 
+
656 
 # make sure that UI files will be processed first
657 
 ADD_DEPENDENCIES(qgis_gui ui)
658
659 
Index: src/core/CMakeLists.txt
660 
===================================================================
661 
--- src/core/CMakeLists.txt	(revision 8346)
662 
+++ src/core/CMakeLists.txt	(working copy)
663 
@@ -112,7 +112,6 @@
664 
   renderer
665 
   symbology
666 
   spatialindex/include
667 
-  ${QT_QTSVG_INCLUDE_DIR}
668 
   ${PROJ_INCLUDE_DIR}
669 
   ${GEOS_INCLUDE_DIR}
670 
   ${GDAL_INCLUDE_DIR}
671 
@@ -159,6 +158,10 @@
672
673 
 ADD_LIBRARY(qgis_core SHARED ${QGIS_CORE_SRCS} ${QGIS_CORE_MOC_SRCS} ${INDEX_SRC})
674
675 
+SET_TARGET_PROPERTIES(qgis_core PROPERTIES
676 
+			VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
677 
+			SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
678 
+
679 
 # make sure to create qgssvnversion.h before compiling
680 
 ADD_DEPENDENCIES(qgis_core svnversion)
681
682 
Index: src/providers/grass/CMakeLists.txt
683 
===================================================================
684 
--- src/providers/grass/CMakeLists.txt	(revision 8346)
685 
+++ src/providers/grass/CMakeLists.txt	(working copy)
686 
@@ -32,6 +32,10 @@
687
688 
 ADD_LIBRARY (qgisgrass SHARED ${GRASS_LIB_SRCS})
689
690 
+SET_TARGET_PROPERTIES(qgisgrass PROPERTIES
691 
+			VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}
692 
+			SOVERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR})
693 
+
694 
 IF (WIN32)
695 
   SET_TARGET_PROPERTIES(qgisgrass PROPERTIES COMPILE_FLAGS "\"-DGRASS_EXPORT=__declspec(dllexport)\"" )
696 
 ELSE (WIN32)
697 
Index: CMakeLists.txt
698 
===================================================================
699 
--- CMakeLists.txt	(revision 8346)
700 
+++ CMakeLists.txt	(working copy)
701 
@@ -1,5 +1,12 @@
702 
-PROJECT(qgis0.9.2)
703 
+SET(CPACK_PACKAGE_VERSION_MAJOR "0")
704 
+SET(CPACK_PACKAGE_VERSION_MINOR "9")
705 
+SET(CPACK_PACKAGE_VERSION_PATCH "2")
706
707 
+SET(PROJECT_VERSION ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}.${CPACK_PACKAGE_VERSION_PATCH})
708 
+
709 
+PROJECT(qgis${PROJECT_VERSION})
710 
+
711 
+
712 
 # TODO:
713 
 # - install includes for libs
714 
 # - nice output when configured
715 
@@ -164,10 +171,10 @@
716
717 
 IF (WIN32)
718 
   SET (DEFAULT_BIN_SUBDIR     .)
719 
-  SET (DEFAULT_LIB_SUBDIR     .)
720 
+  SET (DEFAULT_LIB_SUBDIR     lib)
721 
   SET (DEFAULT_DATA_SUBDIR    .)
722 
   SET (DEFAULT_PLUGIN_SUBDIR  plugins)
723 
-  SET (DEFAULT_INCLUDE_SUBDIR	include)
724 
+  SET (DEFAULT_INCLUDE_SUBDIR include)
725
726 
   IF (MSVC)
727 
     # Python parts need to be build with nmake not vcexpress
728 
@@ -178,12 +185,12 @@
729 
     # put all the build products into a single directory
730 
     # under build (doesnt affect install target) to make for
731 
     # easier debugging.
732 
-    SET(OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
733 
-    SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
734 
-    SET(LIBRARY_OUTPUT_PATH ${OUTPUT_DIR})
735 
+    # SET(OUTPUT_DIR ${CMAKE_CURRENT_SOURCE_DIR}/bin)
736 
+    # SET(EXECUTABLE_OUTPUT_PATH ${OUTPUT_DIR})
737 
+    # SET(LIBRARY_OUTPUT_PATH ${OUTPUT_DIR})
738 
     #tell msvc compiler to use main instead of winmain as the
739 
     #application entry point
740 
-    SET(QT_USE_QTMAIN TRUE)
741 
+    #SET(QT_USE_QTMAIN TRUE)
742 
     # Turn on defines for non standard maths stuff
743 
     ADD_DEFINITIONS(-D_USE_MATH_DEFINES)
744
745 
@@ -197,8 +204,9 @@
746 
     ADD_DEFINITIONS(-DW_OK=2)
747 
     ADD_DEFINITIONS(-DR_OK=4)
748
749 
-    FILE(GLOB files "${CMAKE_SOURCE_DIR}/win_build/vcdeps/*.*")
750 
-    INSTALL(FILES ${files} DESTINATION .)
751 
+    ADD_DEFINITIONS(-DQGISDEBUG=1)
752 
+
753 
+    INSTALL(DIRECTORY ${CMAKE_SOURCE_DIR}/win_build/vcdeps/. DESTINATION .)
754 
   ENDIF(MSVC)
755 
 ELSE (WIN32)
756
757 
@@ -258,11 +266,11 @@
758 
 MARK_AS_ADVANCED (QGIS_BIN_SUBDIR QGIS_LIB_SUBDIR QGIS_DATA_SUBDIR QGIS_PLUGIN_SUBDIR QGIS_INCLUDE_SUBDIR)
759
760 
 # full paths for the installation
761 
-SET (QGIS_BIN_DIR     ${CMAKE_INSTALL_PREFIX}/${QGIS_BIN_SUBDIR})
762 
-SET (QGIS_LIB_DIR     ${CMAKE_INSTALL_PREFIX}/${QGIS_LIB_SUBDIR})
763 
-SET (QGIS_DATA_DIR    ${CMAKE_INSTALL_PREFIX}/${QGIS_DATA_SUBDIR})
764 
-SET (QGIS_PLUGIN_DIR  ${CMAKE_INSTALL_PREFIX}/${QGIS_PLUGIN_SUBDIR})
765 
-SET (QGIS_INCLUDE_DIR ${CMAKE_INSTALL_PREFIX}/${QGIS_INCLUDE_SUBDIR})
766 
+SET (QGIS_BIN_DIR     ${QGIS_BIN_SUBDIR})
767 
+SET (QGIS_LIB_DIR     ${QGIS_LIB_SUBDIR})
768 
+SET (QGIS_DATA_DIR    ${QGIS_DATA_SUBDIR})
769 
+SET (QGIS_PLUGIN_DIR  ${QGIS_PLUGIN_SUBDIR})
770 
+SET (QGIS_INCLUDE_DIR ${QGIS_INCLUDE_SUBDIR})
771
772 
 # manual page - makes sense only on unix systems
773 
 IF (UNIX)
774 
@@ -348,16 +356,13 @@
775 
 INCLUDE(InstallRequiredSystemLibraries)
776
777 
 SET(CPACK_PACKAGE_DESCRIPTION_SUMMARY "Quantum GIS")
778 
-SET(CPACK_PACKAGE_VENDOR "Tim Sutton")
779 
+SET(CPACK_PACKAGE_VENDOR "Open Source Geospatial Foundation")
780 
 SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
781 
 SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
782 
-SET(CPACK_PACKAGE_VERSION_MAJOR "0")
783 
-SET(CPACK_PACKAGE_VERSION_MINOR "9")
784 
-SET(CPACK_PACKAGE_VERSION_PATCH "1")
785 
 SET(CPACK_PACKAGE_INSTALL_DIRECTORY "Quantum GIS ${CPACK_PACKAGE_VERSION_MAJOR}.${CPACK_PACKAGE_VERSION_MINOR}")
786 
 IF(WIN32 AND NOT UNIX)
787 
   # There is a bug in NSI that does not handle full unix paths properly. Make
788 
-  # sure there is at least one set of four (4) backlasshes.
789 
+  # sure there is at least one set of four (4) backslashes.
790 
   SET(CPACK_PACKAGE_ICON "${CMAKE_SOURCE_DIR}/win_build\\\\sidebar.bmp")
791 
   SET(CPACK_NSIS_INSTALLED_ICON_NAME "\\\\qgis.exe")
792 
   SET(CPACK_NSIS_DISPLAY_NAME "${CPACK_PACKAGE_INSTALL_DIRECTORY} Quantum GIS")
793 
@@ -373,4 +378,3 @@
794 
 ENDIF(WIN32 AND NOT UNIX)
795 
 SET(CPACK_PACKAGE_EXECUTABLES "qgis" "QGIS")
796 
 INCLUDE(CPack)
797 
-
798 
Index: qgis.man
799 
===================================================================
800 
--- qgis.man	(revision 8346)
801 
+++ qgis.man	(working copy)
802 
@@ -1,6 +1,6 @@
803 
-.TH "Quantum GIS" 1 "October 2004"
804 
+.TH QGIS 1 "April 13, 2008"
805 
 .SH NAME
806 
-Quantum GIS  \- A Geographic Information System
807 
+qgis \- Quantum GIS Geographic Information System
808 
 .SH SYNOPSIS
809 
 .B qgis [--snapshot
810 
 .I filename]
811 
@@ -11,6 +11,9 @@
812 
 .B "     [--project"
813 
 .I projectfile]
814 
 .br
815 
+.B "     [--extent"
816 
+.I xmin,ymin,xmax,ymax]
817 
+.br
818 
 .B "     [--help]"
819 
 .br
820 
 .B "     [file]..."