Skip to content

Commit

Permalink
debian packaging update and typo fix
Browse files Browse the repository at this point in the history
  • Loading branch information
@jef-n
jef-n committed Oct 4, 2015
1 parent e553a79 commit c3b0271
Show file tree
Hide file tree
Showing 25 changed files with 70 additions and 24 deletions.
31 changes: 24 additions & 7 deletions debian/control.in
View file
Expand Up @@ -94,14 +94,30 @@ Description: Geographic Information System (GIS)

Package: qgis-common
Architecture: all
Depends: ${misc:Depends}
Depends:
libjs-jquery,
libjs-leaflet,
${misc:Depends}
Description: QGIS - architecture-independent data
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains architecture-independent supporting data files for use
with QGIS.

Package: libqgis-app{QGIS_ABI}
Architecture: any
Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Replaces: libqgis{QGIS_ABI}
Description: QGIS - shared app library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the shared app library.

Package: libqgis-core{QGIS_ABI}
Architecture: any
Section: libs
Expand Down Expand Up @@ -154,13 +170,13 @@ Description: QGIS - shared network analysis library
.
This package contains the shared network analysis library.

Package: libqgisgrass{QGIS_ABI}
Package: libqgisgrass{GRASSVER}-{QGIS_ABI}
Architecture: any
Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Replaces: libqgis{QGIS_ABI}
Replaces: libqgis{QGIS_ABI}, libqgisgrass{QGIS_ABI}
Description: QGIS - shared grass library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
Expand Down Expand Up @@ -229,12 +245,13 @@ Depends:
libgsl0-dev,
libpq-dev,
libproj-dev,
libqgis-app{QGIS_ABI} (= ${binary:Version}),
libqgis-core{QGIS_ABI} (= ${binary:Version}),
libqgis-gui{QGIS_ABI} (= ${binary:Version}),
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
libqgis-server{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}),
libqt4-dev (>= 4.7.0),
libsqlite3-dev,
Expand All @@ -259,12 +276,13 @@ Architecture: any
Section: debug
Priority: extra
Depends:
libqgis-app{QGIS_ABI} (= ${binary:Version}),
libqgis-core{QGIS_ABI} (= ${binary:Version}),
libqgis-gui{QGIS_ABI} (= ${binary:Version}),
libqgis-analysis{QGIS_ABI} (= ${binary:Version}),
libqgis-networkanalysis{QGIS_ABI} (= ${binary:Version}),
libqgis-server{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{QGIS_ABI} (= ${binary:Version}),
libqgisgrass{GRASSVER}-{QGIS_ABI} (= ${binary:Version}),
libqgispython{QGIS_ABI} (= ${binary:Version}),
${misc:Depends}
Suggests: gdb
Expand Down Expand Up @@ -306,8 +324,7 @@ Description: GRASS plugin for QGIS
Package: qgis-plugin-grass-common
Architecture: all
Depends:
#saucy trusty# python2.7,
#precise# python,
${python:Depends},
${misc:Depends}
Breaks: qgis-common (<< 1.5)
Replaces: qgis-common (<< 1.5)
Expand Down
1 change: 1 addition & 0 deletions debian/libqgis-app{QGIS_ABI}.install
View file
@@ -0,0 +1 @@
usr/lib/libqgis_app.so.{QGIS_ABI}
1 change: 1 addition & 0 deletions debian/libqgis-app{QGIS_ABI}.lintian-overrides
View file
@@ -0,0 +1 @@
libqgis-app{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_app.so.{QGIS_ABI}
2 changes: 2 additions & 0 deletions debian/libqgis-core{QGIS_ABI}.lintian-overrides
View file
@@ -0,0 +1,2 @@
libqgis-core{QGIS_ABI}: shlib-calls-exit usr/lib/libqgis_core.so.{QGIS_ABI}
libqgis-core{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_core.so.{QGIS_ABI}
1 change: 1 addition & 0 deletions debian/libqgis-dev.install.in
View file
@@ -1,4 +1,5 @@
usr/include/qgis/*
usr/lib/libqgis_app.so
usr/lib/libqgis_core.so
usr/lib/libqgis_gui.so
usr/lib/libqgis_analysis.so
Expand Down
3 changes: 2 additions & 1 deletion debian/libqgis-gui{QGIS_ABI}.lintian-overrides
View file
@@ -1 +1,2 @@
libqgis-gui{QGIS_ABI}: no-symbols-control-file
libqgis-gui{QGIS_ABI}: shlib-calls-exit usr/lib/libqgis_gui.so.{QGIS_ABI}
libqgis-gui{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_gui.so.{QGIS_ABI}
2 changes: 2 additions & 0 deletions debian/libqgis-server{QGIS_ABI}.lintian-overrides
View file
@@ -0,0 +1,2 @@
libqgis-server{QGIS_ABI}: shlib-calls-exit usr/lib/libqgis_server.so.{QGIS_ABI}
libqgis-server{QGIS_ABI}: no-symbols-control-file usr/lib/libqgis_server.so.{QGIS_ABI}
0 debian/libqgisgrass{QGIS_ABI}.install → ...n/libqgisgrass{GRASSVER_QGIS_ABI}.install
View file
File renamed without changes.
2 changes: 2 additions & 0 deletions debian/libqgisgrass{GRASSVER_QGIS_ABI}.lintian-overrides
View file
@@ -0,0 +1,2 @@
libqgisgrass{GRASSVER}-{QGIS_ABI}: hardening-no-fortify-functions usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI}
libqgisgrass{GRASSVER}-{QGIS_ABI}: no-symbols-control-file usr/lib/libqgisgrass{GRASSVER}.so.{QGIS_ABI}
2 changes: 0 additions & 2 deletions debian/python-qgis.lintian-overrides.in
View file
@@ -1,3 +1 @@
python-qgis: hardening-no-fortify-functions
python-qgis: package-name-doesnt-match-sonames
python-qgis: no-symbols-control-file
2 changes: 2 additions & 0 deletions debian/qgis-common.links
View file
@@ -1 +1,3 @@
usr/share/common-licenses/GPL-2 usr/share/qgis/doc/LICENSE
usr/share/javascript/jquery/jquery.js usr/share/qgis/doc/jquery-min.js
usr/share/javascript/leaflet usr/share/qgis/doc/leaflet
2 changes: 2 additions & 0 deletions debian/qgis-common.lintian-overrides
View file
@@ -0,0 +1,2 @@
qgis-common: package-contains-broken-symlink usr/share/qgis/doc/LICENSE ../../common-licenses/GPL-2
qgis-common: package-contains-broken-symlink usr/share/qgis/doc/leaflet ../../javascript/leaflet
1 change: 1 addition & 0 deletions debian/qgis-plugin-globe-common.lintian-overrides
View file
@@ -0,0 +1 @@
qgis-plugin-globe-common: package-contains-broken-symlink usr/share/qgis/globe/world.tif ../../osgearth/data/world.tif
4 changes: 2 additions & 2 deletions debian/qgis-provider-grass.lintian-overrides
View file
@@ -1,2 +1,2 @@
qgis-plugin-grass: package-name-doesnt-match-sonames
qgis-plugin-grass: no-symbols-control-file
qgis-provider-grass: package-name-doesnt-match-sonames
qgis-provider-grass: no-symbols-control-file
1 change: 0 additions & 1 deletion debian/qgis.install
View file
Expand Up @@ -16,7 +16,6 @@ usr/lib/qgis/plugins/libtopolplugin.so
usr/lib/qgis/plugins/libgeometrycheckerplugin.so
usr/lib/qgis/plugins/libgeometrysnapperplugin.so
usr/lib/qgis/qgis_help
usr/lib/libqgis_app.so
usr/share/pixmaps/
usr/share/applications/
usr/share/mime/packages/
Expand Down
12 changes: 11 additions & 1 deletion debian/rules
View file
Expand Up @@ -173,6 +173,7 @@ $(2): $(1)
-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
-e "s/\{GRASS\}/$(GRASS)/g" \
-e "s/\{GRASSVER\}/$(GRASSVER)/g" \
-e "s/\{GRASSVER_QGISABI\}/$(GRASSVER)-$(QGIS_ABI)/g" \
$$^ >$$@

templates:: $(2)
Expand All @@ -182,13 +183,14 @@ templateclean::
endef

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

cleantemplates:
$(MAKE) -f debian/rules templateclean
$(MAKE) -f debian/rules debian/control debian/compat

binary binary-arch binary-indep build build-arch build-indep clean install install-arch install-indep:
clean binary install:
dh $@ --with python2 --parallel --builddirectory=$(BUILDDIR)

override_dh_clean: cleantemplates
Expand Down Expand Up @@ -264,6 +266,7 @@ override_dh_auto_install:

# qgis binary wrappers
install -o root -g root -m 755 -d $(CURDIR)/debian/qgis-plugin-grass/usr/bin
sed -r -e "s/\{GRASS\}/$(GRASS)/g" $(CURDIR)/debian/qgis.sh.in >$(CURDIR)/debian/qgis.sh
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

Expand All @@ -276,6 +279,12 @@ override_dh_install:
# remove unwanted files
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/html/jquery.js
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js

# replace leaflet and jquery urls
perl -i -p \
-e 's#http://.*/leaflet.css#leaflet/leaflet.css#;s#http://.*/leaflet.js#leaflet/leaflet.js#;s#http://.*/jquery-.*.min.js#jquery-min.js#' \
$(CURDIR)/debian/tmp/usr/share/qgis/doc/developersmap.html

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

override_dh_python2:
dh_python2 --no-guessing-versions
dh_python2 --no-guessing-versions usr/share/qgis/grass/scripts
dh_sip -ppython-qgis

override_dh_compress:
Expand Down
4 changes: 2 additions & 2 deletions python/core/composer/qgscomposerframe.sip
View file
Expand Up @@ -22,10 +22,10 @@ class QgsComposerFrame: QgsComposerItem
*/
QgsComposerMultiFrame* multiFrame() const;

//Overriden to allow multiframe to set display name
//Overridden to allow multiframe to set display name
virtual QString displayName() const;

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

void paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget );
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposerlabel.sip
View file
Expand Up @@ -124,7 +124,7 @@ class QgsComposerLabel : QgsComposerItem
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc );

//Overriden to contain part of label's text
//Overridden to contain part of label's text
virtual QString displayName() const;

/** In case of negative margins, the bounding rect may be larger than the
Expand Down
2 changes: 1 addition & 1 deletion python/core/composer/qgscomposershape.sip
View file
Expand Up @@ -65,7 +65,7 @@ class QgsComposerShape: QgsComposerItem
*/
void setSceneRect( const QRectF& rectangle );

//Overriden to return shape type
//Overridden to return shape type
virtual QString displayName() const;

protected:
Expand Down
7 changes: 7 additions & 0 deletions src/app/CMakeLists.txt
View file
Expand Up @@ -546,6 +546,13 @@ TARGET_LINK_LIBRARIES(qgis_app
qgis_analysis
)

IF (NOT ANDROID)
SET_TARGET_PROPERTIES(qgis_app PROPERTIES
VERSION ${COMPLETE_VERSION}
SOVERSION ${COMPLETE_VERSION}
)
ENDIF (NOT ANDROID)

IF (APPLE)
TARGET_LINK_LIBRARIES(qgis_app ${APP_SERVICES_LIBRARY})
ENDIF(APPLE)
Expand Down
4 changes: 2 additions & 2 deletions src/core/composer/qgscomposerframe.h
View file
Expand Up @@ -44,10 +44,10 @@ class CORE_EXPORT QgsComposerFrame: public QgsComposerItem
*/
QgsComposerMultiFrame* multiFrame() const { return mMultiFrame; }

//Overriden to allow multiframe to set display name
//Overridden to allow multiframe to set display name
virtual QString displayName() const override;

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

void paint( QPainter* painter, const QStyleOptionGraphicsItem* itemStyle, QWidget* pWidget ) override;
Expand Down
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposerlabel.h
View file
Expand Up @@ -148,7 +148,7 @@ class CORE_EXPORT QgsComposerLabel: public QgsComposerItem
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc ) override;

