Skip to content

Commit

Permalink
debian packaging update
Browse files Browse the repository at this point in the history
  • Loading branch information
jef-n committed May 17, 2014
1 parent ebbc298 commit 6874b10
Show file tree
Hide file tree
Showing 17 changed files with 133 additions and 37 deletions.
3 changes: 2 additions & 1 deletion debian/changelog
Expand Up @@ -5,8 +5,9 @@ qgis (2.3.0) UNRELEASED; urgency=medium
* add dependency on libqt4-sql-sqlite to qgis-provider
* merge debian packageing changes
* merge distribution specific file templates into one file template
* include metasearch plugins and add it's dependencies

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

qgis (2.2.0) unstable; urgency=medium

Expand Down
93 changes: 83 additions & 10 deletions debian/control
Expand Up @@ -71,24 +71,97 @@ Description: QGIS - architecture-independent data
This package contains architecture-independent supporting data files for use
with QGIS.

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

Package: libqgis-gui2.3.0
Architecture: any
Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Replaces:
qgis (<=0.9.2rc1),
libqgis-core1,
libqgis-gui1,
libqgis0,
libqgis1
Description: QGIS - shared libraries
libqgis2.3.0
Description: QGIS - shared gui library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the shared gui library.

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

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

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

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

Package: libqgissqlanyconnection2.3.0
Architecture: any
Section: libs
Depends:
${shlibs:Depends},
${misc:Depends}
Replaces: libqgis2.3.0
Description: QGIS - shared sqlanywhere connection library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the shared core and gui library that provide an
interface for plugins and stand-alone applications.
This package contains the shared sqlanywhere connection library.

Package: libqgis-dev
Architecture: any
Expand Down Expand Up @@ -142,7 +215,7 @@ Architecture: any
Section: python
Depends:
python-qt4,
python-sip4,
python-sip,
python-qgis-common (= ${source:Version}),
${shlibs:Depends},
${misc:Depends}
Expand Down
13 changes: 10 additions & 3 deletions debian/control.in
Expand Up @@ -164,11 +164,11 @@ Depends:
${shlibs:Depends},
${misc:Depends}
Replaces: libqgis{QGIS_ABI}
Description: QGIS - shared python library
Description: QGIS - shared Python library
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains the shared python library.
This package contains the shared Python library.

Package: libqgissqlanyconnection{QGIS_ABI}
Architecture: any
Expand Down Expand Up @@ -259,6 +259,13 @@ Depends:
python-qgis-common (= ${source:Version}),
python-psycopg2,
python-qscintilla2,
python-httplib2,
python-jinja2,
python-markupsafe,
python-pygments,
python-dateutil,
python-tz,
python-six,
#sid jessie quantal trusty sid-oracle# python-pyspatialite,
libqgispython{QGIS_ABI},
${shlibs:Depends},
Expand Down Expand Up @@ -386,7 +393,7 @@ Description: OSG globe plugin for QGIS - architecture-independent data
#sid-oracle#Package: qgis-oracle-provider
#sid-oracle#Architecture: any
#sid-oracle#Depends: ${shlibs:Depends}, ${misc:Depends}
#sid-oracle#Section: contrib/databases
#sid-oracle#Section: contrib/database
#sid-oracle#Description: QGIS oracle provider
#sid-oracle# QGIS is a Geographic Information System (GIS) which manages, analyzes and
#sid-oracle# display databases of geographic information.
Expand Down
2 changes: 2 additions & 0 deletions debian/libqgis-analysis{QGIS_ABI}.lintian-overrides
@@ -0,0 +1,2 @@
libqgis-analysis{QGIS_ABI}: no-symbols-control-file
libqgis-analysis{QGIS_ABI}: shlib-calls-exit
2 changes: 2 additions & 0 deletions debian/libqgis-core{QGIS_ABI}.lintian-overrides
@@ -0,0 +1,2 @@
libqgis-core{QGIS_ABI}: no-symbols-control-file
libqgis-core{QGIS_ABI}: shlib-calls-exit
1 change: 1 addition & 0 deletions debian/libqgis-gui{QGIS_ABI}.lintian-overrides
@@ -0,0 +1 @@
libqgis-gui{QGIS_ABI}: no-symbols-control-file
1 change: 1 addition & 0 deletions debian/libqgis-networkanalysis{QGIS_ABI}.lintian-overrides
@@ -0,0 +1 @@
libqgis-networkanalysis{QGIS_ABI}: no-symbols-control-file
1 change: 1 addition & 0 deletions debian/libqgisgrass{QGIS_ABI}.lintian-overrides
@@ -0,0 +1 @@
libqgisgrass{QGIS_ABI}: no-symbols-control-file
1 change: 1 addition & 0 deletions debian/libqgispython{QGIS_ABI}.install
@@ -0,0 +1 @@
usr/lib/libqgispython.so.*
1 change: 1 addition & 0 deletions debian/libqgispython{QGIS_ABI}.lintian-overrides
@@ -0,0 +1 @@
libqgispython{QGIS_ABI}: no-symbols-control-file
1 change: 1 addition & 0 deletions debian/libqgissqlanyconnection{QGIS_ABI}.lintian-overrides
@@ -0,0 +1 @@
libqgissqlanyconnection{QGIS_ABI}: no-symbols-control-file
3 changes: 0 additions & 3 deletions debian/libqgis{QGIS_ABI}.lintian-overrides

