Skip to content

Commit 3f6543d

Browse files
jef-njef-n
committedFeb 23, 2014
debian packaging fixes
* enable globe on jessie * add dependency on libqt4-sql-sqlite to qgis-provider (fixes #8662)
·
ltr-3_40archive/master_2
1 parent f02591a commit 3f6543d

File tree

11 files changed

+22
-9
lines changed

11 files changed

+22
-9
lines changed
 

‎debian/changelog

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,10 @@
11
qgis (2.3.0) UNRELEASED; urgency=medium
22

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

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

79
qgis (2.2.0) unstable; urgency=medium
810

‎debian/control.jessie

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ Package: qgis-providers
172172
Architecture: any
173173
Depends:
174174
qgis-providers-common (= ${source:Version}),
175+
libqt4-sql-sqlite,
175176
${shlibs:Depends},
176177
${misc:Depends}
177178
Replaces: qgis (<= 1.6)

‎debian/control.precise

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -157,7 +157,11 @@ Description: Python bindings to QGIS - architecture-independent files
157157

158158
Package: qgis-providers
159159
Architecture: any
160-
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
160+
Depends:
161+
qgis-providers-common (= ${source:Version}),
162+
libqt4-sql-sqlite,
163+
${shlibs:Depends},
164+
${misc:Depends}
161165
Replaces: qgis (<= 1.6)
162166
Breaks: qgis (<= 1.6)
163167
Description: collection of data providers to QGIS

‎debian/control.quantal

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ Package: qgis-providers
174174
Architecture: any
175175
Depends:
176176
qgis-providers-common (= ${source:Version}),
177+
libqt4-sql-sqlite,
177178
${shlibs:Depends},
178179
${misc:Depends}
179180
Replaces: qgis (<= 1.6)

‎debian/control.raring

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -174,6 +174,7 @@ Package: qgis-providers
174174
Architecture: any
175175
Depends:
176176
qgis-providers-common (= ${source:Version}),
177+
libqt4-sql-sqlite,
177178
${shlibs:Depends},
178179
${misc:Depends}
179180
Replaces: qgis (<= 1.6)

‎debian/control.saucy

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ Package: qgis-providers
172172
Architecture: any
173173
Depends:
174174
qgis-providers-common (= ${source:Version}),
175+
libqt4-sql-sqlite,
175176
${shlibs:Depends},
176177
${misc:Depends}
177178
Replaces: qgis (<= 1.6)

‎debian/control.sid

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -172,6 +172,7 @@ Package: qgis-providers
172172
Architecture: any
173173
Depends:
174174
qgis-providers-common (= ${source:Version}),
175+
libqt4-sql-sqlite,
175176
${shlibs:Depends},
176177
${misc:Depends}
177178
Replaces: qgis (<= 1.6)

‎debian/control.sid-oracle

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ Package: qgis-providers
173173
Architecture: any
174174
Depends:
175175
qgis-providers-common (= ${source:Version}),
176+
libqt4-sql-sqlite,
176177
${shlibs:Depends},
177178
${misc:Depends}
178179
Replaces: qgis (<= 1.6)

‎debian/control.trusty

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -170,6 +170,7 @@ Package: qgis-providers
170170
Architecture: any
171171
Depends:
172172
qgis-providers-common (= ${source:Version}),
173+
libqt4-sql-sqlite,
173174
${shlibs:Depends},
174175
${misc:Depends}
175176
Replaces: qgis (<= 1.6)

‎debian/control.wheezy

Lines changed: 5 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -156,7 +156,11 @@ Description: Python bindings to QGIS - architecture-independent files
156156

157157
Package: qgis-providers
158158
Architecture: any
159-
Depends: qgis-providers-common (= ${source:Version}), ${shlibs:Depends}, ${misc:Depends}
159+
Depends:
160+
qgis-providers-common (= ${source:Version}),
161+
libqt4-sql-sqlite,
162+
${shlibs:Depends},
163+
${misc:Depends}
160164
Replaces: qgis (<= 1.6)
161165
Breaks: qgis (<= 1.6)
162166
Description: collection of data providers to QGIS

‎debian/rules

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,8 @@ CMAKE_OPTS := \
4747
-D WITH_MAPSERVER=TRUE \
4848
-D MAPSERVER_SKIP_ECW=TRUE \
4949
-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
50-
-D WITH_APIDOC=TRUE
50+
-D WITH_APIDOC=TRUE \
51+
-D WITH_GLOBE=TRUE
5152

5253
MAKEFLAGS += VERBOSE=YES
5354

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

64-
ifneq (,$(findstring $(DISTRIBUTION),"jessie"))
65-
CMAKE_OPTS += -D WITH_GLOBE=FALSE
66-
else
67-
CMAKE_OPTS += -D WITH_GLOBE=TRUE
68-
endif
6965

7066
ifneq (,$(findstring $(DISTRIBUTION),"jessie raring saucy trusty sid sid-oracle"))
7167
CMAKE_OPTS += -D PYTHON_LIBRARY=/usr/lib/$(DEB_BUILD_MULTIARCH)/libpython2.7.so

0 commit comments

Comments
 (0)
Please sign in to comment.