//Overriden to contain part of label's text
//Overridden to contain part of label's text
virtual QString displayName() const override;

/** In case of negative margins, the bounding rect may be larger than the
Expand Down
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposerlegend.h
View file
Expand Up @@ -174,7 +174,7 @@ class CORE_EXPORT QgsComposerLegend : public QgsComposerItem
*/
bool readXML( const QDomElement& itemElem, const QDomDocument& doc ) override;

//Overriden to show legend title
//Overridden to show legend title
virtual QString displayName() const override;

public slots:
Expand Down
2 changes: 1 addition & 1 deletion src/core/composer/qgscomposershape.h
View file
Expand Up @@ -89,7 +89,7 @@ class CORE_EXPORT QgsComposerShape: public QgsComposerItem
*/
void setSceneRect( const QRectF& rectangle ) override;

//Overriden to return shape type
//Overridden to return shape type
virtual QString displayName() const override;

protected:
Expand Down
2 changes: 1 addition & 1 deletion src/gui/qgsvariableeditorwidget.cpp
View file
Expand Up @@ -407,7 +407,7 @@ void QgsVariableEditorTree::refreshScopeVariables( QgsExpressionContextScope* sc
{
//overridden
font.setStrikeOut( true );
QString toolTip = tr( "Overriden by value from %1" ).arg( activeScope->name() );
QString toolTip = tr( "Overridden by value from %1" ).arg( activeScope->name() );
item->setToolTip( 0, toolTip );
item->setToolTip( 1, toolTip );
}
Expand Down

0 comments on commit c3b0271

Please sign in to comment.