trunk_lenny_chages_2july2010.diff

current patch for attempting qgis build on debian/lenny + grass6.5 - hamish -, 2010-07-01 11:47 PM

Download (6.59 KB)

View differences:

debian/control (working copy)
3 3 
Priority: extra
4 4 
Maintainer: Quantum GIS developers <[email protected]>
5 5 
Build-Depends: debhelper (>= 5.0.51~), libgdal1-dev, libpq-dev,
6 
 libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj (<< 4.7.0) | libproj-dev (>= 4.7.0), libexpat1-dev,
7 
 flex, bison, python-dev, cmake (>= 2.6), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
8 
 sip4 (>= 4.5), libqt4-core (>=4.4.0), libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0),
9 
 libqt4-sql (>=4.4.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
6 
 libgeos-dev (>= 3.0.0), grass-dev, libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev,
7 
 flex, bison, python-dev, cmake (>=2.4.3), python-sip4 (>= 4.5.0), python-central (>=0.5), python,
8 
 sip4 (>= 4.5), libqt4-core (>=4.2.0), libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0),
9 
 libqt4-qt3support (>=4.2.0), libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),
10 10 
 python-sip4-dev (>= 4.5.0), pyqt4-dev-tools, libqwt5-qt4-dev
11 11 
Build-Conflicts: libqgis-dev, qgis-dev
12 
Standards-Version: 3.8.4
12 
Standards-Version: 3.8.0
13 13 
XS-Python-Version: current
14 14 
Homepage: http://qgis.org/
15 15 

  		




  ......




  30
  30
  
    

  		




  31
  31
  
    
Package: qgis-common

  		




  32
  32
  
    
Architecture: all

  		




  33
  
  
    
Depends: qgis (>= ${binary:Version})

  		




  
  33
  
    
Depends: qgis (>= ${source:Version})

  		




  34
  34
  
    
Description: Quantum GIS - architecture-independent data

  		




  35
  35
  
    
 Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

  		




  36
  36
  
    
 and display databases of geographic information.

  		




  ......




  54
  54
  
    
Section: libdevel

  		




  55
  55
  
    
Depends: libqgis1.5.0 (= ${binary:Version}), libgdal1-dev,

  		




  56
  56
  
    
 libpq-dev, libgeos-dev (>= 3.0.0), grass-dev,

  		




  57
  
  
    
 libsqlite3-dev, libgsl0-dev, libproj-dev, libexpat1-dev, libqt4-core (>=4.4.0),

  		




  58
  
  
    
 libqt4-dev (>=4.4.0), libqt4-gui (>=4.4.0), libqt4-sql (>=4.4.0),

  		




  59
  
  
    
 python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0), qt4-designer (>=4.4.0)

  		




  
  57
  
    
 libsqlite3-dev, libgsl0-dev, proj, libexpat1-dev, libqt4-core (>=4.2.0),

  		




  
  58
  
    
 libqt4-dev (>=4.2.0), libqt4-gui (>=4.2.0), libqt4-qt3support (>=4.2.0),

  		




  
  59
  
    
 libqt4-sql (>=4.2.0), python-qt4 (>=4.1.0), python-qt4-dev (>=4.1.0),

  		




  
  60
  
    
 qt4-designer (>=4.2.0)

  		




  60
  61
  
    
Provides: qgis-dev

  		




  61
  
  
    
Replaces: qgis-dev, libqgis1-dev, libqgis1.4.0-dev

  		




  
  62
  
    
Replaces: qgis-dev, libqgis1-dev

  		




  62
  63
  
    
Description: Quantum GIS - development files

  		




  63
  64
  
    
 Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

  		




  64
  65
  
    
 and display databases of geographic information.

  		




  ......




  68
  69
  
    

  		




  69
  70
  
    
Package: qgis-plugin-grass

  		




  70
  71
  
    
Architecture: any

  		




  71
  
  
    
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}, grass640-5+41380

  		




  
  72
  
    
Depends: qgis (= ${binary:Version}), qgis-plugin-grass-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}

  		




  72
  73
  
    
Description: GRASS plugin for Quantum GIS

  		




  73
  74
  
    
 Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

  		




  74
  75
  
    
 and display databases of geographic information.

  		




  ......




  78
  79
  
    

  		




  79
  80
  
    
Package: qgis-plugin-grass-common

  		




  80
  81
  
    
Architecture: all

  		




  81
  
  
    
Depends: python

  		




  
  82
  
    
Depends: qgis-plugin-grass (>= ${source:Version}), python

  		




  82
  83
  
    
Description: GRASS plugin for Quantum GIS - architecture-independent data

  		




  83
  84
  
    
 Quantum GIS is a Geographic Information System (GIS) which manages, analyzes

  		




  84
  85
  
    
 and display databases of geographic information.

  		




  ......




  89
  90
  
    
Package: python-qgis

  		




  90
  91
  
    
Section: python

  		




  91
  92
  
    
Architecture: any

  		




  92
  
  
    
Depends: python-qt4 (>=4.1.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}

  		




  
  93
  
    
Depends: python-qt4 (>=4.1.0), python-sip4 (>= 4.5.0), python-qgis-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}

  		




  93
  94
  
    
