[SCM] geos branch, upstream, updated. upstream/3.3.2-56-g722309c
Alan Boudreault
aboudreault at mapgears.com
Thu May 17 18:31:46 UTC 2012
The following commit has been merged in the upstream branch:
commit ace0602f2304ea7942742b9f9655e905bc6bee0f
Author: Alan Boudreault <aboudreault at mapgears.com>
Date: Wed May 12 12:21:54 2010 +0000
Reverted rules file about python binding, missing rules file in last commit
diff --git a/debian/rules b/debian/rules
index 4157b6d..38604d4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -11,9 +11,6 @@
include /usr/share/dpatch/dpatch.make
-PYVERS=$(shell pyversions -v -r debian/control.in)
-PYDEF=$(shell pyversions -dv)
-
# These are used for cross-compiling and for saving the configure script
# from having to guess our platform (since we know it already)
DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE)
@@ -58,17 +55,13 @@ ifneq "$(wildcard /usr/share/misc/config.guess)" ""
mv config.guess config.guess.bak
cp -f /usr/share/misc/config.guess config.guess
endif
- for V in $(PYVERS); do \
- CFLAGS="$(CFLAGS)" PYTHON=/usr/bin/python$$V ./configure \
- --host=$(DEB_HOST_GNU_TYPE) \
- --build=$(DEB_BUILD_GNU_TYPE) \
- --enable-ruby \
- --enable-python \
- --prefix=/usr \
- --mandir=\$${prefix}/share/man \
- --infodir=\$${prefix}/share/info $(CONFFLAGS); \
- cp swig/python/Makefile swig/python/Makefile-$$V; \
- done
+ CFLAGS="$(CFLAGS)" ./configure \
+ --host=$(DEB_HOST_GNU_TYPE) \
+ --build=$(DEB_BUILD_GNU_TYPE) \
+ --enable-ruby \
+ --prefix=/usr \
+ --mandir=\$${prefix}/share/man \
+ --infodir=\$${prefix}/share/info $(CONFFLAGS)
cp debian/libgeos-c++.install debian/libgeos-$(VER).install
cp debian/libgeos-c++.dirs debian/libgeos-$(VER).dirs
@@ -79,10 +72,6 @@ build-arch: build-arch-stamp
build-arch-stamp: config.status
# Add here commands to compile the arch part of the package.
$(MAKE)
- for V in $(PYVERS); do \
- $(MAKE) -C swig/python clean; \
- PYTHON=/usr/bin/python$$V $(MAKE) -C swig/python -f Makefile-$$V; \
- done
touch $@
build-indep: build-indep-stamp
--
Geometry engine for Geographic Information Systems
More information about the Pkg-grass-devel
mailing list