diff -Nru postgis-1.5.3/debian/changelog postgis-1.5.3/debian/changelog --- postgis-1.5.3/debian/changelog 2011-09-26 08:59:12.000000000 +0000 +++ postgis-1.5.3/debian/changelog 2011-11-21 15:07:08.000000000 +0000 @@ -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 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 -Nru postgis-1.5.3/debian/patches/html_doc_resources postgis-1.5.3/debian/patches/html_doc_resources --- postgis-1.5.3/debian/patches/html_doc_resources 1970-01-01 00:00:00.000000000 +0000 +++ postgis-1.5.3/debian/patches/html_doc_resources 2011-11-21 15:07:08.000000000 +0000 @@ -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 -Nru postgis-1.5.3/debian/patches/series postgis-1.5.3/debian/patches/series --- postgis-1.5.3/debian/patches/series 2011-09-26 08:59:12.000000000 +0000 +++ postgis-1.5.3/debian/patches/series 2011-11-21 15:07:08.000000000 +0000 @@ -1,2 +1,3 @@ install generator +html_doc_resources diff -Nru postgis-1.5.3/debian/rules postgis-1.5.3/debian/rules --- postgis-1.5.3/debian/rules 2011-09-26 08:59:12.000000000 +0000 +++ postgis-1.5.3/debian/rules 2011-11-21 15:07:08.000000000 +0000 @@ -107,7 +107,7 @@ 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