Skip to content

Commit 7a0c6d5

Browse files
committedMar 7, 2012
debian packaging update: drop hardy, intrepid, jaunty and karmic
1 parent 2e6bf62 commit 7a0c6d5

File tree

10 files changed

+12
-632
lines changed

10 files changed

+12
-632
lines changed
 

‎debian/changelog

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,8 +8,9 @@ qgis (1.9.90) UNRELEASED; urgency=low
88
* add browser desktop entry
99
* add support for Debian wheezy and Ubuntu precise
1010
* build package with internal libspatialite where libspatialite not available
11+
* drop support for Ubuntu hardy, intrepid, jaunty and karmic
1112

12-
-- Jürgen E. Fischer <jef@norbit.de> Tue, 06 Mar 2012 20:33:08 +0100
13+
-- Jürgen E. Fischer <jef@norbit.de> Wed, 07 Mar 2012 06:52:29 +0100
1314

1415
qgis (1.8.0) UNRELEASED; urgency=low
1516

‎debian/compat.hardy

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian/compat.intrepid

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian/compat.jaunty

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian/compat.karmic

Lines changed: 0 additions & 1 deletion
This file was deleted.

‎debian/control.hardy

Lines changed: 0 additions & 147 deletions
This file was deleted.

‎debian/control.intrepid

Lines changed: 0 additions & 157 deletions
This file was deleted.

‎debian/control.jaunty

Lines changed: 0 additions & 156 deletions
This file was deleted.

‎debian/control.karmic

Lines changed: 0 additions & 157 deletions
This file was deleted.

‎debian/rules

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
1010
DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE)
1111

1212
DISTRIBUTION := $(shell dpkg-parsechangelog --format rfc822 | sed -ne "s/^Distribution: //p")
13-
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"squeeze wheezy hardy intrepid jaunty karmic lucid maverick natty oneiric precise"))
13+
ifneq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"lenny squeeze wheezy lucid maverick natty oneiric precise"))
1414
DISTRIBUTION := sid
1515
endif
1616

@@ -32,24 +32,24 @@ CMAKE_OPTS := \
3232
-D QGIS_CGIBIN_SUBDIR=/usr/lib/cgi-bin \
3333
-D WITH_APIDOC=TRUE
3434

35-
ifeq ($(DISTRIBUTION),$(findstring $(DISTRIBUTION),"hardy intrepid jaunty karmic lucid maverick natty oneiric lenny squeeze"))
36-
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE
37-
else
35+
ifneq (,$(findstring $(DISTRIBUTION),"lenny squeeze lucid maverick natty oneiric"))
3836
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=TRUE
37+
else
38+
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALITE=FALSE
3939
endif
4040

41-
ifneq (,$(findstring $(DISTRIBUTION),"sid"))
41+
ifneq (,$(findstring $(DISTRIBUTION),"lenny squeeze lucid maverick natty oneiric"))
42+
CMAKE_OPTS += -D WITH_GLOBE=FALSE
43+
else
4244
CMAKE_OPTS += -D WITH_GLOBE=TRUE
4345
endif
4446

45-
ifneq (,$(findstring $(DISTRIBUTION),"squeeze lucid maverick natty oneiric precise sid"))
47+
ifneq (,$(findstring $(DISTRIBUTION),"lenny"))
48+
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALINDEX=TRUE
49+
else
4650
CMAKE_OPTS += -D WITH_INTERNAL_SPATIALINDEX=FALSE
4751
endif
4852

49-
ifneq (,$(findstring $(DISTRIBUTION),"hardy intrepid"))
50-
LDFLAGS += -Wl,--as-needed -Wl,--no-undefined
51-
endif
52-
5353
ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS)))
5454
CFLAGS += -O0
5555
else

0 commit comments

Comments
 (0)
Please sign in to comment.