[SCM] postgis branch, master, updated. upstream/1.5.3-19-g76a42fe

[Francesco Paolo Lovergine]

The following commit has been merged in the master branch:
commit 76a42fe504e10b70f2c597d7560c3ed3cce25c0d
Author: Francesco Paolo Lovergine <frankie at debian.org>
Date:   Mon Nov 21 16:07:08 2011 +0100

    Fixating a couple of issues in current 1.5.3

diff --git a/debian/changelog b/debian/changelog
index b00379e..7b7f8b6 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+postgis (1.5.3-2) unstable; urgency=low
+
+  * Moved pgsql2shp/shp2pgsql under conventional /usr/bin path.
+    (closes: #648176)
+  * New patch html_doc_resourcesi added: now installing HTML documentation. 
+    Thanks Andrew Harvey.
+    (closes: #649352)
+
+ -- Francesco Paolo Lovergine <frankie at debian.org>  Mon, 21 Nov 2011 15:43:23 +0100
+
 postgis (1.5.3-1) unstable; urgency=low
 
   * New upstream minor release, with fix for PostgreSQL 9.1.
diff --git a/debian/patches/html_doc_resources b/debian/patches/html_doc_resources
new file mode 100644
index 0000000..981f462
--- /dev/null
+++ b/debian/patches/html_doc_resources
@@ -0,0 +1,21 @@
+Index: postgis/doc/Makefile
+===================================================================
+--- postgis.orig/doc/Makefile	2011-09-15 15:14:47.000000000 +0200
++++ postgis/doc/Makefile	2011-11-21 16:06:03.000000000 +0100
+@@ -134,12 +134,16 @@
+ 	@mkdir -p $(PGSQL_DOCDIR)/postgis
+ 	@mkdir -p $(PGSQL_MANDIR)/man1
+ 	cp html/postgis.html $(PGSQL_DOCDIR)/postgis/postgis.html
++	cp html/style.css $(PGSQL_DOCDIR)/postgis/style.css
++	cp -r html/images $(PGSQL_DOCDIR)/postgis/
+ 	cp ../README.postgis $(PGSQL_DOCDIR)/postgis/README.postgis
+ 	cp man/pgsql2shp.1 $(PGSQL_MANDIR)/man1/pgsql2shp.1
+ 	cp man/shp2pgsql.1 $(PGSQL_MANDIR)/man1/shp2pgsql.1
+ 
+ uninstall:
+ 	rm -f $(PGSQL_DOCDIR)/postgis/postgis.html
++	rm -f $(PGSQL_DOCDIR)/postgis/style.css
++	rm -rf $(PGSQL_DOCDIR)/postgis/images
+ 	rm -f $(PGSQL_DOCDIR)/postgis/README.postgis
+ 	rm -f $(PGSQL_MANDIR)/man1/shp2pgsql.1
+ 	rm -f $(PGSQL_MANDIR)/man1/pgsql2shp.1
diff --git a/debian/patches/series b/debian/patches/series
index 9d74090..5deccea 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1,3 @@
 install
 generator
+html_doc_resources
diff --git a/debian/rules b/debian/rules
index 1868894..b133eb2 100755
--- a/debian/rules
+++ b/debian/rules
@@ -107,7 +107,7 @@ install-arch: build-arch
 	install -o root -g root -d $(CURDIR)/debian/postgresql-9.1-postgis/usr/lib/postgis/$(VERSION)/postgres/9.1/lib
 	mv $(CURDIR)/debian/postgresql-9.1-postgis/usr/lib/postgresql/9.1/lib/postgis-$(MAJOR_VERSION).$(MINOR_VERSION).so \
 	   $(CURDIR)/debian/postgresql-9.1-postgis/usr/lib/postgis/$(VERSION)/postgres/9.1/lib/.
-	#mv $(CURDIR)/debian/postgresql-9.0-postgis/usr/lib/postgresql/9.0/bin $(CURDIR)/debian/postgis/usr
+	mv $(CURDIR)/debian/postgresql-9.1-postgis/usr/lib/postgresql/9.1/bin $(CURDIR)/debian/postgis/usr
 	
 	# Create custom maint scripts: 9.1
 	

-- 
PostGIS for PostgreSQL