Skip to content

Commit 1ae03be

Browse files
jef-njef-n
committedFeb 6, 2016
add internal nose2 (not available on precise) and update internal six
for processing tests
·
ltr-3_40archive/master_2
1 parent 8cdd723 commit 1ae03be

File tree

111 files changed

+11266
-59
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

111 files changed

+11266
-59
lines changed
 

‎debian/control.in

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -38,13 +38,15 @@ Build-Depends:
3838
python-qt4 (>= 4.1.0),
3939
python-qt4-dev,
4040
python-qt4-sql,
41+
python-yaml, python-mock,
4142
#precise saucy wheezy# python,
4243
#precise saucy# python-central (>= 0.5),
4344
#saucy wheezy# python-dev,
4445
#saucy# libpython2.7-dev,
4546
#sid stretch jessie trusty utopic vivid wily# python-all (>= 2.6.6-3~), python-all-dev (>= 2.6.6-3~),
4647
#sid stretch jessie wily# pyqt4.qsci-dev,
4748
#sid stretch jessie trusty utopic vivid wily# python-pyspatialite,
49+
#sid wheezy jessie stretch trusty vivid wily# python-nose2,
4850
python-sip (>= 4.5.0),
4951
python-sip-dev (>= 4.5.0),
5052
libosgearth-dev,

‎debian/rules

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -70,7 +70,7 @@ CMAKE_OPTS := \
7070
-DWITH_INTERNAL_PYGMENTS=FALSE \
7171
-DWITH_INTERNAL_DATEUTIL=FALSE \
7272
-DWITH_INTERNAL_PYTZ=FALSE \
73-
-DWITH_INTERNAL_SIX=FALSE \
73+
-DWITH_INTERNAL_YAML=FALSE \
7474
-DQT_TAG_FILE=/usr/share/qt4/doc/html/qt.tags \
7575
-DQT_DOC_URL=/usr/share/qt4/doc/html/
7676

@@ -91,6 +91,12 @@ ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS)))
9191
MAKEFLAGS += -j$(NUMJOBS)
9292
endif
9393

94+
ifneq (,$(findstring $(DISTRIBUTION),"precise"))
95+
CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=TRUE -DWITH_INTERNAL_SIX=TRUE
96+
else
97+
CMAKE_OPTS += -DWITH_INTERNAL_NOSE2=FALSE -DWITH_INTERNAL_SIX=FALSE
98+
endif
99+
94100
ifneq (,$(findstring $(DISTRIBUTION),"wheezy precise"))
95101
CMAKE_OPTS += -DWITH_PYSPATIALITE=TRUE
96102
endif

0 commit comments

Comments
 (0)
Please sign in to comment.