Provides: ${python:Provides}

  		




  94
  95
  
    
XB-Python-Version: ${python:Versions}

  		




  95
  96
  
    
Description: Python bindings to Quantum GIS

  		




  ......




  101
  102
  
    
Package: python-qgis-common

  		




  102
  103
  
    
Section: python

  		




  103
  104
  
    
Architecture: all

  		




  
  105
  
    
Depends: gdal-bin, python-gdal

  		




  104
  106
  
    
Provides: ${python:Provides}

  		




  105
  107
  
    
XB-Python-Version: ${python:Versions}

  		




  106
  108
  
    
Description: Python bindings to Quantum GIS - architecture-independent files

  		












  

    
      debian/qgis-plugin-grass-common.install	(working copy)
    
  





  4
  4
  
    
usr/share/qgis/grass/modules/*.png

  		




  5
  5
  
    
usr/share/qgis/grass/modules/*.qgm

  		




  6
  6
  
    
usr/share/qgis/grass/modules/*.svg

  		




  7
  
  
    
usr/share/qgis/grass/scripts/*.py

  		




  8
  7
  
    
usr/share/qgis/themes/*/grass

  		












  

    
      debian/changelog	(working copy)
    
  





  1
  
  
    
qgis (1.5.0) UNRELEASED; urgency=low

  		




  
  1
  
    
qgis (1.5.0.lenny) lenny; urgency=low

  		




  2
  2
  
    

  		




  3
  3
  
    
  * new development version after 1.5 branch

  		




  4
  4
  
    
  * adapted Francesco Paolo Lovergine's updates to Debian qgis 1.4 package

  		












  

    
      debian/rules	(working copy)
    
  





  23
  23
  
    

  		




  24
  24
  
    
CMAKE_OPTS := \

  		




  25
  25
  
    
	-Wno-dev \

  		




  26
  
  
    
	-D GRASS_PREFIX=/usr/lib/grass64 \

  		




  
  26
  
    
	-D GRASS_PREFIX=/home/hamish/dev/grass/svn/grass65/dist.x86_64-unknown-linux-gnu \

  		




  
  27
  
    
	-D GRASS_INCLUDE_DIR=/home/hamish/dev/grass/svn/grass65/dist.x86_64-unknown-linux-gnu/include \

  		




  27
  28
  
    
	-D CMAKE_INSTALL_PREFIX=/usr \

  		




  28
  29
  
    
	-D CMAKE_SKIP_RPATH=TRUE \

  		




  29
  30
  
    
	-D BINDINGS_GLOBAL_INSTALL=TRUE \

  		




  30
  31
  
    
	-D PEDANTIC=TRUE \

  		




  31
  
  
    
	-D WITH_SPATIALITE=TRUE

  		




  
  32
  
    
	-D WITH_SPATIALITE=FALSE

  		




  32
  33
  
    

  		




  33
  34
  
    
ifeq (,$(findstring $(DISTRIBUTION),"squeeze lucid sid"))

  		




  34
  35
  
    
	CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE

  		




  ......




  160
  161
  
    
	dh_installmime -pqgis

  		




  161
  162
  
    
	dh_link

  		




  162
  163
  
    
	if which dh_lintian >/dev/null; then dh_lintian; fi

  		




  163
  
  
    
	dh_strip

  		




  
  164
  
    
	#dh_strip

  		




  164
  165
  
    
	dh_compress --exclude=pdf

  		




  165
  166
  
    
	dh_fixperms

  		




  166
  167
  
    
	dh_makeshlibs

  		




  167
  168
  
    
	dh_installdeb

  		




  168
  
  
    
	dh_shlibdeps -l/usr/lib/$(GRASS)/lib

  		




  
  169
  
    
	#dh_shlibdeps -l/usr/lib/$(GRASS)/lib

  		




  
  170
  
    
	#LD_LIBRARY_PATH=$(LD_LIBRARY_PATH):/home/hamish/dev/grass/svn/grass65/dist.x86_64-unknown-linux-gnu/lib dh_shlibdeps

  		




  
  171
  
    
	dh_shlibdeps -l/home/hamish/dev/grass/svn/grass65/dist.x86_64-unknown-linux-gnu/lib

  		




  169
  172
  
    
	dh_gencontrol

  		




  170
  173
  
    
	dh_md5sums

  		




  171
  174
  
    
	dh_builddeb

  		












  

    
      CMakeLists.txt	(working copy)
    
  





  56
  56
  
    

  		




  57
  57
  
    
SET (WITH_QWT TRUE CACHE BOOL "Determines whether QWT support should be included (currently used for GPS widget)")

  		




  58
  58
  
    

  		




  59
  
  
    
SET (WITH_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built")

  		




  
  59
  
    
SET (WITH_SPATIALITE FALSE CACHE BOOL "Determines whether SPATIALITE support should be built")

  		




  60
  60
  
    

  		




  61
  61
  
    
IF (WITH_SPATIALITE)

  		




  62
  62
  
    
  SET (WITH_INTERNAL_SPATIALITE TRUE CACHE BOOL "Determines whether SPATIALITE support should be built internally")