Skip to content

Commit 6874b10

Browse files
jef-njef-n
committedMay 17, 2014
debian packaging update
·
ltr-3_40archive/master_2
1 parent ebbc298 commit 6874b10

17 files changed

+133
-37
lines changed
 

‎debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,9 @@ qgis (2.3.0) UNRELEASED; urgency=medium
55
* add dependency on libqt4-sql-sqlite to qgis-provider
66
* merge debian packageing changes
77
* merge distribution specific file templates into one file template
8+
* include metasearch plugins and add it's dependencies
89

9-
-- Jürgen E. Fischer <jef@norbit.de> Sun, 06 Apr 2014 00:30:34 +0200
10+
-- Jürgen E. Fischer <jef@norbit.de> Sat, 17 May 2014 11:39:25 +0200
1011

1112
qgis (2.2.0) unstable; urgency=medium
1213

‎debian/control

Lines changed: 83 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -71,24 +71,97 @@ Description: QGIS - architecture-independent data
7171
This package contains architecture-independent supporting data files for use
7272
with QGIS.
7373

74-
Package: libqgis{QGIS_ABI}
74+
Package: libqgis-core2.3.0
75+
Architecture: any
76+
Section: libs
77+
Depends:
78+
${shlibs:Depends},
79+
${misc:Depends}
80+
Replaces: libqgis2.3.0
81+
Description: QGIS - shared core library
82+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
83+
display databases of geographic information.
84+
.
85+
This package contains the shared core library.
86+
87+
Package: libqgis-gui2.3.0
7588
Architecture: any
7689
Section: libs
7790
Depends:
7891
${shlibs:Depends},
7992
${misc:Depends}
8093
Replaces:
81-
qgis (<=0.9.2rc1),
82-
libqgis-core1,
83-
libqgis-gui1,
84-
libqgis0,
85-
libqgis1
86-
Description: QGIS - shared libraries
94+
libqgis2.3.0
95+
Description: QGIS - shared gui library
96+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
97+
display databases of geographic information.
98+
.
99+
This package contains the shared gui library.
100+
101+
Package: libqgis-analysis2.3.0
102+
Architecture: any
103+
Section: libs
104+
Depends:
105+
${shlibs:Depends},
106+
${misc:Depends}
107+
Replaces: libqgis2.3.0
108+
Description: QGIS - shared analysis library
109+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
110+
display databases of geographic information.
111+
.
112+
This package contains the shared analysis library.
113+
114+
Package: libqgis-networkanalysis2.3.0
115+
Architecture: any
116+
Section: libs
117+
Depends:
118+
${shlibs:Depends},
119+
${misc:Depends}
120+
Replaces: libqgis2.3.0
121+
Description: QGIS - shared network analysis library
122+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
123+
display databases of geographic information.
124+
.
125+
This package contains the shared network analysis library.
126+
127+
Package: libqgisgrass2.3.0
128+
Architecture: any
129+
Section: libs
130+
Depends:
131+
${shlibs:Depends},
132+
${misc:Depends}
133+
Replaces: libqgis2.3.0
134+
Description: QGIS - shared grass library
135+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
136+
display databases of geographic information.
137+
.
138+
This package contains the shared grass library.
139+
140+
Package: libqgispython2.3.0
141+
Architecture: any
142+
Section: libs
143+
Depends:
144+
${shlibs:Depends},
145+
${misc:Depends}
146+
Replaces: libqgis2.3.0
147+
Description: QGIS - shared Python library
148+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
149+
display databases of geographic information.
150+
.
151+
This package contains the shared Python library.
152+
153+
Package: libqgissqlanyconnection2.3.0
154+
Architecture: any
155+
Section: libs
156+
Depends:
157+
${shlibs:Depends},
158+
${misc:Depends}
159+
Replaces: libqgis2.3.0
160+
Description: QGIS - shared sqlanywhere connection library
87161
QGIS is a Geographic Information System (GIS) which manages, analyzes and
88162
display databases of geographic information.
89163
.
90-
This package contains the shared core and gui library that provide an
91-
interface for plugins and stand-alone applications.
164+
This package contains the shared sqlanywhere connection library.
92165

93166
Package: libqgis-dev
94167
Architecture: any
@@ -142,7 +215,7 @@ Architecture: any
142215
Section: python
143216
Depends:
144217
python-qt4,
145-
python-sip4,
218+
python-sip,
146219
python-qgis-common (= ${source:Version}),
147220
${shlibs:Depends},
148221
${misc:Depends}

‎debian/control.in

Lines changed: 10 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -164,11 +164,11 @@ Depends:
164164
${shlibs:Depends},
165165
${misc:Depends}
166166
Replaces: libqgis{QGIS_ABI}
167-
Description: QGIS - shared python library
167+
Description: QGIS - shared Python library
168168
QGIS is a Geographic Information System (GIS) which manages, analyzes and
169169
display databases of geographic information.
170170
.
171-
This package contains the shared python library.
171+
This package contains the shared Python library.
172172

173173
Package: libqgissqlanyconnection{QGIS_ABI}
174174
Architecture: any
@@ -259,6 +259,13 @@ Depends:
259259
python-qgis-common (= ${source:Version}),
260260
python-psycopg2,
261261
python-qscintilla2,
262+
python-httplib2,
263+
python-jinja2,
264+
python-markupsafe,
265+
python-pygments,
266+
python-dateutil,
267+
python-tz,
268+
python-six,
262269
#sid jessie quantal trusty sid-oracle# python-pyspatialite,
263270
libqgispython{QGIS_ABI},
264271
${shlibs:Depends},
@@ -386,7 +393,7 @@ Description: OSG globe plugin for QGIS - architecture-independent data
386393
#sid-oracle#Package: qgis-oracle-provider
387394
#sid-oracle#Architecture: any
388395
#sid-oracle#Depends: ${shlibs:Depends}, ${misc:Depends}
389-
#sid-oracle#Section: contrib/databases
396+
#sid-oracle#Section: contrib/database
390397
#sid-oracle#Description: QGIS oracle provider
391398
#sid-oracle# QGIS is a Geographic Information System (GIS) which manages, analyzes and
392399
#sid-oracle# display databases of geographic information.

