--- qgis-1.4.0+12730.orig/debian/python-qgis.install +++ qgis-1.4.0+12730/debian/python-qgis.install @@ -0,0 +1,3 @@ +usr/lib/python*/*-packages/qgis/*.py +usr/lib/python*/*-packages/qgis/*.so +usr/lib/libqgispython.so.1.4.0 --- qgis-1.4.0+12730.orig/debian/qgis.sh.in +++ qgis-1.4.0+12730/debian/qgis.sh.in @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ "$LD_LIBRARY_PATH" = "" ]; then + LD_LIBRARY_PATH=/usr/lib/{GRASS}/lib +else + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/{GRASS}/lib +fi + +export LD_LIBRARY_PATH + +exec $0.bin "$@" --- qgis-1.4.0+12730.orig/debian/python-qgis.lintian-overrides +++ qgis-1.4.0+12730/debian/python-qgis.lintian-overrides @@ -0,0 +1 @@ +python-qgis: package-name-doesnt-match-sonames --- qgis-1.4.0+12730.orig/debian/rules +++ qgis-1.4.0+12730/debian/rules @@ -0,0 +1,150 @@ +#!/usr/bin/make -f +# -*- makefile -*- + +# Uncomment this to turn on verbose mode. +#export DH_VERBOSE=1 + +# These are used for cross-compiling and for saving the configure script +# from having to guess our platform (since we know it already) +DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) +DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) + +QGIS_MAJOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MAJOR "\([0-9]*\)")/\1/p' CMakeLists.txt) +QGIS_MINOR=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_MINOR "\([0-9]*\)")/\1/p' CMakeLists.txt) +QGIS_PATCH=$(shell sed -ne 's/SET(CPACK_PACKAGE_VERSION_PATCH "\([0-9]*\)")/\1/p' CMakeLists.txt) +QGIS_ABI=$(QGIS_MAJOR).$(QGIS_MINOR).$(QGIS_PATCH) + +GRASS_ABI=$(subst .,,$(shell pkg-config --modversion grass|sed -e "s/\.//g" -e "s/RC/-/")) +GRASS=grass$(subst .,,$(shell pkg-config --modversion grass|cut -d. -f1,2)) + +CMAKE_OPTS = \ + -Wno-dev \ + -D GRASS_PREFIX=/usr/lib/$(GRASS) \ + -D CMAKE_INSTALL_PREFIX=/usr \ + -D CMAKE_SKIP_RPATH=TRUE \ + -D BINDINGS_GLOBAL_INSTALL=TRUE \ + -D PEDANTIC=TRUE \ + -D WITH_SPATIALITE=TRUE \ + -D WITH_INTERNAL_SPATIALITE=TRUE + +include /usr/share/dpatch/dpatch.make + +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 +else + CFLAGS += -O2 +endif +ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) + INSTALL_PROGRAM += -s +endif + +ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) + CMAKE_OPTS += -D CMAKE_BUILD_TYPE=Debug -D ENABLE_TESTS=TRUE + CFLAGS += -DQGISDEBUG=1 + MAKEFLAGS += VERBOSE=YES +endif + +ifneq (,$(findstring profile,$(DEB_BUILD_OPTIONS))) + CFLAGS += -pg + CXXFLAGS += -pg + LDFLAGS += -pg +endif + +define gentemplate +$(2): $(1) + sed \ + -e "s/{QGIS_ABI}/$(QGIS_ABI)/g" \ + -e "s/{GRASS}/$(GRASS)/g" \ + -e "s/{GRASS_ABI}/$(GRASS_ABI)/g" $$^ >$$@ +endef + +TEMPLATES := $(foreach t,$(wildcard debian/*.in),$(basename $(t))) +TEMPLATES += $(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(subst {QGIS_ABI},$(QGIS_ABI),$(t))) + +$(foreach t,$(wildcard debian/*.in),$(eval $(call gentemplate,$(t),$(basename $(t))))) +$(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(eval $(call gentemplate,$(t),$(subst {QGIS_ABI},$(QGIS_ABI),$(t))))) + +debian/build/CMakeCache.txt: patch-stamp CMakeLists.txt + dh_testdir + # Add here commands to configure the package. + [ -d debian/build ] || mkdir debian/build + [ ! -e CMakeCache.txt ] || rm CMakeCache.txt + cd debian/build; cmake $(CMAKE_OPTS) ../.. + +build: build-stamp + +build-stamp: debian/build/CMakeCache.txt + dh_testdir + + # Add here commands to compile the package. + $(MAKE) -C debian/build + + touch $@ + +clean: clean-unpatched unpatch +clean-unpatched: $(TEMPLATES) + dh_testdir + dh_testroot + rm -f build-stamp + rm -f i18n/*.qm + rm -rf debian/tmp + + # Add here commands to clean up after the build process. + rm -rf debian/build + + dh_clean + +install: build + dh_testdir + dh_testroot + dh_prep + dh_installdirs + + # Add here commands to install the package into debian/tmp. + $(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp + + # Install menu pixmap + install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps + install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps + install -o root -g root -m 644 $(CURDIR)/images/icons/qgis-mime-icon.png $(CURDIR)/debian/tmp/usr/share/pixmaps + install -o root -g root -m 644 $(CURDIR)/debian/qgis-icon.xpm $(CURDIR)/debian/tmp/usr/share/pixmaps + +# Build architecture-independent files here. +binary-indep: build install +# We have nothing to do by default. + +# Build architecture-dependent files here. +binary-arch: build install + dh_testdir + dh_testroot + dh_installchangelogs ChangeLog + dh_installdocs + dh_installexamples + dh_install --sourcedir=debian/tmp + + install -o root -g root -m 755 -d $(CURDIR)/debian/qgis/usr/bin + install -o root -g root -m 755 $(CURDIR)/debian/tmp/usr/bin/qgis $(CURDIR)/debian/qgis/usr/bin + + install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin + install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis + + dh_pycentral + dh_installmenu + dh_icons + dh_installman -pqgis qgis.1 + dh_installman -pqgis qgis_help.1 + dh_installmime -pqgis + dh_link + dh_lintian + dh_strip + dh_compress --exclude=pdf + dh_fixperms + dh_makeshlibs + dh_installdeb + dh_shlibdeps -l/usr/lib/$(GRASS)/lib + dh_gencontrol + dh_md5sums + dh_builddeb + +binary: binary-indep binary-arch +.PHONY: build clean binary-indep binary-arch binary install debian/control unpatch --- qgis-1.4.0+12730.orig/debian/qgis.mime +++ qgis-1.4.0+12730/debian/qgis.mime @@ -0,0 +1,9 @@ +image/tif; qgis '%s'; description="TIFF Image"; test=test -n "$DISPLAY"; nametemplate=%s.tif; priority=2 +image/jpg; qgis '%s'; description="JPEG Image"; test=test -n "$DISPLAY"; nametemplate=%s.jpg; priority=2 +image/jp2; qgis '%s'; description="JPEG 2000 Image"; test=test -n "$DISPLAY"; nametempalte=%s.jp2; priority=2 +application/x-raster-aig; qgis '%s'; description="AIG raster data"; test=test -n "$DISPLAY"; nametemplate=%s.aig; priority=2 +application/x-raster-ecw; qgis '%s'; description="ECW raster data"; test=test -n "$DISPLAY"; nametemplate=%s.ecw; priority=2 +application/x-raster-mrsid; qgis '%s'; description="MrSID raster data"; test=test -n "$DISPLAY"; nametemplate=%s.sid; priority=2 +application/x-raster-mif; qgis '%s'; description="MapInfo file"; test=test -n "$DISPLAY"; nametemplate=%s.mif; priority=2 +application/x-esri-shape; qgis '%s'; description="ESRI shape file"; test=test -n "$DISPLAY"; nametemplate=%s.shp; priority=2 +application/x-qgis-project; qgis '%s'; description="Quantum GIS Project"; test=test -n "$DISPLAY"; nametemplate=%s.qgs --- qgis-1.4.0+12730.orig/debian/python-qgis.lintian-overrides.in +++ qgis-1.4.0+12730/debian/python-qgis.lintian-overrides.in @@ -0,0 +1 @@ +python-qgis: package-name-doesnt-match-sonames --- qgis-1.4.0+12730.orig/debian/libqgis1.4.0.lintian-overrides +++ qgis-1.4.0+12730/debian/libqgis1.4.0.lintian-overrides @@ -0,0 +1,2 @@ +libqgis1.4.0: shlib-calls-exit +libqgis1.4.0: package-name-doesnt-match-sonames --- qgis-1.4.0+12730.orig/debian/qgis-plugin-grass.install.in +++ qgis-1.4.0+12730/debian/qgis-plugin-grass.install.in @@ -0,0 +1,3 @@ +usr/lib/qgis/libgrassplugin.so +usr/lib/qgis/libgrassprovider.so +usr/lib/libqgisgrass.so.{QGIS_ABI} --- qgis-1.4.0+12730.orig/debian/copyright +++ qgis-1.4.0+12730/debian/copyright @@ -0,0 +1,56 @@ +This package was debianized by Steve Halasz on +Wed, 31 Dec 2003 10:07:40 -0500. + +It was downloaded from: + https://svn.osgeo.org/qgis/trunk/qgis + +The upstream contributors are listed in the AUTHORS file and here +reported: + + Gary E.Sherman + Steve Halasz + Marco Hugentobler + Tim Sutton + Denis Antipov + Mark Coletti + Lars Luthman + Jens Oberender + Christoph Spoerri + Carl Anderson + Gavin Macaulay + Masaru Hoshi + Peter Brewer + Radim Blazek + Tom Elwertowski + Godofredo Contreras + Martin Dobias + Brendan Morley + Magnus Homann + Jürgen E. Fischer + Tisham Dhar + Leonardo Lami + Marco Pasetti + Mateusz Loskot + Peter Ersts + Borys Jurgiel + Paolo Cavallini + Carson J. Q. Farmer + Lorenzo Masini + Werner Macho + +Copyright: + + Copyright (C) 2003-2010 the authors + + This program is free software; you can redistribute it and/or + modify it under the terms of the GNU General Public License as + published by the Free Software Foundation; either version 2 of + the License, or (at your option) any later version. + + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + + On Debian systems, the complete text of the GNU General Public + License can be found in the /usr/share/common-licenses/GPL file. --- qgis-1.4.0+12730.orig/debian/README.source +++ qgis-1.4.0+12730/debian/README.source @@ -0,0 +1,26 @@ +Notes for the maintainer of Debian QGIS +--------------------------------------- + +This package has been built starting from latest branch of Qgis. +Note that Qgis team currently already maintains a Debian/Ubuntu +set of maintainers scripts. This is a simplified version stolen +from qgis.org subversion at: + +https://svn.osgeo.org/qgis/branches/Release-1_4_0 + +and adapted to current Debian policy. The Debian branch is mantained +by means of git-svn, which pose some problems of merging from time +to time. In order to push updates to the Alioth git repository +you need to use something like: + +git remote add public \ + ssh://alioth.debian.org/var/lib/gforge/chroot/home/groups/pkg-grass/htdocs/qgis/qgis.git + +after cloning the official read-only repository by: + +git clone http://pkg-grass.alioth.debian.org/qgis/qgis.git + +Of course, you need to have a valid Alioth account and to join the pkg-grass group. + + -- Francesco Paolo Lovergine Fri, 12 Mar 2010 15:20:01 +0100 + --- qgis-1.4.0+12730.orig/debian/qgis.sh +++ qgis-1.4.0+12730/debian/qgis.sh @@ -0,0 +1,11 @@ +#!/bin/sh + +if [ "$LD_LIBRARY_PATH" = "" ]; then + LD_LIBRARY_PATH=/usr/lib/grass64/lib +else + LD_LIBRARY_PATH=$LD_LIBRARY_PATH:/usr/lib/grass64/lib +fi + +export LD_LIBRARY_PATH + +exec $0.bin "$@" --- qgis-1.4.0+12730.orig/debian/watch +++ qgis-1.4.0+12730/debian/watch @@ -0,0 +1,2 @@ +version=3 +http://download.osgeo.org/qgis/src/qgis_(.*).tar.gz --- qgis-1.4.0+12730.orig/debian/libqgis-dev.install +++ qgis-1.4.0+12730/debian/libqgis-dev.install @@ -0,0 +1,4 @@ +usr/include/qgis/* +usr/lib/libqgis_core.so +usr/lib/libqgis_gui.so +usr/lib/libqgis_analysis.so --- qgis-1.4.0+12730.orig/debian/qgis.menu +++ qgis-1.4.0+12730/debian/qgis.menu @@ -0,0 +1,3 @@ +?package(qgis):needs="X11" section="Applications/Science/Geoscience"\ + icon="/usr/share/pixmaps/qgis-icon.xpm" title="Quantum GIS"\ + command="/usr/bin/qgis" --- qgis-1.4.0+12730.orig/debian/qgis-common.install +++ qgis-1.4.0+12730/debian/qgis-common.install @@ -0,0 +1,15 @@ +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/AUTHORS +usr/share/qgis/doc/SPONSORS +usr/share/qgis/doc/CONTRIBUTORS +usr/share/qgis/doc/TRANSLATORS +usr/share/qgis/doc/DONORS +usr/share/qgis/doc/images +usr/share/qgis/i18n/* +usr/share/qgis/images/* +usr/share/qgis/resources/* +usr/share/qgis/svg/* +usr/share/qgis/themes/* --- qgis-1.4.0+12730.orig/debian/libqgis1.4.0.install +++ qgis-1.4.0+12730/debian/libqgis1.4.0.install @@ -0,0 +1,3 @@ +usr/lib/libqgis_core.so.1.4.0 +usr/lib/libqgis_gui.so.1.4.0 +usr/lib/libqgis_analysis.so.1.4.0 --- qgis-1.4.0+12730.orig/debian/qgis-icon.xpm +++ qgis-1.4.0+12730/debian/qgis-icon.xpm @@ -0,0 +1,170 @@ +/* XPM */ +static char *qgis_icon[] = { +/* columns rows colors chars-per-pixel */ +"32 32 132 2", +" c #070C05", +". c #0B2605", +"X c #072E01", +"o c #0A2F04", +"O c #063300", +"+ c #083602", +"@ c #1F3E11", +"# c #203115", +"$ c #0A4301", +"% c #094A00", +"& c #1A4A0D", +"* c #095100", +"= c #0A5B00", +"- c #1C550D", +"; c #1E4810", +": c #31431F", +"> c #0B6300", +", c #0C6A00", +"< c #156707", +"1 c #1C660B", +"2 c #1A6A09", +"3 c #0E7400", +"4 c #0F7B00", +"5 c #147605", +"6 c #147A04", +"7 c #187D07", +"8 c #20720F", +"9 c #266614", +"0 c #267B11", +"q c #327A1A", +"w c #364E21", +"e c #44472C", +"r c #505334", +"t c #555837", +"y c #5C5F3C", +"u c #426E26", +"i c #427F26", +"p c #47722B", +"a c #646740", +"s c #6C6F48", +"d c #717549", +"f c #74794A", +"g c #797E4E", +"h c #7B7E51", +"j c #7C7E5B", +"k c #0F8001", +"l c #118401", +"z c #118A01", +"x c #1A8C07", +"c c #1C8109", +"v c #1C8B09", +"b c #2D8E15", +"n c #2F9315", +"m c #549431", +"M c #67903F", +"N c #53A62F", +"B c #60A738", +"V c #6A8F41", +"C c #728D47", +"Z c #78914F", +"A c #7E8251", +"S c #7DAD57", +"D c #7CB255", +"F c #808352", +"G c #858A56", +"H c #91975E", +"J c #959D5F", +"K c #83AD51", +"L c #90A75C", +"P c #94A85E", +"I c #969A60", +"U c #9EA266", +"Y c #95A866", +"T c #9BAC62", +"R c #A2AA69", +"E c #A1B866", +"W c #A6B36A", +"Q c #ACB26F", +"! c #A9AD73", +"~ c #ACB672", +"^ c #B1B477", +"/ c #B7BE77", +"( c #B8BE76", +") c #B9BF79", +"_ c #B9C476", +"` c #BCC47A", +"' c #BCCD79", +"] c #C3CB7D", +"[ c #BCBF86", +"{ c #B9C887", +"} c #BEC98B", +"| c #C1C483", +" . c #C7CE80", +".. c #C8CF80", +"X. c #C4CA8D", +"o. c #CCD383", +"O. c #C7DC80", +"+. c #D0D786", +"@. c #D2DB87", +"#. c #D2D788", +"$. c #D4DC88", +"%. c #C6C792", +"&. c #D1D396", +"*. c #D9DE93", +"=. c #DCDE9B", +"-. c #DCE38D", +";. c #DEE491", +":. c #DEE19B", +">. c #E4EC93", +",. c #E4E69D", +"<. c #E7E89E", +"1. c #E8E99C", +"2. c #EAF296", +"3. c #EDF599", +"4. c #F1F69D", +"5. c #F5F99F", +"6. c #D5D6A0", +"7. c #DADBA2", +"8. c #ECEEA1", +"9. c #E2E4AD", +"0. c #EEF2A3", +"q. c #F2F7A3", +"w. c #F5F9A3", +"e. c #FAFCA4", +"r. c #F2F5AB", +"t. c #F7FBAA", +"y. c #F9FAAC", +"u. c #F9FCB1", +"i. c #F3F4BA", +"p. c #FAFBBB", +"a. c #FCFCC4", +"s. c None", +/* pixels */ +"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.", +"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.", +"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.", +"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.", +"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.", +"s.s.s.s.s.s.s.s.s.s.s.s.s.9.6.%.&.=.:.Z 9 = 3 , > % s.s.s.s.s.s.", +"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.", +"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.", +"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.", +"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.", +"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.", +"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.", +"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.", +"s.s.s.s.s.s.u.4.3.3.2...d s.s.3 z 3 2 U o.>.3.2.@.A s.s.s.s.s.s.", +"s.s.s.s.s.s.y.4.3.3.2...d s.s.k l , - | ;.3.3.2.@.G s.s.s.s.s.s.", +"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.", +"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.", +"s.s.s.s.s.s.4.3.3.3.2.@.R S D D Y ~ s.y.4.3.3.>...y s.s.s.s.s.s.", +"s.s.s.s.s.s.2.2.3.3.2.-.` { } X.,.<.8.y.q.3.3.-.` e s.s.s.s.s.s.", +"s.s.s.s.s.s.s.>.3.3.3.@.W & o I #.5.w.3.3.2.] U s.s.s.s.s.s.s.", +"s.s.s.s.s.s.s.-.>.2.2.-._ @ . s.s.>.5.3.3.2.-.U f s.s.s.s.s.s.s.", +"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.", +"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.", +"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.", +"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.", +"s.s.s.s.s.s.$ $ % = % ; t G U ^ [ *.4.3.-.] s.s.s.i.j s.s.s.s.s.", +"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.", +"s.s.s.s.s.s.s.s.s.> $ s.s.s.s.s.s.+.-.>.>.>.3.*.| h s.s.s.s.s.s.", +"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.", +"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.", +"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.", +"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." +}; --- qgis-1.4.0+12730.orig/debian/qgis-plugin-grass.postrm +++ qgis-1.4.0+12730/debian/qgis-plugin-grass.postrm @@ -0,0 +1,11 @@ +#!/bin/sh + +set -e + +if [ "$1" = "remove" ]; then + dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis +fi + +#DEBHELPER# + +exit 0 --- qgis-1.4.0+12730.orig/debian/python-qgis.install.in +++ qgis-1.4.0+12730/debian/python-qgis.install.in @@ -0,0 +1,3 @@ +usr/lib/python*/*-packages/qgis/*.py +usr/lib/python*/*-packages/qgis/*.so +usr/lib/libqgispython.so.{QGIS_ABI} --- qgis-1.4.0+12730.orig/debian/compat +++ qgis-1.4.0+12730/debian/compat @@ -0,0 +1 @@ +7 --- qgis-1.4.0+12730.orig/debian/qgis-common.sharedmimeinfo +++ qgis-1.4.0+12730/debian/qgis-common.sharedmimeinfo @@ -0,0 +1,52 @@ + + + + + Quantum GIS Project + + + + + ESRI shape file + + + + + MapInfo file + + + + + Geographic Markup Language + + + + + GEOTiff + + + + + + JPEG compress raster data + + + + + + JPEG 2000 compress raster data + + + + + + ECW compressed raster data + + + + + MrSID compress raster data + + + + --- qgis-1.4.0+12730.orig/debian/qgis-plugin-grass-common.install +++ qgis-1.4.0+12730/debian/qgis-plugin-grass-common.install @@ -0,0 +1 @@ +usr/share/qgis/grass/* --- qgis-1.4.0+12730.orig/debian/libqgis{QGIS_ABI}.install +++ qgis-1.4.0+12730/debian/libqgis{QGIS_ABI}.install @@ -0,0 +1,3 @@ +usr/lib/libqgis_core.so.{QGIS_ABI} +usr/lib/libqgis_gui.so.{QGIS_ABI} +usr/lib/libqgis_analysis.so.{QGIS_ABI} --- qgis-1.4.0+12730.orig/debian/changelog +++ qgis-1.4.0+12730/debian/changelog @@ -0,0 +1,557 @@ +qgis (1.4.0+12730-3ubuntu4) natty; urgency=low + + * Fix build failure with GCC 4.5. + + -- Matthias Klose Wed, 15 Dec 2010 14:10:27 +0100 + +qgis (1.4.0+12730-3ubuntu3) natty; urgency=low + + * Rebuild with python 2.7 as the python default. + + -- Matthias Klose Thu, 09 Dec 2010 16:54:44 +0000 + +qgis (1.4.0+12730-3ubuntu2) maverick; urgency=low + + * Build-dep on libqtwebkit-dev for qtwebkit transition + + -- Philip Muskovac Wed, 21 Jul 2010 13:39:55 +0200 + +qgis (1.4.0+12730-3ubuntu1) maverick; urgency=low + + * Merge from Debian unstable (LP: #540941). + * Fix compilation issues with QT 4.7 + * Add build-depends on libqt4-webkit-dev + + -- Johan Van de Wauw Sun, 11 Jul 2010 20:23:24 +0200 + +qgis (1.4.0+12730-3) unstable; urgency=low + + * Updated debian/control for current Grass snapshot. + * Updated Vcs-Git field to reflect current public read-only repo. + * Updated README.source to document how to access the git repo. + * Now build-depends on sip4 >= 4.10 to force use of a current API 7.0. + (closes: #578570) + + -- Francesco Paolo Lovergine Mon, 26 Apr 2010 13:08:17 +0200 + +qgis (1.4.0+12730-2) unstable; urgency=low + + * Readded dpatch support. + * New patch: kfreebsd.dpatch to support kfreebsd archs. + * Modified debian/python-qgis.install.in to manage different python versions. + * Added a conflicts against old qgis to qgis-common. + (closes: #568185) + * Removed circular dependencies among -common packages and their conterparts. + Now using Recommends. + (closes: #568271) + * Rebuilt against current sip4 (4.10) interface and added sipversion.dpatch + to manage correctly version checking. Thanks jef. + (closes: #568241) + + -- Francesco Paolo Lovergine Thu, 04 Feb 2010 11:09:01 +0100 + +qgis (1.4.0+12730-1) unstable; urgency=low + + The "George A. Romero rocks" release. + + * Ready for sid (again) with removed multi-distribution support. + * Policy updated to 3.8.4. + * Based on 1.4.0 branch snapshot r12730 as taken from Qgis repository. + * Debhelper moved to level 7. + * Now using dh_prep instead of dh_clean -k. + * Introduced templating for the grass directory name. + * Still retaining conflict/replace items related to previuous unreleased + packages to be friendly with past users. + * Removed obsolete dh_desktop call at all. + * Removed the whole distribution dependent script snippets. + * Added qgis.sh.in template file. + * Added missing debhelper token to preinst script. + * debian/copyright file revised to add explicitly upstream authors. + + -- Francesco Paolo Lovergine Mon, 01 Feb 2010 15:20:01 +0100 + +qgis (1.4.0) UNRELEASED; urgency=low + + * new development version after 1.3 branch + * use templates for configuration for ABIs and distributions + * policy updated to 3.8.3 + * remove README.Debian from libqgis-dev + * add symbol files for shared libraries + * shorten qgis.sh + * add all python files in qgis' site-packages + * add labeling plugin + + -- Jürgen E. Fischer Tue, 17 Nov 2009 16:27:53 +0100 + +qgis (1.3.0) UNRELEASED; urgency=low + + * new upstream release + * add analysis library and raster terrain analysis plugin + * alternativly depend on libgdal1-1.6.0-grass + * include CONTRIBUTORS, TRANSLATORS and DONORS + * reverse order of libgdal1-*-grass dependencies + + -- Jürgen E. Fischer Sat, 12 Sep 2009 22:09:18 +0200 + +qgis (1.2.0) UNRELEASED; urgency=low + + * new development version after 1.1 branch + * add new build dependency to pyqt4-dev-tools + * update SONAMEs to 1.2.0 + * add python dependency to qgis-plugin-grass-common + * include osm provider and evis plugin + + -- Jürgen E. Fischer Tue, 18 Aug 2009 08:20:18 +0200 + +qgis (1.1.0-5) UNRELEASED; urgency=low + + * rename {qgis,qgis_help}.man to {qgis,qgis_help}.1 + + -- Jürgen E. Fischer Tue, 21 Apr 2009 22:09:33 +0200 + +qgis (1.1.0-4) UNRELEASED; urgency=low + + * include oracle plugin + + -- Jürgen E. Fischer Wed, 15 Apr 2009 22:32:27 +0200 + +qgis (1.1.0-3) UNRELEASED; urgency=low + + * include diagram overlays + + -- Jürgen E. Fischer Wed, 08 Apr 2009 16:30:57 +0200 + +qgis (1.1.0-2) UNRELEASED; urgency=low + + * change package names to reflect ABI (changes SONAME) + + -- Jürgen E. Fischer Sun, 05 Apr 2009 12:34:38 +0200 + +qgis (1.1.0-1) UNRELEASED; urgency=low + + * allow build with GRASS 6.4rc3 + + -- Jürgen E. Fischer Mon, 02 Mar 2009 21:06:07 +0100 + +qgis (1.1.0) UNRELEASED; urgency=low + + * gridmaker plugin removed from package + * updated mime support + * sync with debian-gis debian/ tree + - introduce arch-independent qgis-common and + qgis-plugin-grass-common + - policy updated to 3.8.0 + - join libqgis1-core and libqgis1-gui to libqgis1 + - add debian/watch + - dh_lintian overrides + - fix qgis.desktop + - fix license reference in copyright + * introduce arch-independent python-qgis-common + * added sharedmimeinfo + * remove dpatch + + -- Jürgen E. Fischer Fri, 13 Feb 2009 22:03:25 +0100 + +qgis (1.0.0) experimental; urgency=low + + * new upstream release + * update qgis.mime + * add qgis.desktop and qgis.xml + * add mime types for KDE + * don't ignore errors in preinst and postrm + * run ldconfig in postrm + + -- Jürgen E. Fischer Tue, 23 Dec 2008 20:42:21 +0100 + +qgis (1.0preview18) experimental; urgency=low + + * add suggestion for gpsbabel + + -- Jürgen E. Fischer Sat, 20 Dec 2008 19:08:34 +0100 + +qgis (1.0preview17) experimental; urgency=low + + * include quickprint and coordinate capture plugin + + -- Jürgen E. Fischer Wed, 12 Nov 2008 12:57:46 +0100 + +qgis (1.0preview16) experimental; urgency=low + + * new upstream preview release (1.0preview2). + * introduce conflict with uim-qt3 (fixes GUI issues on Ubuntu intrepid) + + -- Jürgen E. Fischer Sat, 08 Nov 2008 12:10:21 +0100 + +qgis (1.0preview7) experimental; urgency=low + + * remove quickprint plugin + + -- Jürgen E. Fischer Mon, 01 Sep 2008 21:58:58 +0200 + +qgis (1.0preview6) experimental; urgency=low + + * add missing dependency of python-qgis to python-qt4 + + -- Jürgen E. Fischer Fri, 29 Aug 2008 17:26:33 +0200 + +qgis (1.0preview5) experimental; urgency=low + + * add wrapper scripts to qgis-plugin-grass that adds the grass + shared libraries to LD_LIBRARY_PATH. + + -- Jürgen E. Fischer Fri, 29 Aug 2008 00:19:05 +0200 + +qgis (1.0preview4) experimental; urgency=low + + * add ogr converter plugin + + -- Jürgen E. Fischer Wed, 27 Aug 2008 17:48:32 +0200 + +qgis (1.0preview3) experimental; urgency=low + + * build in pedantic mode + * add interpolation plugin + + -- Jürgen E. Fischer Sat, 23 Aug 2008 15:19:32 +0200 + +qgis (1.0preview2) experimental; urgency=low + + * added dxf2shp plugin + * removed pggeoprocessing plugin + + -- Jürgen E. Fischer Wed, 20 Aug 2008 08:47:29 +0200 + +qgis (1.0preview1) experimental; urgency=low + + * prepackaging of Quantum GIS 1.0 + * raised abi version from 0.11 to 1 + + -- Jürgen E. Fischer Sat, 19 Jul 2008 19:57:04 +0200 + +qgis (0.11.0-2) stable; urgency=low + + * remove libqgisgrass0.11 package by integrating it into qgis-plugin-grass + * move libqgisgrass.so link from libqgis1-dev to qgis-plugin-grass + * qgis recommends instead of just suggests the grass and python plugin + + -- Jürgen E. Fischer Sat, 19 Jul 2008 11:38:49 +0200 + +qgis (0.11.0-1) stable; urgency=low + + * libqgispython0.11 integrated into python-qgis + * introduced a build conflict with libqgis1-dev + + -- Jürgen E. Fischer Wed, 16 Jul 2008 22:42:11 +0200 + +qgis (0.11.0) stable; urgency=low + + * New upstream release: Quantum GIS 0.11.0 'Metis' + + -- Jürgen E. Fischer Tue, 15 Jul 2008 20:41:12 +0200 + +qgis (0.11.0test3) experimental; urgency=low + + * add memory provider + + -- Jürgen E. Fischer Tue, 10 Jun 2008 15:32:42 +0200 + +qgis (0.11.0test2) experimental; urgency=low + + * removed 'upstream' changes from changelog + * policy update 3.7.2 to 3.7.3 + * python support: renamed qgis-python-plugin to python-qgis, moved to python + section, added Python:Provides + * replaced QGIS with Quantum GIS in descriptions + * moved so symlinks to dev package + + -- Jürgen E. Fischer Sun, 01 Jun 2008 13:45:39 +0200 + +qgis (0.11.0test1) experimental; urgency=low + + * prepackaging of Quantum GIS 0.11.0 'Mantis' + * raised abi from 0.10 to 0.11 + * separate packages for python support + * raised dependency from python-qt4* from 4.0.0 to 4.1.0 + * call cmake with -Wno-dev + + -- Jürgen E. Fischer Thu, 29 May 2008 00:23:14 +0200 + +qgis (0.10.0-2) gutsy; urgency=low + + * fix libgdal1 grass dependency for ubuntu gutsy/hardy (1.4.0 | 1.5.0) + + -- Jürgen E. Fischer Wed, 30 Apr 2008 22:35:42 +0200 + +qgis (0.10.0-1) gutsy; urgency=low + + * updated Maintainer field + * updated version for sip build dependency and removed old libgdal<1.5 + dependencies. + * removed explicit shared library dependency for qgis and qgis-grass-plugin. + * removed recommends for qt4-designer on libqgis1-dev, because there's also + a depends. + + -- Jürgen E. Fischer Mon, 28 Apr 2008 22:21:53 +0200 + +qgis (0.10.0) gutsy; urgency=low + + * Quantum GIS 0.10.0 'Io' upstream release + + -- Jürgen E. Fischer Fri, 18 Apr 2008 00:51:58 +0200 + +qgis (0.9.2test1) gutsy; urgency=low + + * Testing package to see if icons deploy + + -- Tim Sutton Tue, 12 Feb 2008 21:18:35 -0200 + +qgis (0.9.2rc1) gutsy; urgency=low + + * new upstream release + + -- Tim Sutton Mon, 28 Jan 2008 23:00:41 -0200 + +qgis (0.9.1) gutsy; urgency=low + + * new upstream release + + -- Tim Sutton Fri, 07 Dec 2007 01:36:55 -0200 + +qgis (0.9.0) gutsy; urgency=low + + * Quantum GIS 0.9.0 'Ganymede' release + + -- Tim Sutton Tue, 28 Aug 2007 22:43:41 -0300 + +qgis (0.8.1-3) UNRELEASED; urgency=low + + * Added Build-Depends: sip4. + + -- Niccolo Rigacci Fri, 10 Aug 2007 11:37:29 +0200 + +qgis (0.8.1-2) UNRELEASED; urgency=low + + * Quick-and-dirty changes on Debian files. + + -- Niccolo Rigacci Fri, 10 Aug 2007 10:52:25 +0200 + +qgis (0.8.1-1) UNRELEASED; urgency=low + + * New upstream release. + * Now the building system is based on cmake. Qt4 and SIP are required. + * Added cmake.dpatch new patch (to build-up consistently). + * Added georef.dpatch new patch (improvement of georeferencer by Martin Dobias). + * Removed obsolete postgresql-dev build-dep. + (closes: #429984) + * Removed obsolete libmysqlclient14-dev build-dep. + * Added a grid_maker patch to compile standalone binaries. + + -- Francesco Paolo Lovergine Fri, 29 Jun 2007 16:03:56 +0200 + +qgis (0.8.0-5) unstable; urgency=low + + * Added python-dev build-dep. + Patch added: ax_python.dpatch, fixes python environment detection. + (closes: #429234) + * Added build-dep for autoconf/automake due to acinclude.m4 changes. + + -- Francesco Paolo Lovergine Tue, 19 Jun 2007 18:28:05 +0200 + +qgis (0.8.0-4) unstable; urgency=low + + * Enabled python scripts support and changed build-dep and suggests as consequence. + * Enabled WFS support. + (closes: #302618) + * Long description revised. + * Patch gcc43-fixes updated. Thanks again Martin Michlmayr. + (closes: #417522) + * Now installing missing binaries: msexport, qgis_help + (closes: #423989) + + -- Francesco Paolo Lovergine Tue, 22 May 2007 17:03:18 +0200 + +qgis (0.8.0-3) unstable; urgency=low + + * Added missing flex/bison build-deps. + (closes: #421143) + * Added gcc4.3-fixes based the patch by tbm. + (closes: #417522) + + -- Francesco Paolo Lovergine Mon, 30 Apr 2007 23:24:02 +0200 + +qgis (0.8.0-2) unstable; urgency=low + + * Releasing for unstable. + Moved to soname 1 instead of 0. + + -- Francesco Paolo Lovergine Tue, 10 Apr 2007 13:42:47 +0200 + +qgis (0.8.0-1) experimental; urgency=low + + * New upstream release. + * Patchset updated. + New patch: gridmaker_bin to generate gridmaker binary as it should. + + + -- Francesco Paolo Lovergine Wed, 4 Apr 2007 14:19:48 +0200 + +qgis (0.7.4-6) UNRELEASED; urgency=low + + * Moved to team maintainership as asked by Steve. + * Moved to new gdal 1.4.0 dependency (currently in experimental) + + -- Francesco Paolo Lovergine Wed, 4 Apr 2007 14:04:38 +0200 + +qgis (0.7.4-5) unstable; urgency=low + + * Acknowledge GCC 4.1 NMU (Closes: #356215) + * Update deps to libgdal1-1.3.2-dev and grass-dev (Closes: #383143, #360649) + * Bump standards version to 3.7.2. No changes made. + + -- Steve Halasz Sat, 19 Aug 2006 22:13:32 -0400 + +qgis (0.7.4-4.1) unstable; urgency=low + + * NMU as part of the GCC 4.1 transition. + * patches/gcc41-extra-qualifications.dpatch: Update to remove two more + extra qualifications from C++ files (Closes: #356215) + + -- Martin Michlmayr Fri, 26 May 2006 23:57:18 +0200 + +qgis (0.7.4-4) unstable; urgency=low + + * Apply patch for building with gcc 4.1 (Closes: #356215) + * Create patch for moving location of installed documentation + (Closes: #355208) + * Remove essentially empty README file (Closes: #324533) + + -- Steve Halasz Fri, 7 Apr 2006 10:12:58 -0400 + +qgis (0.7.4-3) unstable; urgency=low + + * Build with libgdal1-1.3.1 + * Build-dep on libmysqlclient15-dev + * Remove follow-on build-deps that are now pulled in by + libgdal1-1.3.1-dev + + -- Steve Halasz Mon, 20 Feb 2006 20:21:48 -0500 + +qgis (0.7.4-2) unstable; urgency=low + + * Build libqgis0 as separate package to conform to policy (Closes: #339254) + * Rename qgis-dev to libqgis0-dev + * Build-dep on libmysqlclient14-dev + * Acknowledge binary NMU (Closes: #345148) + + -- Steve Halasz Wed, 14 Dec 2005 23:14:35 -0500 + +qgis (0.7.4-1) unstable; urgency=low + + * New upstream release + * Build GRASS support in qgis-plugin-grass package (Closes: #248649) + + -- Steve Halasz Sat, 5 Nov 2005 16:04:45 -0500 + +qgis (0.7.0-1) unstable; urgency=low + + * New upstream release (Closes: #327592) + - Don't segfault when starting without X (Closes: #295872) + - GPX plugin uses less RAM (Closes: #284238) + * PostgreSQL transition: build-dep on libpq-dev | postgresql-dev + * C++ ABI transition. No explicit changes made. (Closes: #327597) + * Bump standards version to 3.6.2. No changes made. + + -- Steve Halasz Fri, 16 Sep 2005 10:43:49 -0400 + +qgis (0.6.0-2) unstable; urgency=low + + * Depend on xerces26 instead of xerces21 (Closes: #301709) + * Apply patch for PostGis 1.0 (Closes: #303743) + * Added note about setting QTDIR=/usr/share/qt3 (Closes: #281910) + * Patch for crash loading shapefiles exposed by gdal 1.2.6 + + -- Steve Halasz Thu, 14 Apr 2005 11:03:20 -0400 + +qgis (0.6.0-1) unstable; urgency=low + + * New upstream release + * Display version name consistently (Closes: #275608) + * Make Alt+F accelerators unique (Closes: #275611) + * Use upstream's new manpage for qgis + * Make delimited text plugin dialog more user-friendly (Closes: #282085) + * Fix for disappearing icons (Closes: #275610) + * Properly load shapefiles specified on the command line (Closes: #275607) + + -- Steve Halasz Tue, 21 Dec 2004 09:46:27 -0500 + +qgis (0.5.0-2) unstable; urgency=low + + * Fix typos in .install files that left out the delimitedtext plugin + (Closes: #282084) + + -- Steve Halasz Fri, 19 Nov 2004 10:51:07 -0500 + +qgis (0.5.0-1) unstable; urgency=low + + * New upstream release + * Create separate qgis-dev package (Closes: #264213) + + -- Steve Halasz Wed, 6 Oct 2004 07:34:28 -0400 + +qgis (0.4.0-3) unstable; urgency=medium + + * Add build-dep on libjasper-1.701-dev + * Add build-dep on libtiff4-dev - doh! :-/ + * Add build-dep on netcdfg-dev + + -- Steve Halasz Tue, 10 Aug 2004 11:22:29 -0400 + +qgis (0.4.0-2) unstable; urgency=low + + * Remove build-dep on libtiff3g-dev (Closes: #264573) + + -- Steve Halasz Mon, 9 Aug 2004 09:15:08 -0400 + +qgis (0.4.0-1) unstable; urgency=low + + * New upstream release + + -- Steve Halasz Fri, 2 Jul 2004 09:36:23 -0400 + +qgis (0.3.0-1) unstable; urgency=low + + * New upstream release + + -- Steve Halasz Wed, 26 May 2004 09:38:22 -0400 + +qgis (0.2.0-1) unstable; urgency=low + + * New upstream release + + -- Steve Halasz Mon, 26 Apr 2004 09:48:19 -0400 + +qgis (0.1-2) unstable; urgency=low + + * Build with the Shapefile to PostGIS Import Tool (SPIT) and + PostgreSQL support (Closes: #233191) + + -- Steve Halasz Wed, 7 Apr 2004 09:18:34 -0400 + +qgis (0.1-1) unstable; urgency=low + + * New upstream release + * changed install location of html documentation to /usr/share/doc/qgis + * updated man page to describe new command-line options and include pointers + to HTML and PDF documentation (Closes: #234600) + * debian/control: + - updated description to include raster support + + -- Steve Halasz Wed, 25 Feb 2004 08:56:18 -0500 + +qgis (0.0.13-1) unstable; urgency=low + + * Initial Release (Closes: #217237). + * clean out config.status and config.log before building + + -- Steve Halasz Fri, 9 Jan 2004 12:27:07 -0500 + --- qgis-1.4.0+12730.orig/debian/control.in +++ qgis-1.4.0+12730/debian/control.in @@ -0,0 +1,120 @@ +Source: qgis +Section: science +Priority: extra +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian GIS Project +Uploaders: Francesco Paolo Lovergine +Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev, + libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, + flex, bison, python-dev, cmake (>= 2.4.3), python-sip4 (>= 4.10), python-central (>=0.5), python, + sharutils, sip4 (>= 4.10), 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.1.0), python-qt4-dev (>=4.1.0), + python-sip4-dev (>= 4.10), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev, + libsm-dev, pyqt4-dev-tools, libqtwebkit-dev, dpatch +Build-Conflicts: libqgis-dev, qgis-dev +Standards-Version: 3.8.4 +XS-Python-Version: current +Homepage: http://qgis.org/ +Vcs-Git: http://pkg-grass.alioth.debian.org/qgis/qgis.git + +Package: qgis +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version}) +Recommends: qgis-plugin-grass, python-qgis +Suggests: gpsbabel +Conflicts: uim-qt3 +Description: Geographic Information System (GIS) + A Geographic Information System (GIS) manages, analyzes, and displays + databases of geographic information. Quantum GIS (QGIS) supports shape file + viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection + on-the-fly, map composition, and a number of other features via a plugin + interface. QGIS also supports display of various georeferenced raster and + Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid, + and USGS ASCII DEM. + +Package: qgis-common +Architecture: all +Recommends: qgis (>= ${binary:Version}) +Conflicts: qgis (<= 1.4.0~) +Description: Quantum GIS - architecture-independent data + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains architecture-independent supporting data files for use + with Quantum GIS. + +Package: libqgis{QGIS_ABI} +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1 +Description: Quantum GIS - shared libraries + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains the shared core and gui library that provide an + interface for plugins and stand-alone applications. + +Package: libqgis-dev +Architecture: any +Section: libdevel +Depends: libqgis{QGIS_ABI} (= ${binary:Version}), libgdal1-dev, + libpq-dev, libgeos-dev (>= 3.0.0), grass-dev, + libsqlite3-dev, libgsl0-dev, libproj-dev, 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.1.0), python-qt4-dev (>=4.1.0), + qt4-designer (>=4.2.0) +Provides: qgis-dev +Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev +Description: Quantum GIS - development files + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains the headers and libraries needed to develop plugins for + Quantum GIS. + +Package: qgis-plugin-grass +Architecture: any +Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass{GRASS_ABI} +Description: GRASS plugin for Quantum GIS + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This plugin enables GRASS data access in the Quantum GIS geographic data + viewer. + +Package: qgis-plugin-grass-common +Architecture: all +Recommends: qgis-plugin-grass (>= ${binary:Version}) +Depends: python +Description: GRASS plugin for Quantum GIS - architecture-independent data + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains architecture-independent supporting data files for use + with the Quantum GIS GRASS plugin. + +Package: python-qgis +Section: python +Architecture: any +Depends: python-qt4 (>=4.1.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Python bindings to Quantum GIS + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains the files for the Python support. + +Package: python-qgis-common +Section: python +Architecture: all +Recommends: python-qgis (>= ${binary:Version}) +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Python bindings to Quantum GIS - architecture-independent files + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains architecture-independent files for the Quantum GIS + Python bindings. + --- qgis-1.4.0+12730.orig/debian/libqgis{QGIS_ABI}.lintian-overrides +++ qgis-1.4.0+12730/debian/libqgis{QGIS_ABI}.lintian-overrides @@ -0,0 +1,2 @@ +libqgis{QGIS_ABI}: shlib-calls-exit +libqgis{QGIS_ABI}: package-name-doesnt-match-sonames --- qgis-1.4.0+12730.orig/debian/qgis.install +++ qgis-1.4.0+12730/debian/qgis.install @@ -0,0 +1,42 @@ +usr/bin/qgis_help +usr/lib/qgis/libcopyrightlabelplugin.so +usr/lib/qgis/libdelimitedtextplugin.so +usr/lib/qgis/libdelimitedtextprovider.so +usr/lib/qgis/libgeorefplugin.so +usr/lib/qgis/libgpsimporterplugin.so +usr/lib/qgis/libgpxprovider.so +usr/lib/qgis/libnortharrowplugin.so +usr/lib/qgis/libogrprovider.so +usr/lib/qgis/libpostgresprovider.so +usr/lib/qgis/libquickprintplugin.so +usr/lib/qgis/libscalebarplugin.so +usr/lib/qgis/libspitplugin.so +usr/lib/qgis/libwfsplugin.so +usr/lib/qgis/libwfsprovider.so +usr/lib/qgis/libwmsprovider.so +usr/lib/qgis/libmemoryprovider.so +usr/lib/qgis/libdxf2shpconverterplugin.so +usr/lib/qgis/libinterpolationplugin.so +usr/lib/qgis/libogrconverterplugin.so +usr/lib/qgis/libcoordinatecaptureplugin.so +usr/lib/qgis/libspatialiteprovider.so +usr/lib/qgis/liboracleplugin.so +usr/lib/qgis/libdiagramoverlay.so +usr/lib/qgis/libevis.so +usr/lib/qgis/libosmprovider.so +usr/lib/qgis/librasterterrainplugin.so +usr/lib/qgis/liblabelingplugin.so +usr/share/pixmaps/qgis-icon.xpm +usr/share/pixmaps/qgis-mime-icon.png +usr/share/pixmaps/qgis-mime-icon.png usr/share/icons/crystalsvg/128x128/mimetypes +../qgis.desktop usr/share/applications +../qgis.xml usr/share/mime/packages +../mime/application/x-esri-shape.desktop usr/share/mimelnk/application +../mime/application/x-mapinfo-mif.desktop usr/share/mimelnk/application +../mime/application/x-esri-crs.desktop usr/share/mimelnk/application +../mime/application/x-raster-ecw.desktop usr/share/mimelnk/application +../mime/application/x-adobe-mif.desktop usr/share/mimelnk/application +../mime/application/x-raster-aig.desktop usr/share/mimelnk/application +../mime/application/x-qgis-project.desktop usr/share/mimelnk/application +../mime/application/x-raster-mrsid.desktop usr/share/mimelnk/application +../mime/application/x-qgis-layer-settings.desktop usr/share/mimelnk/application --- qgis-1.4.0+12730.orig/debian/qgis-plugin-grass.preinst +++ qgis-1.4.0+12730/debian/qgis-plugin-grass.preinst @@ -0,0 +1,12 @@ +#!/bin/sh + +set -e + +if [ "$1" = "install" -o "$1" = "upgrade" ]; then + dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qgis.bin /usr/bin/qgis +fi + +#DEBHELPER# + +exit 0 + --- qgis-1.4.0+12730.orig/debian/control +++ qgis-1.4.0+12730/debian/control @@ -0,0 +1,120 @@ +Source: qgis +Section: science +Priority: extra +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Debian GIS Project +Uploaders: Francesco Paolo Lovergine +Build-Depends: debhelper (>= 7), libgdal1-dev, libpq-dev, + libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, + flex, bison, python-dev, cmake (>= 2.4.3), python-sip4 (>= 4.10), python-central (>=0.5), python, + sharutils, sip4 (>= 4.10), 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.1.0), python-qt4-dev (>=4.1.0), + python-sip4-dev (>= 4.10), libfontconfig1-dev, libxi-dev, libxrandr-dev, libxrender-dev, libice-dev, + libsm-dev, pyqt4-dev-tools, libqtwebkit-dev, dpatch +Build-Conflicts: libqgis-dev, qgis-dev +Standards-Version: 3.8.4 +XS-Python-Version: current +Homepage: http://qgis.org/ +Vcs-Git: http://pkg-grass.alioth.debian.org/qgis/qgis.git + +Package: qgis +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends}, qgis-common (= ${source:Version}) +Recommends: qgis-plugin-grass, python-qgis +Suggests: gpsbabel +Conflicts: uim-qt3 +Description: Geographic Information System (GIS) + A Geographic Information System (GIS) manages, analyzes, and displays + databases of geographic information. Quantum GIS (QGIS) supports shape file + viewing and editing, spatial data storage with PostgreSQL/PostGIS, projection + on-the-fly, map composition, and a number of other features via a plugin + interface. QGIS also supports display of various georeferenced raster and + Digital Elevation Model (DEM) formats including GeoTIFF, Arc/Info ASCII Grid, + and USGS ASCII DEM. + +Package: qgis-common +Architecture: all +Recommends: qgis (>= ${binary:Version}) +Conflicts: qgis (<= 1.4.0~) +Description: Quantum GIS - architecture-independent data + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains architecture-independent supporting data files for use + with Quantum GIS. + +Package: libqgis1.4.0 +Architecture: any +Depends: ${shlibs:Depends}, ${misc:Depends} +Replaces: qgis (<=0.9.2rc1), libqgis-core1, libqgis-gui1, libqgis0, libqgis1 +Description: Quantum GIS - shared libraries + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains the shared core and gui library that provide an + interface for plugins and stand-alone applications. + +Package: libqgis-dev +Architecture: any +Section: libdevel +Depends: libqgis1.4.0 (= ${binary:Version}), libgdal1-dev, + libpq-dev, libgeos-dev (>= 3.0.0), grass-dev, + libsqlite3-dev, libgsl0-dev, libproj-dev, 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.1.0), python-qt4-dev (>=4.1.0), + qt4-designer (>=4.2.0) +Provides: qgis-dev +Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev +Description: Quantum GIS - development files + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains the headers and libraries needed to develop plugins for + Quantum GIS. + +Package: qgis-plugin-grass +Architecture: any +Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, libgdal1-1.6.0-grass, grass640+42329 +Description: GRASS plugin for Quantum GIS + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This plugin enables GRASS data access in the Quantum GIS geographic data + viewer. + +Package: qgis-plugin-grass-common +Architecture: all +Recommends: qgis-plugin-grass (>= ${binary:Version}) +Depends: python +Description: GRASS plugin for Quantum GIS - architecture-independent data + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains architecture-independent supporting data files for use + with the Quantum GIS GRASS plugin. + +Package: python-qgis +Section: python +Architecture: any +Depends: python-qt4 (>=4.1.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends} +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Python bindings to Quantum GIS + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains the files for the Python support. + +Package: python-qgis-common +Section: python +Architecture: all +Recommends: python-qgis (>= ${binary:Version}) +Provides: ${python:Provides} +XB-Python-Version: ${python:Versions} +Description: Python bindings to Quantum GIS - architecture-independent files + Quantum GIS is a Geographic Information System (GIS) which manages, analyzes + and display databases of geographic information. + . + This package contains architecture-independent files for the Quantum GIS + Python bindings. + --- qgis-1.4.0+12730.orig/debian/qgis-plugin-grass.install +++ qgis-1.4.0+12730/debian/qgis-plugin-grass.install @@ -0,0 +1,3 @@ +usr/lib/qgis/libgrassplugin.so +usr/lib/qgis/libgrassprovider.so +usr/lib/libqgisgrass.so.1.4.0 --- qgis-1.4.0+12730.orig/debian/docs +++ qgis-1.4.0+12730/debian/docs @@ -0,0 +1,4 @@ +AUTHORS +BUGS +README +TODO --- qgis-1.4.0+12730.orig/debian/qgis-plugin-grass.lintian-overrides +++ qgis-1.4.0+12730/debian/qgis-plugin-grass.lintian-overrides @@ -0,0 +1,2 @@ +qgis-plugin-grass: binary-without-manpage +qgis-plugin-grass: package-name-doesnt-match-sonames --- qgis-1.4.0+12730.orig/debian/qgis.xml +++ qgis-1.4.0+12730/debian/qgis.xml @@ -0,0 +1,163 @@ + + + + + Quantum GIS Project + Quantum GIS-Projekt + + + + + + + + + + + + + Quantum GIS layer settings + Quantum GIS Layer Einstellungen + + + + + + + + + + + + ESRI shape file + ESRI-Shapedatei + + + + + + + + + + + + + + + + + + + + + + ESRI coordinate reference system + ESRI-Koordinatenreferenzsystem + + + + + + + + + + + TIFF raster data + TIFF-Rasterdaten + + + + + + + + + + + + + + + JPEG raster data + JPEG-Rasterdaten + + + + + + + + + + JPEG2000 raster data + JPEG2000-Rasterdaten + + + + + + + + + + + + + + + + + + + + + + + + AIG raster data + AIG-Rasterdaten + + + + + + ECW raster data + ECW-Rasterdaten + + + + + + MrSID raster data + MrSID-Rasterdaten + + + + + + MapInfo file + MapInfo-Datei + + + + + + + + + + + + + + + Adobe FrameMaker MIF file + + + + + + + --- qgis-1.4.0+12730.orig/debian/qgis.desktop +++ qgis-1.4.0+12730/debian/qgis.desktop @@ -0,0 +1,13 @@ +[Desktop Entry] +Type=Application +Name=Quantum GIS +Version=1.0 +GenericName=Geographical Information System +GenericName[de]=Geographisches Informationssystem +Icon=qgis-icon +TryExec=/usr/bin/qgis +Exec=/usr/bin/qgis %F +Terminal=false +StartupNotify=false +Categories=Qt;Education;Science;Geography; +MimeType=application/x-qgis-project;image/tiff;image/jpeg;image/jp2;application/x-raster-aig;application/x-raster-ecw;application/x-raster-mrsid;application/x-mapinfo-mif;application/x-esri-shape; --- qgis-1.4.0+12730.orig/debian/python-qgis-common.install +++ qgis-1.4.0+12730/debian/python-qgis-common.install @@ -0,0 +1 @@ +usr/share/qgis/python/* --- qgis-1.4.0+12730.orig/debian/patches/00list +++ qgis-1.4.0+12730/debian/patches/00list @@ -0,0 +1,4 @@ +kfreebsd +sipversion +QT4.7 +gcc45 --- qgis-1.4.0+12730.orig/debian/patches/sipversion.dpatch +++ qgis-1.4.0+12730/debian/patches/sipversion.dpatch @@ -0,0 +1,21 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## sipversion.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Use numerical version for SIP4 + +@DPATCH@ +diff -urNad qgis-1.4.0+12730~/cmake/Python.cmake qgis-1.4.0+12730/cmake/Python.cmake +--- qgis-1.4.0+12730~/cmake/Python.cmake 2010-01-07 11:33:11.000000000 +0100 ++++ qgis-1.4.0+12730/cmake/Python.cmake 2010-02-05 18:02:29.000000000 +0100 +@@ -148,8 +148,8 @@ + IF (HAVE_SIP_MODULE AND SIP_BINARY_PATH AND SIP_INCLUDE_DIR) + # check for SIP version + # minimal version is 4.7 (to support universal builds) +- SET (SIP_MIN_VERSION 040700) +- TRY_RUN_PYTHON (RES "import sip\nprint '%x' % sip.SIP_VERSION" SIP_VERSION) ++ SET (SIP_MIN_VERSION 263936) # 0x40700 ++ TRY_RUN_PYTHON (RES "import sip\nprint '%d' % sip.SIP_VERSION" SIP_VERSION) + IF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}") + SET (SIP_IS_GOOD TRUE) + ENDIF (SIP_VERSION EQUAL "${SIP_MIN_VERSION}" OR SIP_VERSION GREATER "${SIP_MIN_VERSION}") --- qgis-1.4.0+12730.orig/debian/patches/kfreebsd.dpatch +++ qgis-1.4.0+12730/debian/patches/kfreebsd.dpatch @@ -0,0 +1,48 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## kfreebsd.dpatch by Francesco Paolo Lovergine +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: No description. + +@DPATCH@ +diff -urNad qgis-1.4.0+12730~/src/plugins/grass/qtermwidget/kpty.cpp qgis-1.4.0+12730/src/plugins/grass/qtermwidget/kpty.cpp +--- qgis-1.4.0+12730~/src/plugins/grass/qtermwidget/kpty.cpp 2010-01-07 11:33:13.000000000 +0100 ++++ qgis-1.4.0+12730/src/plugins/grass/qtermwidget/kpty.cpp 2010-02-03 11:12:18.000000000 +0100 +@@ -109,24 +109,24 @@ + # define _NEW_TTY_CTRL + #endif + +-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) ++#if defined(HAVE_TCGETATTR) ++# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode) ++#elif defined(TIOCGETA) + # define _tcgetattr(fd, ttmode) ioctl(fd, TIOCGETA, (char *)ttmode) ++#elif defined(TCGETS) ++# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode) + #else +-# if defined(_HPUX_SOURCE) || defined(__Lynx__) || defined (__CYGWIN__) +-# define _tcgetattr(fd, ttmode) tcgetattr(fd, ttmode) +-# else +-# define _tcgetattr(fd, ttmode) ioctl(fd, TCGETS, (char *)ttmode) +-# endif ++# error HAVE_TCGETATTR || TIOCGETA || TCGETS required + #endif +- +-#if defined (__FreeBSD__) || defined (__NetBSD__) || defined (__OpenBSD__) || defined (__bsdi__) || defined(__APPLE__) || defined (__DragonFly__) ++ ++#if defined(HAVE_TCSETATTR) && defined(TCSANOW) ++# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode) ++#elif defined(TIOCSETA) + # define _tcsetattr(fd, ttmode) ioctl(fd, TIOCSETA, (char *)ttmode) ++#elif defined(TCSETS) ++# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode) + #else +-# if defined(_HPUX_SOURCE) || defined(__CYGWIN__) +-# define _tcsetattr(fd, ttmode) tcsetattr(fd, TCSANOW, ttmode) +-# else +-# define _tcsetattr(fd, ttmode) ioctl(fd, TCSETS, (char *)ttmode) +-# endif ++# error (HAVE_TCSETATTR && TCSANOW) || TIOCSETA || TCSETS required + #endif + + //#include --- qgis-1.4.0+12730.orig/debian/patches/gcc45.dpatch +++ qgis-1.4.0+12730/debian/patches/gcc45.dpatch @@ -0,0 +1,14 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run + +@DPATCH@ +--- ./src/app/composer/qgscomposer.cpp~ 2010-01-07 11:33:12.000000000 +0100 ++++ ./src/app/composer/qgscomposer.cpp 2010-12-15 13:52:24.450934486 +0100 +@@ -1030,7 +1030,7 @@ + QSettings settings; + restoreGeometry( settings.value( "/Composer/geometry" ).toByteArray() ); + QVariant splitterState = settings.value( "/Composer/splitterState" ); +- if ( splitterState != QVariant::QVariant() ) ++ if ( splitterState != QVariant() ) + { + //mSplitter->restoreState(settings.value("/Composer/splitterState").toByteArray()); + } --- qgis-1.4.0+12730.orig/debian/patches/QT4.7.dpatch +++ qgis-1.4.0+12730/debian/patches/QT4.7.dpatch @@ -0,0 +1,162 @@ +#! /bin/sh /usr/share/dpatch/dpatch-run +## QT4.7.dpatch by Johan Van de Wauw +## +## All lines beginning with `## DP:' are a description of the patch. +## DP: Fix compilation issues with QT 4.7 (LP: #540941) +## DP: Contains upstream svn changesets: 13213,13215,13299 + +@DPATCH@ + +diff -Nru qgis-1.4.0+12730.orig/src/core/qgscoordinatereferencesystem.cpp qgis-1.4.0+12730/src/core/qgscoordinatereferencesystem.cpp +--- qgis-1.4.0+12730.orig/src/core/qgscoordinatereferencesystem.cpp 2010-01-07 11:33:12.000000000 +0100 ++++ qgis-1.4.0+12730/src/core/qgscoordinatereferencesystem.cpp 2010-07-11 13:20:49.000000000 +0200 +@@ -45,9 +45,9 @@ + //-------------------------- + + QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem() +- : mMapUnits( QGis::UnknownUnit ), +- mIsValidFlag( 0 ), +- mValidationHint( 0 ) ++ : mMapUnits( QGis::UnknownUnit ) ++ , mIsValidFlag( 0 ) ++ , mValidationHint( "" ) + { + mCRS = OSRNewSpatialReference( NULL ); + } +@@ -55,7 +55,7 @@ + QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( QString theWkt ) + : mMapUnits( QGis::UnknownUnit ), + mIsValidFlag( 0 ), +- mValidationHint( 0 ) ++ mValidationHint( "" ) + { + mCRS = OSRNewSpatialReference( NULL ); + createFromWkt( theWkt ); +@@ -65,7 +65,7 @@ + QgsCoordinateReferenceSystem::QgsCoordinateReferenceSystem( const long theId, CrsType theType ) + : mMapUnits( QGis::UnknownUnit ), + mIsValidFlag( 0 ), +- mValidationHint( 0 ) ++ mValidationHint( "" ) + { + mCRS = OSRNewSpatialReference( NULL ); + createFromId( theId, theType ); +diff -Nru qgis-1.4.0+12730.orig/src/core/qgshttptransaction.cpp qgis-1.4.0+12730/src/core/qgshttptransaction.cpp +--- qgis-1.4.0+12730.orig/src/core/qgshttptransaction.cpp 2010-01-07 11:33:12.000000000 +0100 ++++ qgis-1.4.0+12730/src/core/qgshttptransaction.cpp 2010-07-11 15:29:04.000000000 +0200 +@@ -45,10 +45,10 @@ + QNetworkProxy::ProxyType proxyType, + QString userName, + QString password ) +- : httpresponsecontenttype( 0 ), ++ : httpresponsecontenttype( "" ), + httpurl( uri ), + httphost( proxyHost ), +- mError( 0 ) ++ mError( "" ) + { + QSettings s; + mNetworkTimeoutMsec = s.value( "/qgis/networkAndProxy/networkTimeout", "20000" ).toInt(); +@@ -206,7 +206,7 @@ + http = 0; + + // Did we get an error? If so, bail early +- if ( !mError.isNull() ) ++ if ( !mError.isEmpty() ) + { + QgsDebugMsg( "Processing an error '" + mError + "'." ); + return FALSE; +diff -Nru qgis-1.4.0+12730.orig/src/core/qgsmessageoutput.cpp qgis-1.4.0+12730/src/core/qgsmessageoutput.cpp +--- qgis-1.4.0+12730.orig/src/core/qgsmessageoutput.cpp 2010-01-07 11:33:12.000000000 +0100 ++++ qgis-1.4.0+12730/src/core/qgsmessageoutput.cpp 2010-07-11 13:20:49.000000000 +0200 +@@ -44,7 +44,7 @@ + // QgsMessageOutputConsole + + QgsMessageOutputConsole::QgsMessageOutputConsole() +- : mMessage( NULL ) ++ : mMessage( "" ) + { + } + +diff -Nru qgis-1.4.0+12730.orig/src/core/qgsvectorlayer.cpp qgis-1.4.0+12730/src/core/qgsvectorlayer.cpp +--- qgis-1.4.0+12730.orig/src/core/qgsvectorlayer.cpp 2010-01-07 11:33:12.000000000 +0100 ++++ qgis-1.4.0+12730/src/core/qgsvectorlayer.cpp 2010-07-11 13:20:49.000000000 +0200 +@@ -2495,7 +2495,7 @@ + + // look at the fields in the layer and set the primary + // display field using some real fuzzy logic +- setDisplayField(); ++ setDisplayField(""); + + if ( mProviderKey == "postgres" ) + { +diff -Nru qgis-1.4.0+12730.orig/src/core/qgsvectorlayer.h qgis-1.4.0+12730/src/core/qgsvectorlayer.h +--- qgis-1.4.0+12730.orig/src/core/qgsvectorlayer.h 2010-01-07 11:33:12.000000000 +0100 ++++ qgis-1.4.0+12730/src/core/qgsvectorlayer.h 2010-07-11 13:20:49.000000000 +0200 +@@ -91,8 +91,8 @@ + }; + + /** Constructor */ +- QgsVectorLayer( QString path = 0, QString baseName = 0, +- QString providerLib = 0, bool loadDefaultStyleFlag = true ); ++ QgsVectorLayer( QString path = QString::null, QString baseName = QString::null, ++ QString providerLib = QString::null, bool loadDefaultStyleFlag = true ); + + /** Destructor */ + virtual ~QgsVectorLayer(); +diff -Nru qgis-1.4.0+12730.orig/src/plugins/grass/qgsgrassmapcalc.h qgis-1.4.0+12730/src/plugins/grass/qgsgrassmapcalc.h +--- qgis-1.4.0+12730.orig/src/plugins/grass/qgsgrassmapcalc.h 2010-01-07 11:33:13.000000000 +0100 ++++ qgis-1.4.0+12730/src/plugins/grass/qgsgrassmapcalc.h 2010-07-11 13:20:49.000000000 +0200 +@@ -219,8 +219,8 @@ + + QgsGrassMapcalcFunction() {}; + QgsGrassMapcalcFunction( int type, QString name, int count = 2, +- QString description = 0, QString label = 0, +- QString labels = 0, bool drawLabel = true ); ++ QString description = "", QString label = "", ++ QString labels = "", bool drawLabel = true ); + ~QgsGrassMapcalcFunction() {}; + + QString name() { return mName; } +@@ -331,7 +331,7 @@ + ~QgsGrassMapcalcObject(); + + // Set map name, constant value or function/operator +- void setValue( QString val, QString lab = 0 ); ++ void setValue( QString val, QString lab = "" ); + + // Set function + void setFunction( QgsGrassMapcalcFunction f ); +diff -Nru qgis-1.4.0+12730.orig/src/plugins/grass/qgsgrassmodule.cpp qgis-1.4.0+12730/src/plugins/grass/qgsgrassmodule.cpp +--- qgis-1.4.0+12730.orig/src/plugins/grass/qgsgrassmodule.cpp 2010-01-07 11:33:13.000000000 +0100 ++++ qgis-1.4.0+12730/src/plugins/grass/qgsgrassmodule.cpp 2010-07-11 13:20:49.000000000 +0200 +@@ -1946,7 +1946,7 @@ + QWidget * parent ) + : QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent ), + mModuleStandardOptions( options ), +- mGeometryTypeOption( 0 ), mVectorLayerOption( 0 ), ++ mGeometryTypeOption( "" ), mVectorLayerOption( "" ), + mRegionButton( 0 ), mUpdate( false ), mRequired( false ) + { + QgsDebugMsg( "called." ); +@@ -2581,7 +2581,7 @@ + QgsGrassModule *module, int type, QString key, QDomElement &qdesc, + QDomElement &gdesc, QDomNode &gnode, QWidget * parent ) + : QgsGrassModuleGroupBoxItem( module, key, qdesc, gdesc, gnode, parent ), +- mType( type ), mOgrLayerOption( 0 ), mOgrWhereOption( 0 ) ++ mType( type ), mOgrLayerOption( "" ), mOgrWhereOption( "" ) + { + if ( mTitle.isEmpty() ) + { +diff -Nru qgis-1.4.0+12730.orig/src/providers/wms/qgswmsprovider.cpp qgis-1.4.0+12730/src/providers/wms/qgswmsprovider.cpp +--- qgis-1.4.0+12730.orig/src/providers/wms/qgswmsprovider.cpp 2010-01-07 11:33:14.000000000 +0100 ++++ qgis-1.4.0+12730/src/providers/wms/qgswmsprovider.cpp 2010-07-11 13:20:49.000000000 +0200 +@@ -60,7 +60,7 @@ + cachedPixelHeight( 0 ), + mCoordinateTransform( 0 ), + extentDirty( TRUE ), +- mGetFeatureInfoUrlBase( 0 ), ++ mGetFeatureInfoUrlBase( "" ), + mLayerCount( -1 ) + + { --- qgis-1.4.0+12730.orig/debian/mime/application/x-raster-mrsid.desktop +++ qgis-1.4.0+12730/debian/mime/application/x-raster-mrsid.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=MimeType +MimeType=application/x-raster-mrsid +Hidden=false +Comment=MrSID raster data +Comment[de]=MrSID-Rasterdaten +Icon=qgis-mime-icon +Patterns=*.sid; --- qgis-1.4.0+12730.orig/debian/mime/application/x-esri-crs.desktop +++ qgis-1.4.0+12730/debian/mime/application/x-esri-crs.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=MimeType +MimeType=application/x-esri-crs +Hidden=false +Comment=ESRI coordinate reference system +Comment[de]=ESRI-Koordinatenbezugssystem +Icon=qgis-mime-icon +Patterns=*.prj; --- qgis-1.4.0+12730.orig/debian/mime/application/x-adobe-mif.desktop +++ qgis-1.4.0+12730/debian/mime/application/x-adobe-mif.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=MimeType +MimeType=application/x-adobe-mif +Hidden=false +Comment=Adobe FrameMaker MIF file +Patterns=*.mif; +X-KDE-PatternsAccuracy=51 +X-KDE-IsAlso=application/x-mif --- qgis-1.4.0+12730.orig/debian/mime/application/x-esri-shape.desktop +++ qgis-1.4.0+12730/debian/mime/application/x-esri-shape.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=MimeType +MimeType=application/x-esri-shape +Hidden=false +Comment=ESRI shape file +Comment[de]=ESRI-Shapedatei +Icon=qgis-mime-icon +Patterns=*.shp;*.shx; --- qgis-1.4.0+12730.orig/debian/mime/application/x-raster-ecw.desktop +++ qgis-1.4.0+12730/debian/mime/application/x-raster-ecw.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=MimeType +MimeType=application/x-raster-ecw +Hidden=false +Comment=ECW raster data +Comment[de]=ECW-Rasterdaten +Icon=qgis-mime-icon +Patterns=*.ecw; --- qgis-1.4.0+12730.orig/debian/mime/application/x-raster-aig.desktop +++ qgis-1.4.0+12730/debian/mime/application/x-raster-aig.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=MimeType +MimeType=application/x-raster-aig +Hidden=false +Comment=AIG raster data +Comment[de]=AIG-Rasterdaten +Icon=qgis-mime-icon +Patterns=*.aig; --- qgis-1.4.0+12730.orig/debian/mime/application/x-qgis-project.desktop +++ qgis-1.4.0+12730/debian/mime/application/x-qgis-project.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=MimeType +MimeType=application/x-qgis-project +Hidden=false +Comment=Quantum GIS Project +Comment[de]=Quantum GIS-Projekt +Patterns=*.qgs; +Icon=qgis-mime-icon +X-KDE-IsAlso=application/x-qgis --- qgis-1.4.0+12730.orig/debian/mime/application/x-mapinfo-mif.desktop +++ qgis-1.4.0+12730/debian/mime/application/x-mapinfo-mif.desktop @@ -0,0 +1,9 @@ +[Desktop Entry] +Type=MimeType +MimeType=application/x-mapinfo-mif +Hidden=false +Comment=MapInfo file +Comment[de]=MapInfo-Datei +Patterns=*.mif; +Icon=qgis-mime-icon +X-KDE-PatternsAccuracy=60 --- qgis-1.4.0+12730.orig/debian/mime/application/x-qgis-layer-settings.desktop +++ qgis-1.4.0+12730/debian/mime/application/x-qgis-layer-settings.desktop @@ -0,0 +1,8 @@ +[Desktop Entry] +Type=MimeType +MimeType=application/x-qgis-layer-settings +Hidden=false +Comment=Quantum GIS layer settings +Comment[de]=Quantum GIS Layer Einstellungen +Icon=qgis-mime-icon +Patterns=*.qml;