Skip to content

Commit c3b0271

Browse files
jef-njef-n
committedOct 4, 2015
debian packaging update and typo fix
·
ltr-3_40archive/master_2
1 parent e553a79 commit c3b0271

25 files changed

+70
-24
lines changed
 

‎debian/control.in

Lines changed: 24 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -94,14 +94,30 @@ Description: Geographic Information System (GIS)
9494

9595
Package: qgis-common
9696
Architecture: all
97-
Depends: ${misc:Depends}
97+
Depends:
98+
libjs-jquery,
99+
libjs-leaflet,
100+
${misc:Depends}
98101
Description: QGIS - architecture-independent data
99102
QGIS is a Geographic Information System (GIS) which manages, analyzes and
100103
display databases of geographic information.
101104
.
102105
This package contains architecture-independent supporting data files for use
103106
with QGIS.
104107

108+
Package: libqgis-app{QGIS_ABI}
109+
Architecture: any
110+
Section: libs
111+
Depends:
112+
${shlibs:Depends},
113+
${misc:Depends}
114+
Replaces: libqgis{QGIS_ABI}
115+
Description: QGIS - shared app library
116+
QGIS is a Geographic Information System (GIS) which manages, analyzes and
117+
display databases of geographic information.
118+
.
119+
This package contains the shared app library.
120+
105121
Package: libqgis-core{QGIS_ABI}
106122
Architecture: any
107123
Section: libs
@@ -154,13 +170,13 @@ Description: QGIS - shared network analysis library
154170
.
155171
This package contains the shared network analysis library.
156172

157-
Package: libqgisgrass{QGIS_ABI}
173+
Package: libqgisgrass{GRASSVER}-{QGIS_ABI}
158174
Architecture: any
159175
Section: libs
160176
Depends:
161177
${shlibs:Depends},
162178
${misc:Depends}
163-
Replaces: libqgis{QGIS_ABI}
179+
Replaces: libqgis{QGIS_ABI}, libqgisgrass{QGIS_ABI}
164180
Description: QGIS - shared grass library
165181
QGIS is a Geographic Information System (GIS) which manages, analyzes and
166182
display databases of geographic information.
@@ -229,12 +245,13 @@ Depends:
229245
libgsl0-dev,
230246
libpq-dev,
231247
libproj-dev,
248+
libqgis-app{QGIS_ABI} (= ${binary:Version}),
232249
libqgis-core{QGIS_ABI} (= ${binary:Version}),
233250
libqgis-gui{QGIS_ABI} (= ${binary:Version}),
234251
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
235252
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
236253
libqgis-server{QGIS_ABI} (= ${binary:Version}),
237-
libqgisgrass{QGIS_ABI} (= ${binary:Version}),
254+
libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
238255
libqgispython{QGIS_ABI} (= ${binary:Version}),
239256
libqt4-dev (>= 4.7.0),
240257
libsqlite3-dev,
@@ -259,12 +276,13 @@ Architecture: any
259276
Section: debug
260277
Priority: extra
261278
Depends:
279+
libqgis-app{QGIS_ABI} (= ${binary:Version}),
262280
libqgis-core{QGIS_ABI} (= ${binary:Version}),
263281
libqgis-gui{QGIS_ABI} (= ${binary:Version}),
264282
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
265283
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
266284
libqgis-server{QGIS_ABI} (= ${binary:Version}),
267-
libqgisgrass{QGIS_ABI} (= ${binary:Version}),
285+
libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
268286
libqgispython{QGIS_ABI} (= ${binary:Version}),
269287
${misc:Depends}
270288
Suggests: gdb
@@ -306,8 +324,7 @@ Description: GRASS plugin for QGIS
306324
Package: qgis-plugin-grass-common
307325
Architecture: all
308326
Depends:
309-
#saucy trusty# python2.7,
310-
#precise# python,
327+
${python:Depends},
311328
${misc:Depends}
312329
Breaks: qgis-common (<< 1.5)
313330
Replaces: qgis-common (<< 1.5)

