[SCM] postgis branch, master, updated. upstream/2.0.1-105-gc93009f

[Markus Wanner]

The following commit has been merged in the master branch:
commit c93009f12caef2bab146a9c9c784eb16b611058e
Author: Markus Wanner <markus at bluegap.ch>
Date:   Sun Jan 19 18:13:39 2014 +0100

    Improve postgis-doc
    
    * Add style.css and images to postgis-doc. Closes: #649352.
    * Drop an unneeded fixmakedoc patch.

diff --git a/debian/changelog b/debian/changelog
index 187cde0..c5040ca 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+postgis (2.1.1-4) UNRELEASED; urgency=medium
+
+  * Drop an unneeded fixmakedoc patch.
+  * Add style.css and images to postgis-doc. Closes: #649352.
+
+ -- Markus Wanner <markus at bluegap.ch>  Sun, 19 Jan 2014 15:48:48 +0100
+
 postgis (2.1.1-3) unstable; urgency=low
 
   * Fix FTBFS on at least powerpc and mips by commenting out a few tests
diff --git a/debian/patches/fixmakedoc b/debian/patches/fixmakedoc
deleted file mode 100644
index 3a2ad3c..0000000
--- a/debian/patches/fixmakedoc
+++ /dev/null
@@ -1,15 +0,0 @@
-Description: Not sure why exactly we need this...
-Author: Markus Wanner <markus at bluegap.ch>
-Last-Update: 2013-04-14
-
---- a/doc/Makefile
-+++ b/doc/Makefile
-@@ -327,7 +327,7 @@
- 	rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/postgis.html
- 	rm -f $(DESTDIR)$(PGSQL_DOCDIR)/postgis/README.postgis
- 
--install: comments-install
-+install: man-install docs-install
- 
- uninstall: comments-uninstall
- 
diff --git a/debian/patches/series b/debian/patches/series
index 8575423..f4e41ab 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,6 +1,5 @@
 debian-versions
 java-version-fix
-fixmakedoc
 fix-spelling
 link-liblwgeom
 use-debian-maven
@@ -10,3 +9,4 @@ fix-armel
 fix-big-endian
 fix-manpage
 joinsel-issue2543
+doc-resources
diff --git a/debian/postgis-doc.install b/debian/postgis-doc.install
index 95ee129..05987da 100644
--- a/debian/postgis-doc.install
+++ b/debian/postgis-doc.install
@@ -1 +1,3 @@
-usr/share/doc/postgis/postgis.html usr/share/doc/postgis-doc/
\ No newline at end of file
+usr/share/doc/postgis/postgis.html usr/share/doc/postgis-doc/
+usr/share/doc/postgis/style.css usr/share/doc/postgis-doc/
+usr/share/doc/postgis/images usr/share/doc/postgis-doc/
\ No newline at end of file

-- 
PostGIS for PostgreSQL