Skip to content
Permalink
Browse files

debian packaging update (fixes for tests)

  • Loading branch information
jef-n committed Nov 7, 2014
1 parent 959c566 commit 402b6d0a0d97337aaaa71991693ac8a53e570cd3
Showing with 57 additions and 49 deletions.
  1. +3 −0 debian/changelog
  2. +42 −41 debian/control.in
  3. +12 −8 debian/rules
@@ -1,6 +1,9 @@
qgis (2.7.0) UNRELEASED; urgency=medium

* New development version 2.7 after branch of 2.6
* run tests in en_US.UTF-8 locale
* add build dependency to python-qscintilla2 for tests
* merge some downstream debian changes

-- Jürgen E. Fischer <jef@norbit.de> Fri, 31 Oct 2014 13:00:45 +0100

@@ -30,6 +30,7 @@ Build-Depends:
libspatialindex-dev,
pkg-config,
pyqt4-dev-tools,
python-qscintilla2,
#precise saucy wheezy# python,
#precise saucy# python-central (>=0.5),
#saucy wheezy# python-dev,
@@ -49,9 +50,9 @@ Build-Depends:
xvfb, xauth,
xfonts-base, xfonts-100dpi, xfonts-75dpi, xfonts-scalable,
#sid-oracle# oracle-instantclient11.2-devel,
spawn-fcgi, lighttpd, poppler-utils
spawn-fcgi, lighttpd, poppler-utils, locales
Build-Conflicts: libqgis-dev, qgis-dev
#sid jessie sid-oracle#Standards-Version: 3.9.5
#sid jessie sid-oracle#Standards-Version: 3.9.6
#wheezy#Standards-Version: 3.9.3
#precise saucy trusty utopic#Standards-Version: 3.8.4
#sid jessie sid-oracle#X-Python-Version: >= 2.7, << 2.8
@@ -171,6 +172,18 @@ Description: QGIS - shared Python library
.
This package contains the shared Python library.

Package: libqgis-customwidgets{QGIS_ABI}
Architecture: any
Depends:
qt4-designer,
${shlibs:Depends},
${misc:Depends}
Description: QGIS custom widgets for Qt Designer
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains a library to use specific QGIS widgets in Qt Designer.

Package: libqgis-dev
Architecture: any
Section: libdevel
@@ -229,15 +242,40 @@ Depends:
#wheezy precise# python,
${python:Depends},
${misc:Depends}
Replaces: qgis-common (<< 1.5)
Breaks: qgis-common (<< 1.5)
Replaces: qgis-common (<< 1.5)
Description: GRASS plugin for 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 the QGIS GRASS plugin.

Package: qgis-plugin-globe
Architecture: any
Depends:
qgis (= ${binary:Version}),
qgis-plugin-globe-common (= ${source:Version}),
${shlibs:Depends},
${misc:Depends}
Description: OSG globe plugin for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This plugin enables 3D viewing using OSG globe in the QGIS.

Package: qgis-plugin-globe-common
Architecture: all
Depends:
osgearth-data,
${misc:Depends}
Description: OSG globe plugin for 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 the QGIS GLOBE plugin.

Package: python-qgis
Architecture: any
Section: python
@@ -307,8 +345,8 @@ Description: collection of data providers to QGIS
Package: qgis-providers-common
Architecture: all
Depends: ${misc:Depends}
Replaces: qgis-common (<= 1.6)
Breaks: qgis-common (<= 1.6)
Replaces: qgis-common (<= 1.6)
Description: collection of data providers to QGIS - architecture-independent files
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
@@ -329,18 +367,6 @@ Description: QGIS server providing various OGC services
.
This package contains the QGIS server.

Package: libqgis-customwidgets{QGIS_ABI}
Architecture: any
Depends:
qt4-designer,
${shlibs:Depends},
${misc:Depends}
Description: QGIS custom widgets for Qt Designer
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This package contains a library to use specific QGIS widgets in Qt Designer.

Package: qgis-api-doc
Architecture: all
Section: doc
@@ -353,31 +379,6 @@ Description: QGIS API documentation
.
This package contains the QGIS API documentation.

Package: qgis-plugin-globe
Architecture: any
Depends:
qgis (= ${binary:Version}),
qgis-plugin-globe-common (= ${source:Version}),
${shlibs:Depends},
${misc:Depends}
Description: OSG globe plugin for QGIS
QGIS is a Geographic Information System (GIS) which manages, analyzes and
display databases of geographic information.
.
This plugin enables 3D viewing using OSG globe in the QGIS.

Package: qgis-plugin-globe-common
Architecture: all
Depends:
osgearth-data,
${misc:Depends}
Description: OSG globe plugin for 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 the QGIS GLOBE plugin.

#sid-oracle#Package: qgis-oracle-provider
#sid-oracle#Architecture: any
#sid-oracle#Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -148,7 +148,7 @@ 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:
binary build clean install:
dh $@ --with python2 --parallel --builddirectory=debian/build

override_dh_clean: cleantemplates
@@ -163,19 +163,23 @@ override_dh_clean: cleantemplates
override_dh_auto_configure: templates
dh_auto_configure -- $(CMAKE_OPTS)

override_dh_auto_build-arch:
dh_auto_build --arch

override_dh_auto_test:
ifeq (,$(filter nocheck,$(DEB_BUILD_OPTIONS)))
override_dh_auto_test:
# Code to run the package test suite - and ignore the outcome for now
-LD_LIBRARY_PATH=$(CURDIR)/debian/build/output/lib:$(LD_LIBRARY_PATH) PATH=/usr/sbin:$(PATH) LC_CTYPE=C.UTF-8 $(TESTMAKE) -C debian/build $(DEB_TEST_TARGET)
mkdir -p debian/tmp/locale/
localedef -f UTF-8 -i en_US ./debian/tmp/locale/en_US.UTF-8/
-LOCPATH=$(CURDIR)/debian/tmp/locale/ \
LC_ALL=en_US.UTF-8 \
LD_LIBRARY_PATH=$(CURDIR)/debian/build/output/lib:$(LD_LIBRARY_PATH) \
PATH=/usr/sbin:$(PATH) \
$(TESTMAKE) -C debian/build $(DEB_TEST_TARGET)
else
override_dh_auto_test:
@echo Skipping tests.
endif

override_dh_auto_install-arch:
dh_auto_install --arch
override_dh_auto_install:
dh_auto_install

# Install menu pixmap
install -o root -g root -d $(CURDIR)/debian/tmp/usr/share/pixmaps

0 comments on commit 402b6d0

Please sign in to comment.
You can’t perform that action at this time.