[SCM] postgis branch, master, updated. upstream/2.0.1-23-g22ccf92

[Jerome Villeneuve Larouche]

The following commit has been merged in the master branch:
commit 30e69ad8e38a29745455924b53c138194c21cbd4
Author: Jerome Villeneuve Larouche <jlarouche at mapgears.com>
Date:   Tue Aug 21 18:52:53 2012 +0000

    Removed Java support, fixed doc make in debian/rules, fixed cleaning

diff --git a/debian/changelog b/debian/changelog
index 7b7f8b6..9b7640d 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+postgis (2.0.1-1) unstable; urgency=low
+
+  * New upstream release, 2.0.1
+
+ -- Jerome Villeneuve Larouche <jlarouche at mapgears.com>  Fri, 17 Aug 2012 14:56:22 +0000
+
 postgis (1.5.3-2) unstable; urgency=low
 
   * Moved pgsql2shp/shp2pgsql under conventional /usr/bin path.
diff --git a/debian/control b/debian/control
index f18a869..ffc56a7 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,8 @@ Uploaders: Stephen Frost <sfrost at debian.org>, Francesco Paolo Lovergine <frankie
 Build-Depends: debhelper (>= 8), autotools-dev, flex, bison, libgeos-dev (>= 3.1.1),
  libproj-dev (>= 4.5.0), libssl-dev, xsltproc, docbook, docbook-xsl,
  default-jdk, libpg-java, fastjar, libjts-java (>= 1.7), imagemagick,
- libcunit1-dev, dblatex, libxml2-dev, libgtk2.0-dev, postgresql-server-dev-9.1
+ libcunit1-dev, dblatex, libxml2-dev, libgtk2.0-dev, postgresql-server-dev-9.1,
+ ant, libgdal-dev, postgresql-9.1
 Standards-Version: 3.9.2
 Homepage: http://postgis.refractions.net/
 Vcs-Browser: http://git.debian.org/?p=pkg-grass/postgis.git
diff --git a/debian/patches/fixmakedoc b/debian/patches/fixmakedoc
new file mode 100644
index 0000000..28a573f
--- /dev/null
+++ b/debian/patches/fixmakedoc
@@ -0,0 +1,30 @@
+--- a/doc/Makefile.comments
++++ b/doc/Makefile.comments
+@@ -40,10 +40,10 @@
+ # If REGRESS=1 passed as a parameter, change the default install paths
+ # so that no prefix is included. This allows us to relocate to a temporary
+ # directory for regression testing.
+-ifeq ($(REGRESS),1)
+-        bindir=/bin
+-        pkglibdir=/lib
+-        datadir=/share
+-        datamoduledir=contrib/postgis
+-endif
++#ifeq ($(REGRESS),1)
++        #bindir=/bin
++        #pkglibdir=/lib
++        #datadir=/share
++        #datamoduledir=contrib/postgis
++#endif
+ 
+--- a/doc/Makefile
++++ b/doc/Makefile
+@@ -245,7 +245,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 5deccea..3bef349 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1 @@
-install
-generator
-html_doc_resources
+fixmakedoc
diff --git a/debian/rules b/debian/rules
index b133eb2..484e83f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -51,7 +51,7 @@ clean:
 	dh_testroot
 	[ -f doc/html/postgis.html.prev ] && mv doc/html/postgis.html.prev doc/html/postgis.html || true
 	[ ! -f GNUmakefile ] || $(MAKE) distclean || true
-	[ ! -f java/jdbc/Makefile ] || $(MAKE) -C java/jdbc clean
+	$(MAKE) -C doc images-clean
 	rm -f $(CURDIR)/debian/*.postinst $(CURDIR)/debian/*.postrm
 	dh_clean 
 
@@ -66,11 +66,7 @@ install-indep: build-indep
 		--docdir=\$${prefix}/share/doc/postgis \
 		--mandir=\$${prefix}/share/man \
 		--infodir=\$${prefix}/share/info \
-		--with-pgconfig=/usr/lib/postgresql/9.1/bin/pg_config
-	# PostGIS JDBC (with debug support)
-	$(MAKE) -C java/jdbc clean
-	DEBUGJAR=postgis_debug.fastjar JAR=fastjar JAVAC=javac $(MAKE) -C java/jdbc jar
-	DEBUGJAR=postgis_debug.fastjar JAR=fastjar JAVAC=javac $(MAKE) -C java/jdbc install DESTDIR=$(CURDIR)/debian/libpostgis-java/usr/share/java/$(JAVA_PATH)
+		--with-pgconfig=/usr/lib/postgresql/9.1/bin/pg_config \
 	# regress target uses pushd/popd
 	$(MAKE) SHELL=/bin/bash distclean
 	dh_install -i
@@ -98,11 +94,11 @@ install-arch: build-arch
 	$(MAKE)
 	$(MAKE) -C doc
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/postgresql-9.1-postgis
-	$(MAKE) -C doc install \
-			PGSQL_DOCDIR=$(CURDIR)/debian/postgis/usr/share/doc/postgis \
-			PGSQL_MANDIR=$(CURDIR)/debian/postgis/usr/share/man \
-			PGSQL_SHAREDIR=$(CURDIR)/debian/postgis/usr/share/postgresql/9.1
-	install -o root -g root doc/postgis_comments.sql \
+	$(MAKE) -C doc man-install \
+			PGSQL_MANDIR=$(CURDIR)/debian/postgis/usr/share/man
+	$(MAKE) -C doc docs-install \
+			PGSQL_DOCDIR=$(CURDIR)/debian/postgis/usr/share/doc/postgis
+	install -m644 doc/postgis_comments.sql \
 		$(CURDIR)/debian/postgresql-9.1-postgis/usr/share/postgresql/9.1/contrib/.
 	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 \
@@ -119,7 +115,7 @@ install-arch: build-arch
 	sed -e 's/@POSTGRES_VERSIONS@/9.1/' \
 	    -e 's/@SOVERSION@/$(MAJOR_VERSION).$(MINOR_VERSION)/' \
 	    $(CURDIR)/debian/postgis-generic.postrm.in >$(CURDIR)/debian/postgresql-9.1-postgis.postrm
-	
+
 	dh_install -s
 	
 	# copy utils for 9.1

-- 
PostGIS for PostgreSQL