Modifications by Alex Bodnaru

git-svn-id: http://svn.osgeo.org/geos/trunk@625 5242fede-7e19-0410-aef8-94bd7d2200fb

debian/control

@@ -36,10 +36,9 @@ Description: GEOS (Geometry Engine - Open Source) library
  topology functions such as IsValid().
 
 Package: libgeos-doc
-Section: science
+Section: doc
 Priority: optional
 Architecture: all
-Recommends: libgeos (= ${Source-Version})
 Description: GEOS (Geometry Engine - Open Source) documentation
  GEOS (Geometry Engine - Open Source) is a C++ port of the 
  Java Topology Suite (JTS). As such, it aims to contain the 

debian/libgeos-doc.doc-base

@@ -1,6 +1,6 @@
 Document: geos-reference-manual
 Title: GEOS Reference Manual
-Author: See /usr/share/doc/libgeos-dev/AUTHORS
+Author: See /usr/share/doc/libgeos/AUTHORS
 Abstract: This manual provides the libgeos
  API reference.
 Section: science

debian/rules

@@ -25,8 +25,6 @@ else
 endif
 ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
 	INSTALL_PROGRAM += -s
-#	MAKESTRIP=$(MAKE) install-strip DESTDIR=$(CURDIR)/debian/tmp #woody
-#else
 endif
 
 # shared library versions
@@ -35,28 +33,36 @@ version=`ls source/geom/.libs/lib*.so.* | \
 major=`ls source/geom/.libs/lib*.so.* | \
  awk '{if (match($$0,/\.so\.[0-9]+$$/)) print substr($$0,RSTART+4)}'`
 
+#ifeq "2" "$(major)"
+#	POSTGIS_CONFLICT='-u-DConflicts="libpostgis (<< 0.9.0)"'
+#	echo "ver 2"
+#endif
+
 config.status: configure
 	dh_testdir
 	# Add here commands to configure the package.
-	CFLAGS="$(CFLAGS)" ./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) --prefix=/usr --mandir=\$${prefix}/share/man --infodir=\$${prefix}/share/info
+	CFLAGS="$(CFLAGS)" \
+	./configure --host=$(DEB_HOST_GNU_TYPE) --build=$(DEB_BUILD_GNU_TYPE) \
+				--prefix=/usr --mandir=\$${prefix}/share/man \
+				--infodir=\$${prefix}/share/info
 
 
 build: build-stamp
 build-stamp:  config.status
 	dh_testdir
-
+	
 	# Add here commands to compile the package.
 	$(MAKE)
 	$(MAKE) check
-
+	
 	touch build-stamp
 
 clean:
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp 
 	rm -f debian/shlibs.local
-
+	
 	# Add here commands to clean up after the build process.
 	-$(MAKE) distclean
 ifneq "$(wildcard /usr/share/misc/config.sub)" ""
@@ -65,20 +71,18 @@ endif
 ifneq "$(wildcard /usr/share/misc/config.guess)" ""
 	cp -f /usr/share/misc/config.guess config.guess
 endif
-
-
+
 	dh_clean 
 
 install: build
 	dh_testdir
 	dh_testroot
 	dh_clean -k 
 	dh_installdirs
-
+	
 	# Add here commands to install the package into debian/tmp
 	$(MAKE) install DESTDIR=$(CURDIR)/debian/tmp
 	$(MAKE) installcheck DESTDIR=$(CURDIR)/debian/tmp
-	$(MAKESTRIP)
 	$(CURDIR)/debian/makedoc
 
 
@@ -115,7 +119,7 @@ binary-arch: build install
 	dh_makeshlibs
 	dh_installdeb
 	dh_shlibdeps
-	dh_gencontrol
+	dh_gencontrol $(POSTGIS_CONFLICT)
 	dh_md5sums
 	dh_builddeb