This file was deleted.

1 change: 1 addition & 0 deletions debian/python-qgis.lintian-overrides.in
@@ -1,2 +1,3 @@
python-qgis: hardening-no-fortify-functions
python-qgis: package-name-doesnt-match-sonames
python-qgis: no-symbols-control-file
1 change: 1 addition & 0 deletions debian/qgis-plugin-globe-common.lintian-override
@@ -0,0 +1 @@
qgis-plugin-globe-common: package-contains-broken-symlink usr/share/qgis/globe/world.tif ../../osgearth/data/world.tif
2 changes: 2 additions & 0 deletions debian/qgis-providers-common.lintian-overrides
@@ -0,0 +1,2 @@
qgis-providers-common: privacy-breach-generic
qgis-providers-common: extra-license-file
2 changes: 0 additions & 2 deletions debian/qgis-sqlanywhere.lintian-overrides

This file was deleted.

42 changes: 24 additions & 18 deletions debian/rules
Expand Up @@ -54,7 +54,13 @@ CMAKE_OPTS := \
-DMAPSERVER_SKIP_ECW=TRUE \
-DQGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
-DWITH_APIDOC=TRUE \
-DWITH_GLOBE=TRUE
-DWITH_GLOBE=TRUE \
-DWITH_INTERNAL_HTTPLIB2=FALSE \
-DWITH_INTERNAL_JINJA2=FALSE \
-DWITH_INTERNAL_MARKUPSAFE=FALSE \
-DWITH_INTERNAL_PYGMENTS=FALSE \
-DWITH_INTERNAL_DATEUTIL=FALSE \
-DWITH_INTERNAL_PYTZ=FALSE

ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
NUMJOBS = $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
Expand Down Expand Up @@ -87,7 +93,7 @@ else
CMAKE_OPTS += -DENABLE_TESTS=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie saucy trusty sid"))
ifneq (,$(findstring $(DISTRIBUTION),"wheezy jessie saucy trusty sid sid-oracle"))
CPPFLAGS := $(shell dpkg-buildflags --get CPPFLAGS)
CFLAGS := $(shell dpkg-buildflags --get CFLAGS) $(CPPFLAGS)
CXXFLAGS := $(shell dpkg-buildflags --get CXXFLAGS) $(CPPFLAGS)
Expand Down Expand Up @@ -116,7 +122,7 @@ define gentemplate
$(2): $(1)
sed -r \
-e 's/^#(.* |)$(DISTRIBUTION)( .*|)#//' \
-e '/^#/d' \
-e '/^#($|[^!])/d' \
-e "s/\{DEB_BUILD_GNU_TYPE\}/$(DEB_BUILD_GNU_TYPE)/g" \
-e "s#\{QT_PLUGIN_DIR\}#$(QT_PLUGIN_DIR)#g" \
-e "s/\{QGIS_ABI\}/$(QGIS_ABI)/g" \
Expand Down Expand Up @@ -165,21 +171,6 @@ endif
override_dh_auto_install-arch:
dh_auto_install --arch

# remove unwanted files
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENCE

# Don't include a copy of the world.tif also included in osgearth-data
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif

# remove extra license files
-find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete

# Man pages are installed by dh_installman
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1

# Install menu pixmap
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps
install -o root -g root -m 644 $(CURDIR)/images/icons/qgis_icon.svg $(CURDIR)/debian/tmp/usr/share/pixmaps/qgis.svg
Expand Down Expand Up @@ -227,6 +218,21 @@ override_dh_install:

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

# remove unwanted files
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/installdox
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/api/jquery.js
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/doc/LICENCE

# Don't include a copy of the world.tif also included in osgearth-data
$(RM) $(CURDIR)/debian/tmp/usr/share/qgis/globe/world.tif

# remove extra license files
-find $(CURDIR)/debian/tmp/usr/share/qgis/resources/cpt-city-qgis-min/ -name COPYING.xml -delete

# Man pages are installed by dh_installman
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qgis.1
$(RM) $(CURDIR)/debian/tmp/usr/man/man1/qbrowser.1

dh_install --autodest --list-missing

override_dh_installchangelogs:
Expand Down

0 comments on commit 6874b10

Please sign in to comment.