‎debian/libqgis-analysis{QGIS_ABI}.lintian-overrides

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
libqgis-analysis{QGIS_ABI}: no-symbols-control-file
2+
libqgis-analysis{QGIS_ABI}: shlib-calls-exit

‎debian/libqgis-core{QGIS_ABI}.lintian-overrides

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
libqgis-core{QGIS_ABI}: no-symbols-control-file
2+
libqgis-core{QGIS_ABI}: shlib-calls-exit

‎debian/libqgis-gui{QGIS_ABI}.lintian-overrides

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libqgis-gui{QGIS_ABI}: no-symbols-control-file

‎debian/libqgis-networkanalysis{QGIS_ABI}.lintian-overrides

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libqgis-networkanalysis{QGIS_ABI}: no-symbols-control-file

‎debian/libqgisgrass{QGIS_ABI}.lintian-overrides

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libqgisgrass{QGIS_ABI}: no-symbols-control-file

‎debian/libqgispython{QGIS_ABI}.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/libqgispython.so.*

‎debian/libqgispython{QGIS_ABI}.lintian-overrides

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libqgispython{QGIS_ABI}: no-symbols-control-file

‎debian/libqgissqlanyconnection{QGIS_ABI}.lintian-overrides

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libqgissqlanyconnection{QGIS_ABI}: no-symbols-control-file

‎debian/libqgis{QGIS_ABI}.lintian-overrides

Lines changed: 0 additions & 3 deletions
This file was deleted.

‎debian/python-qgis.lintian-overrides.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,3 @@
1+
python-qgis: hardening-no-fortify-functions
12
python-qgis: package-name-doesnt-match-sonames
23
python-qgis: no-symbols-control-file

‎debian/qgis-plugin-globe-common.lintian-override

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
qgis-plugin-globe-common: package-contains-broken-symlink usr/share/qgis/globe/world.tif ../../osgearth/data/world.tif

‎debian/qgis-providers-common.lintian-overrides

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
qgis-providers-common: privacy-breach-generic
2+
qgis-providers-common: extra-license-file

‎debian/qgis-sqlanywhere.lintian-overrides

Lines changed: 0 additions & 2 deletions
This file was deleted.

‎debian/rules

Lines changed: 24 additions & 18 deletions
Original file line numberDiff line numberDiff line change
@@ -54,7 +54,13 @@ CMAKE_OPTS := \
5454
-DMAPSERVER_SKIP_ECW=TRUE \
5555
-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
5656
-DWITH_APIDOC=TRUE \
57-
-DWITH_GLOBE=TRUE
57+
-DWITH_GLOBE=TRUE \
58+
-DWITH_INTERNAL_HTTPLIB2=FALSE \
59+
-DWITH_INTERNAL_JINJA2=FALSE \
60+
-DWITH_INTERNAL_MARKUPSAFE=FALSE \
61+
-DWITH_INTERNAL_PYGMENTS=FALSE \
62+
-DWITH_INTERNAL_DATEUTIL=FALSE \
63+
-DWITH_INTERNAL_PYTZ=FALSE
5864

5965
ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
6066
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
@@ -87,7 +93,7 @@ else
8793
CMAKE_OPTS += -DENABLE_TESTS=TRUE
8894
endif
8995

90-
ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie saucy trusty sid"))
96+
ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie saucy trusty sid sid-oracle"))
9197
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
9298
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
9399
CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
@@ -116,7 +122,7 @@ define gentemplate
116122
$(2): $(1)
117123
sed -r \
118124
-e 's/^#(.* |)$(DISTRIBUTION)( .*|)#//' \
119-
-e '/^#/d' \
125+
-e '/^#($|[^!])/d' \
120126
-e "s/\{DEB_BUILD_GNU_TYPE\}/$(DEB_BUILD_GNU_TYPE)/g" \
121127
-e "s#\{QT_PLUGIN_DIR\}#$(QT_PLUGIN_DIR)#g" \
122128
-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
@@ -165,21 +171,6 @@ endif
165171
override_dh_auto_install-arch:
166172
dh_auto_install --arch
167173

168-
# remove unwanted files
169-
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
170-
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
171-
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENCE
172-
173-
# Don't include a copy of the world.tif also included in osgearth-data
174-
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif
175-
176-
# remove extra license files
177-
-find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete
178-
179-
# Man pages are installed by dh_installman
180-
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
181-
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1
182-
183174
# Install menu pixmap
184175
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
185176
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg
@@ -227,6 +218,21 @@ override_dh_install:
227218

228219
perl -i -pe 's=#!/usr/bin/env python=#!/usr/bin/python2.7=;' $$(find debian/tmp -name "*.py")
229220

221+
# remove unwanted files
222+
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
223+
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
224+
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENCE
225+
226+
# Don't include a copy of the world.tif also included in osgearth-data
227+
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif
228+
229+
# remove extra license files
230+
-find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete
231+
232+
# Man pages are installed by dh_installman
233+
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
234+
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1
235+
230236
dh_install --autodest --list-missing
231237

232238
override_dh_installchangelogs:

0 commit comments

Comments
 (0)
Please sign in to comment.