Skip to content

Commit

Permalink
Merge branch 'master' of github.com:qgis/Quantum-GIS
Browse files Browse the repository at this point in the history
  • Loading branch information
timlinux committed May 25, 2011
2 parents 3f50ee2 + c3e161a commit 4be0d71
Show file tree
Hide file tree
Showing 100 changed files with 695 additions and 732 deletions.
30 changes: 10 additions & 20 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -348,27 +348,17 @@ IF(COMMAND cmake_policy)
ENDIF(COMMAND cmake_policy)

IF (WIN32)
# expect that classes are being imported
# Note: MSVC doesn't like when the macros are quotes
# and MSYS doesn't like them unqouted (bacause of braces)
IF (MSVC)
ADD_DEFINITIONS("-DCORE_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DGUI_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DPYTHON_EXPORT=__declspec(dllimport)")
ADD_DEFINITIONS("-DANALYSIS_EXPORT=__declspec(dllimport)")
ELSE (MSVC)
ADD_DEFINITIONS("\"-DCORE_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DGUI_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DPYTHON_EXPORT=__declspec(dllimport)\"")
ADD_DEFINITIONS("\"-DANALYSIS_EXPORT=__declspec(dllimport)\"")
ENDIF (MSVC)
SET(DLLIMPORT "__declspec(dllimport)")
SET(DLLEXPORT "__declspec(dllexport)")
ELSE (WIN32)
# other compilers don't use that MSVC construct
ADD_DEFINITIONS(-DCORE_EXPORT=)
ADD_DEFINITIONS(-DGUI_EXPORT=)
ADD_DEFINITIONS(-DPYTHON_EXPORT=)
ADD_DEFINITIONS(-DANALYSIS_EXPORT=)
ENDIF (WIN32)
SET(DLLIMPORT "")
SET(DLLEXPORT "")
ENDIF(WIN32)

ADD_DEFINITIONS("-DCORE_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DGUI_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DPYTHON_EXPORT=${DLLIMPORT}")
ADD_DEFINITIONS("-DANALYSIS_EXPORT=${DLLIMPORT}")

#############################################################
# user-changeable settings which can be used to customize
Expand Down
3 changes: 2 additions & 1 deletion debian/changelog
Original file line number Diff line number Diff line change
@@ -1,8 +1,9 @@
qgis (1.8.0) UNRELEASED; urgency=low

* new development version 1.8 after branch
* add qgis browser (qbrowser)

-- Jürgen E. Fischer <jef@norbit.de> Sat, 07 May 2011 00:47:20 +0200
-- Jürgen E. Fischer <jef@norbit.de> Mon, 23 May 2011 18:08:18 +0200

qgis (1.7.0) UNRELEASED; urgency=low

Expand Down
4 changes: 2 additions & 2 deletions debian/control.hardy
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -104,7 +104,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down
5 changes: 3 additions & 2 deletions debian/control.intrepid
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down Expand Up @@ -148,6 +148,7 @@ Description: Quantum GIS mapserver

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Expand Down
5 changes: 3 additions & 2 deletions debian/control.jaunty
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down Expand Up @@ -148,6 +148,7 @@ Description: Quantum GIS mapserver

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Expand Down
5 changes: 3 additions & 2 deletions debian/control.karmic
Original file line number Diff line number Diff line change
Expand Up @@ -80,7 +80,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -105,7 +105,7 @@ Description: Python bindings to Quantum GIS
Package: python-qgis-common
Section: python
Architecture: all
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
Provides: ${python:Provides}
XB-Python-Version: ${python:Versions}
Description: Python bindings to Quantum GIS - architecture-independent files
Expand Down Expand Up @@ -148,6 +148,7 @@ Description: Quantum GIS mapserver

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Expand Down
5 changes: 3 additions & 2 deletions debian/control.lenny
Original file line number Diff line number Diff line change
Expand Up @@ -109,7 +109,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -135,7 +135,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
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
Expand Down Expand Up @@ -186,6 +186,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Expand Down
5 changes: 3 additions & 2 deletions debian/control.lucid
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -136,7 +136,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
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
Expand Down Expand Up @@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Expand Down
5 changes: 3 additions & 2 deletions debian/control.maverick
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -137,7 +137,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
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
Expand Down Expand Up @@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Expand Down
5 changes: 3 additions & 2 deletions debian/control.natty
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -137,7 +137,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
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
Expand Down Expand Up @@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Expand Down
5 changes: 3 additions & 2 deletions debian/control.sid
Original file line number Diff line number Diff line change
Expand Up @@ -111,7 +111,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -137,7 +137,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
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
Expand Down Expand Up @@ -188,6 +188,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Expand Down
5 changes: 3 additions & 2 deletions debian/control.squeeze
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,7 @@ Description: GRASS plugin for Quantum GIS

