Skip to content
Permalink
Browse files

debian packaging update

  • Loading branch information
jef-n committed Dec 12, 2013
1 parent 4bbce14 commit 898e095667a8daf5ca34cc684b70d0b060a258f7
Showing with 6 additions and 5 deletions.
  1. +2 −1 debian/changelog
  2. +2 −2 debian/control.jessie
  3. +1 −1 debian/control.sid
  4. +1 −1 debian/rules
@@ -4,8 +4,9 @@ qgis (2.1.0) UNRELEASED; urgency=low
* drop qgis_icon.xpm and use "upstream" version
* Update Qt dependency to 4.7
* drop support for Debian squeeze and Ubuntu lucid, maverick, natty and oneiric
* disable globe support for jessie and unstable (because of #728318)

-- Jürgen E. Fischer <jef@norbit.de> Sat, 30 Nov 2013 11:26:34 +0100
-- Jürgen E. Fischer <jef@norbit.de> Thu, 12 Dec 2013 14:02:28 +0100

qgis (1.9.0) UNRELEASED; urgency=low

@@ -30,8 +30,8 @@ Build-Depends:
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
libosgearth-dev,
libopenscenegraph-dev,
# libosgearth-dev,
# libopenscenegraph-dev,
git,
doxygen,
graphviz,
@@ -26,7 +26,7 @@ Build-Depends:
pyqt4-dev-tools,
python,
python-dev (>= 2.6.6-3~),
python-qt4 (>=4.1.0),
python-qt4 (>= 4.1.0),
python-qt4-dev (>=4.1.0),
python-sip (>= 4.5.0),
python-sip-dev (>= 4.5.0),
@@ -78,7 +78,7 @@ ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric"))
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
endif

ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric sid"))
ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric jessie sid"))
CMAKE_OPTS += -D WITH_GLOBE=FALSE
else
CMAKE_OPTS += -D WITH_GLOBE=TRUE

0 comments on commit 898e095

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