[mapnik] 04/07: Reorder rules in order of execution.

Sebastiaan Couwenberg sebastic at moszumanska.debian.org
Sat Oct 10 15:10:28 UTC 2015


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

sebastic pushed a commit to branch master
in repository mapnik.

commit e50da90861417ea8003976b2b97d797dfeee35db
Author: Bas Couwenberg <sebastic at xs4all.nl>
Date:   Sat Oct 10 11:58:25 2015 +0200

    Reorder rules in order of execution.
---
 debian/rules | 28 ++++++++++++++--------------
 1 file changed, 14 insertions(+), 14 deletions(-)

diff --git a/debian/rules b/debian/rules
index bc62fa3..29cddee 100755
--- a/debian/rules
+++ b/debian/rules
@@ -22,6 +22,14 @@ SCONS_FLAGS += CUSTOM_CXXFLAGS="$(shell dpkg-buildflags --get CXXFLAGS) $(shell
 SCONS_FLAGS += CUSTOM_CFLAGS="$(shell dpkg-buildflags --get CFLAGS) $(shell dpkg-buildflags --get CPPFLAGS) -g0"
 SCONS_FLAGS += CUSTOM_LDFLAGS="$(shell dpkg-buildflags --get LDFLAGS) -g0"
 
+%:
+	dh $@
+
+override_dh_auto_clean:
+	rm -rf build-python
+	rm -rf debian/stamps
+	dh_clean
+
 override_dh_auto_configure: debian/stamps/configure-python
 debian/stamps/configure-python:
 	-mkdir build-python
@@ -37,27 +45,19 @@ 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_auto_test: debian/stamps/test-python
 debian/stamps/test-python:
 	# nothing yet
 
+override_dh_auto_install: debian/stamps/install-python
+debian/stamps/install-python:
+	$(SCONS) -C build-python install
+
 override_dh_install:
 	# Don't install nik2img, as requested by upstream
 	$(RM) debian/*/usr/bin/nik2img
 	dh_install --list-missing
 
-%:
-	dh $@
+override_dh_prep:
+	dh_prep -Xdebian/tmp
 

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



More information about the Pkg-grass-devel mailing list