Package: qgis-plugin-grass-common
Architecture: all
Depends: python
Depends: ${python:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Description: GRASS plugin for Quantum GIS - architecture-independent data
Expand All @@ -136,7 +136,7 @@ Package: python-qgis-common
Section: python
Architecture: all
Provides: ${python:Provides}
Depends: gdal-bin, python-gdal
Depends: gdal-bin, python-gdal, ${python:Depends}
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
Expand Down Expand Up @@ -187,6 +187,7 @@ Description: Quantum GIS sql anywhere plugin and provider

Package: qgis-api-doc
Architecture: all
Section: doc
Description: Quantum GIS API documentation
Quantum GIS is a Geographic Information System (GIS) which manages, analyzes
and display databases of geographic information.
Expand Down
1 change: 1 addition & 0 deletions debian/python-qgis.lintian-overrides.in
Original file line number Diff line number Diff line change
@@ -1 +1,2 @@
python-qgis: package-name-doesnt-match-sonames
python-qgis: no-symbols-control-file
1 change: 0 additions & 1 deletion debian/qgis-plugin-grass.lintian-overrides
Original file line number Diff line number Diff line change
@@ -1,3 +1,2 @@
qgis-plugin-grass: binary-without-manpage
qgis-plugin-grass: package-name-doesnt-match-sonames
qgis-plugin-grass: no-symbols-control-file
1 change: 1 addition & 0 deletions debian/qgis-plugin-grass.postrm
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ set -e

if [ "$1" = "remove" ]; then
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qgis.bin /usr/bin/qgis
dpkg-divert --package qgis-plugin-grass --remove --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
fi

#DEBHELPER#
Expand Down
1 change: 1 addition & 0 deletions debian/qgis-plugin-grass.preinst
Original file line number Diff line number Diff line change
Expand Up @@ -4,6 +4,7 @@ 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
dpkg-divert --package qgis-plugin-grass --add --rename --divert /usr/bin/qbrowser.bin /usr/bin/qbrowser
fi

#DEBHELPER#
Expand Down
2 changes: 2 additions & 0 deletions debian/qgis-sqlanywhere{QGIS_ABI}.lintian-overrides
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
qgis-sqlanywhere{QGIS_ABI}: package-name-doesnt-match-sonames
qgis-sqlanywhere{QGIS_ABI}: no-symbols-control-file
8 changes: 7 additions & 1 deletion debian/rules
Original file line number Diff line number Diff line change
Expand Up @@ -129,6 +129,10 @@ endif
# Add here commands to install the package into debian/tmp.
$(MAKE) -C debian/build install DESTDIR=$(CURDIR)/debian/tmp

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

# 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
Expand All @@ -150,17 +154,19 @@ binary-arch: build install

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 $(CURDIR)/debian/tmp/usr/bin/qbrowser $(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
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser

dh_pycentral
dh_installmenu
dh_icons
ifneq (,$(findstring $(DISTRIBUTION),"lenny hardy"))
dh_desktop
endif
dh_installman -pqgis qgis.1
dh_installman -pqgis qgis.1 qbrowser.1
dh_installmime -pqgis
dh_link
if which dh_lintian >/dev/null; then dh_lintian; fi
Expand Down

0 comments on commit 4be0d71

Please sign in to comment.