‎debian/libqgis-app{QGIS_ABI}.install

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
usr/lib/libqgis_app.so.{QGIS_ABI}

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
libqgis-app{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_app.so.{QGIS_ABI}

‎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}: shlib-calls-exit usr/lib/libqgis_core.so.{QGIS_ABI}
2+
libqgis-core{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_core.so.{QGIS_ABI}

‎debian/libqgis-dev.install.in

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
11
usr/include/qgis/*
2+
usr/lib/libqgis_app.so
23
usr/lib/libqgis_core.so
34
usr/lib/libqgis_gui.so
45
usr/lib/libqgis_analysis.so

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

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1 +1,2 @@
1-
libqgis-gui{QGIS_ABI}: no-symbols-control-file
1+
libqgis-gui{QGIS_ABI}: shlib-calls-exit usr/lib/libqgis_gui.so.{QGIS_ABI}
2+
libqgis-gui{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_gui.so.{QGIS_ABI}

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

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
libqgis-server{QGIS_ABI}: shlib-calls-exit usr/lib/libqgis_server.so.{QGIS_ABI}
2+
libqgis-server{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_server.so.{QGIS_ABI}

‎debian/libqgisgrass{GRASSVER_QGIS_ABI}.lintian-overrides

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
libqgisgrass{GRASSVER}-{QGIS_ABI}: hardening-no-fortify-functions usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI}
2+
libqgisgrass{GRASSVER}-{QGIS_ABI}: no-symbols-control-file usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI}

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

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

‎debian/qgis-common.links

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1 +1,3 @@
11
usr/share/common-licenses/GPL-2 usr/share/qgis/doc/LICENSE
2+
usr/share/javascript/jquery/jquery.js usr/share/qgis/doc/jquery-min.js
3+
usr/share/javascript/leaflet usr/share/qgis/doc/leaflet

‎debian/qgis-common.lintian-overrides

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
qgis-common: package-contains-broken-symlink usr/share/qgis/doc/LICENSE ../../common-licenses/GPL-2
2+
qgis-common: package-contains-broken-symlink usr/share/qgis/doc/leaflet ../../javascript/leaflet

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

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-provider-grass.lintian-overrides

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,2 @@
1-
qgis-plugin-grass: package-name-doesnt-match-sonames
2-
qgis-plugin-grass: no-symbols-control-file
1+
qgis-provider-grass: package-name-doesnt-match-sonames
2+
qgis-provider-grass: no-symbols-control-file

‎debian/qgis.install

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,6 @@ usr/lib/qgis/plugins/libtopolplugin.so
1616
usr/lib/qgis/plugins/libgeometrycheckerplugin.so
1717
usr/lib/qgis/plugins/libgeometrysnapperplugin.so
1818
usr/lib/qgis/qgis_help
19-
usr/lib/libqgis_app.so
2019
usr/share/pixmaps/
2120
usr/share/applications/
2221
usr/share/mime/packages/

‎debian/rules

Lines changed: 11 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -173,6 +173,7 @@ $(2): $(1)
173173
-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
174174
-e "s/\{GRASS\}/$(GRASS)/g" \
175175
-e "s/\{GRASSVER\}/$(GRASSVER)/g" \
176+
-e "s/\{GRASSVER_QGISABI\}/$(GRASSVER)-$(QGIS_ABI)/g" \
176177
$$^ >$$@
177178

178179
templates:: $(2)
@@ -182,13 +183,14 @@ templateclean::
182183
endef
183184

184185
$(foreach t,$(wildcard debian/*.in),$(eval $(call gentemplate,$(t),$(basename $(t)))))
186+
$(foreach t,$(wildcard debian/*{GRASSVER_QGIS_ABI}*),$(eval $(call gentemplate,$(t),$(subst {GRASSVER_QGIS_ABI},$(GRASSVER)-$(QGIS_ABI),$(t)))))
185187
$(foreach t,$(wildcard debian/*{QGIS_ABI}*),$(eval $(call gentemplate,$(t),$(subst {QGIS_ABI},$(QGIS_ABI),$(t)))))
186188

187189
cleantemplates:
188190
$(MAKE) -f debian/rules templateclean
189191
$(MAKE) -f debian/rules debian/control debian/compat
190192

191-
binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
193+
clean binary install:
192194
dh $@ --with python2 --parallel --builddirectory=$(BUILDDIR)
193195

194196
override_dh_clean: cleantemplates
@@ -264,6 +266,7 @@ override_dh_auto_install:
264266

265267
# qgis binary wrappers
266268
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
269+
sed -r -e "s/\{GRASS\}/$(GRASS)/g" $(CURDIR)/debian/qgis.sh.in >$(CURDIR)/debian/qgis.sh
267270
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qgis
268271
install -o root -g root -m 755 $(CURDIR)/debian/qgis.sh $(CURDIR)/debian/qgis-plugin-grass/usr/bin/qbrowser
269272

@@ -276,6 +279,12 @@ override_dh_install:
276279
# remove unwanted files
277280
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
278281
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/html/jquery.js
282+
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
283+
284+
# replace leaflet and jquery urls
285+
perl -i -p \
286+
-e 's#http://.*/leaflet.css#leaflet/leaflet.css#;s#http://.*/leaflet.js#leaflet/leaflet.js#;s#http://.*/jquery-.*.min.js#jquery-min.js#' \
287+
$(CURDIR)/debian/tmp/usr/share/qgis/doc/developersmap.html
279288

280289
# Don't include a copy of the world.tif also included in osgearth-data
281290
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif
@@ -303,6 +312,7 @@ override_dh_installmime:
303312

304313
override_dh_python2:
305314
dh_python2 --no-guessing-versions
315+
dh_python2 --no-guessing-versions usr/share/qgis/grass/scripts
306316
dh_sip -ppython-qgis
307317

308318
override_dh_compress:

‎python/core/composer/qgscomposerframe.sip

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -22,10 +22,10 @@ class QgsComposerFrame: QgsComposerItem
2222
*/
2323
QgsComposerMultiFrame* multiFrame() const;
2424

25-
//Overriden to allow multiframe to set display name
25+
//Overridden to allow multiframe to set display name
2626
virtual QString displayName() const;
2727

28-
//Overriden to handle fixed frame sizes set by multi frame
28+
//Overridden to handle fixed frame sizes set by multi frame
2929
void setSceneRect( const QRectF& rectangle );
3030

3131
void paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget );

