[mapnik] 01/05: Revert 76ff8745 and restore scons build

[Jérémy Lal]

This is an automated email from the git hooks/post-receive script.

kapouer pushed a commit to branch master
in repository mapnik.

commit 7e09a36941b521a90cf80c0e7e45a5dd9c395229
Author: Jérémy Lal <kapouer at melix.org>
Date:   Tue May 26 23:16:12 2015 +0200

    Revert 76ff8745 and restore scons build
    
    Signed-off-by: Jérémy Lal <kapouer at melix.org>
---
 debian/rules | 41 +++++++++++++++++++++++++++--------------
 1 file changed, 27 insertions(+), 14 deletions(-)

diff --git a/debian/rules b/debian/rules
index f596719..cde812b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,22 +23,35 @@ SCONS_FLAGS += CUSTOM_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) -g0"
 SCONS_FLAGS += CUSTOM_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) -g0"
 SCONS_FLAGS += CUSTOM_DEFINES="$(shell dpkg-buildflags --get CPPFLAGS) -g0"
 
-override_dh_auto_configure:
-	mkdir -p scons
-	ln -s /usr/bin/scons scons/scons.py
-	dh_auto_configure
-
-override_dh_clean:
-	rm -f scons/scons.py
-	rmdir scons || true
+override_dh_auto_configure: debian/stamps/configure-python
+debian/stamps/configure-python:
+	-mkdir build-python
+	-mkdir debian/stamps
+	cp -r bindings demo deps fonts include plugins src tests utils SConstruct build-python
+	touch $@
+	$(SCONS) -C build-python configure \
+		$(SCONS_FLAGS) \
+		CCFLAGS="$(CFLAGS)" \
+		DESTDIR=$(CURDIR)/debian/tmp
+
+override_dh_auto_build:	debian/stamps/build-python
+debian/stamps/build-python:
+	$(SCONS) -C build-python
+
+override_dh_prep:
+	dh_prep -Xdebian/tmp
+
+override_dh_auto_install:	debian/stamps/install-python
+debian/stamps/install-python:
+	$(SCONS) -C build-python install
+
+override_dh_auto_clean:
+	rm -rf build-python
+	rm -rf debian/stamps
 	dh_clean
 
-override_dh_install-arch:
-	dh_install
-	mv $(CURDIR)/debian/mapnik-utils/usr/bin/upgrade_map_xml.py \
-		$(CURDIR)/debian/mapnik-utils/usr/bin/upgrade-map-xml
-
-override_dh_auto_test:
+override_dh_auto_test: debian/stamps/test-python
+debian/stamps/test-python:
 	# nothing yet
 
 %:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/mapnik.git