[SCM] geos branch, master, updated. upstream/3.3.1-47-g4100f1c

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 44d40768750e758e028bfd1e828a646a3a2666db
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Wed Feb 22 15:10:53 2012 +0100

    Fixed order in debian/rules for dh_install.

diff --git a/debian/libgeos++-dev.dirs b/debian/libgeos++-dev.dirs
index 4418816..31e7131 100644
--- a/debian/libgeos++-dev.dirs
+++ b/debian/libgeos++-dev.dirs
@@ -1,2 +1,2 @@
 usr/lib
-usr/include
+usr/include/geos
diff --git a/debian/rules b/debian/rules
index 3a1fc5c..f2a032d 100755
--- a/debian/rules
+++ b/debian/rules
@@ -111,6 +111,11 @@ install-arch:
 	# Add here commands to install the arch part of the package into
 	# debian/tmp.
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
+	
+	# add C++ headers to C++ dev package install file
+	cp debian/libgeos++-dev.install.in debian/libgeos++-dev.install
+	find debian/tmp/usr/include/geos -name "*.h" -a ! -name "export.h" | sed -e 's/^debian\/tmp\///' >>debian/libgeos++-dev.install
+	
 	dh_install -s --sourcedir=debian/tmp
 	dh_installman -plibgeos-dev debian/geos-config.1
 	# remove the library from the -dev package
@@ -120,9 +125,6 @@ install-arch:
 	cp -ax debian/tmp/usr/local/lib/site_ruby/1.8 \
 	       debian/libgeos-ruby1.8/usr/lib/ruby/1.8
 	find  debian/libgeos-ruby*/usr/lib/ruby -name "*.la" -delete || true
-	# add C++ headers to C++ dev package install file
-	cp debian/libgeos++-dev.install.in debian/libgeos++-dev.install
-	find debian/tmp/usr/include/geos -name "*.h" -a ! -name "export.h" | sed -e 's/^debian\/tmp\///' >>debian/libgeos++-dev.install
 
 # Must not depend on anything. This is to be called by
 # binary-arch/binary-indep

-- 
Geometry engine for Geographic Information Systems