4 changes: 3 additions & 1 deletion debian/changelog
View file
Original file line number Diff line number Diff line change
@@ -1,8 +1,10 @@
qgis (2.3.0) UNRELEASED; urgency=medium

* New development version 2.3 after branch of 2.2
* enable globe on jessie
* add dependency on libqt4-sql-sqlite to qgis-provider

-- Jürgen E. Fischer <jef@norbit.de> Sat, 22 Feb 2014 09:49:29 +0100
-- Jürgen E. Fischer <jef@norbit.de> Sun, 23 Feb 2014 11:36:30 +0100

qgis (2.2.0) unstable; urgency=medium

Expand Down
1 change: 1 addition & 0 deletions debian/control.jessie
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ Package: qgis-providers
Architecture: any
Depends:
qgis-providers-common (= ${source:Version}),
libqt4-sql-sqlite,
${shlibs:Depends},
${misc:Depends}
Replaces: qgis (<= 1.6)
Expand Down
6 changes: 5 additions & 1 deletion debian/control.precise
View file
Original file line number Diff line number Diff line change
Expand Up @@ -157,7 +157,11 @@ Description: Python bindings to QGIS - architecture-independent files

Package: qgis-providers
Architecture: any
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Depends:
qgis-providers-common (= ${source:Version}),
libqt4-sql-sqlite,
${shlibs:Depends},
${misc:Depends}
Replaces: qgis (<= 1.6)
Breaks: qgis (<= 1.6)
Description: collection of data providers to QGIS
Expand Down
1 change: 1 addition & 0 deletions debian/control.quantal
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ Package: qgis-providers
Architecture: any
Depends:
qgis-providers-common (= ${source:Version}),
libqt4-sql-sqlite,
${shlibs:Depends},
${misc:Depends}
Replaces: qgis (<= 1.6)
Expand Down
1 change: 1 addition & 0 deletions debian/control.raring
View file
Original file line number Diff line number Diff line change
Expand Up @@ -174,6 +174,7 @@ Package: qgis-providers
Architecture: any
Depends:
qgis-providers-common (= ${source:Version}),
libqt4-sql-sqlite,
${shlibs:Depends},
${misc:Depends}
Replaces: qgis (<= 1.6)
Expand Down
1 change: 1 addition & 0 deletions debian/control.saucy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ Package: qgis-providers
Architecture: any
Depends:
qgis-providers-common (= ${source:Version}),
libqt4-sql-sqlite,
${shlibs:Depends},
${misc:Depends}
Replaces: qgis (<= 1.6)
Expand Down
1 change: 1 addition & 0 deletions debian/control.sid
View file
Original file line number Diff line number Diff line change
Expand Up @@ -172,6 +172,7 @@ Package: qgis-providers
Architecture: any
Depends:
qgis-providers-common (= ${source:Version}),
libqt4-sql-sqlite,
${shlibs:Depends},
${misc:Depends}
Replaces: qgis (<= 1.6)
Expand Down
1 change: 1 addition & 0 deletions debian/control.sid-oracle
View file
Original file line number Diff line number Diff line change
Expand Up @@ -173,6 +173,7 @@ Package: qgis-providers
Architecture: any
Depends:
qgis-providers-common (= ${source:Version}),
libqt4-sql-sqlite,
${shlibs:Depends},
${misc:Depends}
Replaces: qgis (<= 1.6)
Expand Down
1 change: 1 addition & 0 deletions debian/control.trusty
View file
Original file line number Diff line number Diff line change
Expand Up @@ -170,6 +170,7 @@ Package: qgis-providers
Architecture: any
Depends:
qgis-providers-common (= ${source:Version}),
libqt4-sql-sqlite,
${shlibs:Depends},
${misc:Depends}
Replaces: qgis (<= 1.6)
Expand Down
6 changes: 5 additions & 1 deletion debian/control.wheezy
View file
Original file line number Diff line number Diff line change
Expand Up @@ -156,7 +156,11 @@ Description: Python bindings to QGIS - architecture-independent files

Package: qgis-providers
Architecture: any
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
Depends:
qgis-providers-common (= ${source:Version}),
libqt4-sql-sqlite,
${shlibs:Depends},
${misc:Depends}
Replaces: qgis (<= 1.6)
Breaks: qgis (<= 1.6)
Description: collection of data providers to QGIS
Expand Down
8 changes: 2 additions & 6 deletions debian/rules
View file
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,8 @@ CMAKE_OPTS := \
-D WITH_MAPSERVER=TRUE \
-D MAPSERVER_SKIP_ECW=TRUE \
-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
-D WITH_APIDOC=TRUE
-D WITH_APIDOC=TRUE \
-D WITH_GLOBE=TRUE

MAKEFLAGS += VERBOSE=YES

Expand All @@ -61,11 +62,6 @@ ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie sid precise raring saucy tru
CMAKE_OPTS += -D WITH_PYSPATIALITE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"jessie"))
CMAKE_OPTS += -D WITH_GLOBE=FALSE
else
CMAKE_OPTS += -D WITH_GLOBE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"jessie raring saucy trusty sid sid-oracle"))
CMAKE_OPTS += -D PYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so
Expand Down
1 change: 1 addition & 0 deletions doc/AUTHORS
View file
Original file line number Diff line number Diff line change
Expand Up @@ -56,3 +56,4 @@ Nyall Dawson <nyall dot dawson at gmail dot com>
Vinayan Parameswaran <vinayan123 at gmail dot com>
Chris Crook <ccrook at linz dot govt dot nz>
Alvaro Huarte <ahuarte47 at yahoo dot es>
Giovanni Manghi <giovanni.manghi at faunalia dot pt>
Loading