‎python/core/composer/qgscomposerlabel.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -124,7 +124,7 @@ class QgsComposerLabel : QgsComposerItem
124124
*/
125125
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );
126126

127-
//Overriden to contain part of label's text
127+
//Overridden to contain part of label's text
128128
virtual QString displayName() const;
129129

130130
/** In case of negative margins, the bounding rect may be larger than the

‎python/core/composer/qgscomposershape.sip

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -65,7 +65,7 @@ class QgsComposerShape: QgsComposerItem
6565
*/
6666
void setSceneRect( const QRectF& rectangle );
6767

68-
//Overriden to return shape type
68+
//Overridden to return shape type
6969
virtual QString displayName() const;
7070

7171
protected:

‎src/app/CMakeLists.txt

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -546,6 +546,13 @@ TARGET_LINK_LIBRARIES(qgis_app
546546
qgis_analysis
547547
)
548548

549+
IF (NOT ANDROID)
550+
SET_TARGET_PROPERTIES(qgis_app PROPERTIES
551+
VERSION ${COMPLETE_VERSION}
552+
SOVERSION ${COMPLETE_VERSION}
553+
)
554+
ENDIF (NOT ANDROID)
555+
549556
IF (APPLE)
550557
TARGET_LINK_LIBRARIES(qgis_app ${APP_SERVICES_LIBRARY})
551558
ENDIF(APPLE)

‎src/core/composer/qgscomposerframe.h

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,10 +44,10 @@ class CORE_EXPORT QgsComposerFrame: public QgsComposerItem
4444
*/
4545
QgsComposerMultiFrame* multiFrame() const { return mMultiFrame; }
4646

47-
//Overriden to allow multiframe to set display name
47+
//Overridden to allow multiframe to set display name
4848
virtual QString displayName() const override;
4949

50-
//Overriden to handle fixed frame sizes set by multi frame
50+
//Overridden to handle fixed frame sizes set by multi frame
5151
void setSceneRect( const QRectF& rectangle ) override;
5252

5353
void paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget ) override;

‎src/core/composer/qgscomposerlabel.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -148,7 +148,7 @@ class CORE_EXPORT QgsComposerLabel: public QgsComposerItem
148148
*/
149149
bool readXML( const QDomElement& itemElem, const QDomDocument& doc ) override;
150150

151-
//Overriden to contain part of label's text
151+
//Overridden to contain part of label's text
152152
virtual QString displayName() const override;
153153

154154
/** In case of negative margins, the bounding rect may be larger than the

‎src/core/composer/qgscomposerlegend.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -174,7 +174,7 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
174174
*/
175175
bool readXML( const QDomElement& itemElem, const QDomDocument& doc ) override;
176176

177-
//Overriden to show legend title
177+
//Overridden to show legend title
178178
virtual QString displayName() const override;
179179

180180
public slots:

‎src/core/composer/qgscomposershape.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ class CORE_EXPORT QgsComposerShape: public QgsComposerItem
8989
*/
9090
void setSceneRect( const QRectF& rectangle ) override;
9191

92-
//Overriden to return shape type
92+
//Overridden to return shape type
9393
virtual QString displayName() const override;
9494

9595
protected:

‎src/gui/qgsvariableeditorwidget.cpp

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -407,7 +407,7 @@ void QgsVariableEditorTree::refreshScopeVariables( QgsExpressionContextScope* sc
407407
{
408408
//overridden
409409
font.setStrikeOut( true );
410-
QString toolTip = tr( "Overriden by value from %1" ).arg( activeScope->name() );
410+
QString toolTip = tr( "Overridden by value from %1" ).arg( activeScope->name() );
411411
item->setToolTip( 0, toolTip );
412412
item->setToolTip( 1, toolTip );
413413
}

0 commit comments

Comments
 (0)
Please sign in to comment.