[SCM] postgis branch, master, updated. upstream/2.0.1-34-gcd4a3fe
Markus Wanner
markus at bluegap.ch
Tue Apr 23 20:42:10 UTC 2013
The following commit has been merged in the master branch:
commit cd4a3fe9168e1cb9203828ec1db6245194e589f1
Author: Markus Wanner <markus at bluegap.ch>
Date: Tue Apr 23 22:41:23 2013 +0200
Rename liblwgeom-2.0.3-0 back to just liblwgeom-2.0.3. Reduce patch
link-liblwgeom to make the SONAME match upstream's variant, again.
diff --git a/debian/changelog b/debian/changelog
index 80a0db3..3a128be 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -22,7 +22,7 @@ postgis (2.0.3-1) UNRELEASED; urgency=low
* Separate PostGIS documentation into a postgis-doc package, register its
contents with doc-base.
* Represent the fact that lwgeom isn't backward compatible in its SONAME,
- rename liblwgeom2 to liblwgeom-2.0.3-0 accordingly.
+ rename liblwgeom2 to liblwgeom-2.0.3 accordingly.
* Add patch java-version-fix: Corrects java jdbc jar version.
* Policy updated to 3.9.4. No changes.
* Update debian/copyright a bit.
diff --git a/debian/control b/debian/control
index 0947b31..3de2545 100644
--- a/debian/control
+++ b/debian/control
@@ -95,7 +95,7 @@ Description: Geographic objects support for PostgreSQL -- JDBC support
.
This package contains JDBC support for PostGIS.
-Package: liblwgeom-2.0.3-0
+Package: liblwgeom-2.0.3
Architecture: any
Section: libs
Depends: ${shlibs:Depends}, ${misc:Depends}
@@ -115,7 +115,7 @@ Package: liblwgeom-dev
Architecture: any
Section: libdevel
Depends: ${shlibs:Depends}, ${misc:Depends},
- liblwgeom-2.0.3-0 (= ${binary:Version})
+ liblwgeom-2.0.3 (= ${binary:Version})
Breaks: postgis (<< 2.0.0)
Description: PostGIS "Lightweight Geometry" library - Development files
PostGIS adds support for geographic objects to the PostgreSQL
diff --git a/debian/liblwgeom-2.0.3-0.install b/debian/liblwgeom-2.0.3-0.install
deleted file mode 100644
index 8c74c36..0000000
--- a/debian/liblwgeom-2.0.3-0.install
+++ /dev/null
@@ -1,2 +0,0 @@
-usr/lib/liblwgeom-2.0.3.so.0.0.0
-usr/lib/liblwgeom-2.0.3.so.0
\ No newline at end of file
diff --git a/debian/liblwgeom-2.0.3.install b/debian/liblwgeom-2.0.3.install
new file mode 100644
index 0000000..fd61f8a
--- /dev/null
+++ b/debian/liblwgeom-2.0.3.install
@@ -0,0 +1 @@
+usr/lib/liblwgeom-2.0.3.so
diff --git a/debian/liblwgeom-2.0.3-0.symbols b/debian/liblwgeom-2.0.3.symbols
similarity index 99%
rename from debian/liblwgeom-2.0.3-0.symbols
rename to debian/liblwgeom-2.0.3.symbols
index 526b64b..fe54e08 100644
--- a/debian/liblwgeom-2.0.3-0.symbols
+++ b/debian/liblwgeom-2.0.3.symbols
@@ -1,4 +1,4 @@
-liblwgeom-2.0.3.so.0 liblwgeom-2.0.3-0 #MINVER#
+liblwgeom-2.0.3.so liblwgeom-2.0.3 #MINVER#
GEOS2LWGEOM at Base 2.0.0
LWGEOM2GEOS at Base 2.0.0
LWGEOM_GEOS_buildArea at Base 2.0.0
diff --git a/debian/liblwgeom-dev.install b/debian/liblwgeom-dev.install
index 16daaa9..01df5de 100644
--- a/debian/liblwgeom-dev.install
+++ b/debian/liblwgeom-dev.install
@@ -1,3 +1,3 @@
usr/include
-usr/lib/liblwgeom-2.0.3.a
-usr/lib/liblwgeom-2.0.3.so
+usr/lib/liblwgeom.a
+usr/lib/liblwgeom.so
diff --git a/debian/patches/link-liblwgeom b/debian/patches/link-liblwgeom
index 6018090..4190dc2 100644
--- a/debian/patches/link-liblwgeom
+++ b/debian/patches/link-liblwgeom
@@ -1,8 +1,8 @@
Description: Dynamically link to liblwgeom
Instead of statically pulling liblwgeom into the postgis.so, dynamically
- link to it. Rename to liblwgeom-2.0.3
+ link to it.
Author: Stephen Frost <sfrost at snowman.net>, Markus Wanner <markus at bluegap.ch>
-Last-Update: 2013-04-14
+Last-Update: 2013-04-23
--- a/postgis/Makefile.in
+++ b/postgis/Makefile.in
@@ -18,31 +18,10 @@ Last-Update: 2013-04-14
-# supplied with newer versions of PostGIS
PG_CPPFLAGS += @CPPFLAGS@ -I../liblwgeom -I../libpgcommon
-SHLIB_LINK_F = ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a @SHLIB_LINK@
-+SHLIB_LINK_F = -L../liblwgeom/.libs -llwgeom-2.0.3 ../libpgcommon/libpgcommon.a @SHLIB_LINK@
++SHLIB_LINK_F = -L../liblwgeom/.libs -llwgeom ../libpgcommon/libpgcommon.a @SHLIB_LINK@
# Extra files to remove during 'make clean'
EXTRA_CLEAN=$(SQL_OBJS) legacy_uninstall.sql
-@@ -114,16 +108,16 @@
- # Make all PostGIS objects depend upon liblwgeom, so that if an underlying
- # change is made, a PostGIS rebuild is triggered.
- #
--# Also they are all dependent on postgis_config.h
-+# Also they are all dependent on postgis_config.h
- # and thus postgis_svn_revision.h
- #
--$(PG_OBJS): ../liblwgeom/.libs/liblwgeom.a ../libpgcommon/libpgcommon.a ../postgis_config.h ../postgis_svn_revision.h
-+$(PG_OBJS): ../liblwgeom/.libs/liblwgeom-2.0.3.a ../libpgcommon/libpgcommon.a ../postgis_config.h ../postgis_svn_revision.h
-
- ../postgis_svn_revision.h:
- $(MAKE) -C .. postgis_svn_revision.h
-
--../liblwgeom/.libs/liblwgeom.a:
-- make -C ../liblwgeom liblwgeom.la
-+../liblwgeom/.libs/liblwgeom-2.0.3.a:
-+ make -C ../liblwgeom liblwgeom-2.0.3.la
-
- ../libpgcommon/libpgcommon.a:
- make -C ../libpgcommon libpgcommon.a
--- a/raster/rt_pg/Makefile.in
+++ b/raster/rt_pg/Makefile.in
@@ -27,14 +27,7 @@
@@ -57,77 +36,10 @@ Last-Update: 2013-04-14
-# supplied with newer versions of PostGIS
-#
-LIBLWGEOM_LDFLAGS=../../liblwgeom/.libs/liblwgeom.a
-+LIBLWGEOM_LDFLAGS=-L../../liblwgeom/.libs -llwgeom-2.0.3
++LIBLWGEOM_LDFLAGS=-L../../liblwgeom/.libs -llwgeom
LIBLWGEOM_CFLAGS="-I../../liblwgeom"
LIBPGCOMMON_CFLAGS="-I../../libpgcommon"
LIBPGCOMMON_LDFLAGS=../../libpgcommon/libpgcommon.a
-@@ -88,7 +81,7 @@
-
-
- # Objects dependencies
--$(OBJS): ../../liblwgeom/.libs/liblwgeom.a ../../libpgcommon/libpgcommon.a ../../postgis_config.h ../../postgis_svn_revision.h
-+$(OBJS): ../../liblwgeom/.libs/liblwgeom-2.0.3.a ../../libpgcommon/libpgcommon.a ../../postgis_config.h ../../postgis_svn_revision.h
-
- # Generate any .sql.in files from .sql.in.c files by running them through the SQL pre-processor
- $(SQL_OBJS): %.in: %.in.c
---- a/liblwgeom/Makefile.in
-+++ b/liblwgeom/Makefile.in
-@@ -101,18 +101,18 @@
- lwgeom_log.h \
- lwgeom_geos.h
-
--all: liblwgeom.la
-+all: liblwgeom-$(SOVER).la
-
- install: install-liblwgeom
-
- uninstall: uninstall-liblwgeom
-
--install-liblwgeom: liblwgeom.la
-- $(LIBTOOL) --mode=install $(INSTALL) liblwgeom.la "$(DESTDIR)$(libdir)/liblwgeom.la"
-+install-liblwgeom: liblwgeom-$(SOVER).la
-+ $(LIBTOOL) --mode=install $(INSTALL) liblwgeom-$(SOVER).la "$(DESTDIR)$(libdir)/liblwgeom-$(SOVER).la"
- $(INSTALL) liblwgeom.h "$(DESTDIR)$(includedir)/liblwgeom.h"
-
- uninstall-liblwgeom:
-- $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/liblwgeom.la"
-+ $(LIBTOOL) --mode=uninstall rm -f "$(DESTDIR)$(libdir)/liblwgeom-$(SOVER).la"
-
- # Make all objects depend upon postgis_config.h and postgis_svn_revision.h
- $(LT_OBJS): ../postgis_config.h ../postgis_svn_revision.h
-@@ -121,10 +121,11 @@
- $(MAKE) -C .. postgis_svn_revision.h
-
- #liblwgeom.a: $(SA_OBJS) $(NM_OBJS) $(SA_HEADERS)
--#ar rs liblwgeom.a $(SA_OBJS) $(NM_OBJS)
-+#ar rs liblwgeom.a $(SA_OBJS) $(NM_OBJS)
-
--liblwgeom.la: $(LT_OBJS) $(SA_HEADERS)
-- $(LIBTOOL) --tag=CC --mode=link $(CC) -rpath $(libdir) $(LT_OBJS) -release $(SOVER) $(LDFLAGS) -o $@
-+liblwgeom-$(SOVER).la: $(LT_OBJS) $(SA_HEADERS)
-+ $(LIBTOOL) --tag=CC --mode=link $(CC) -rpath $(libdir) $(LT_OBJS) \
-+ $(LDFLAGS) -o $@
-
- maintainer-clean: clean
- rm -f lwin_wkt_lex.c
-@@ -134,7 +135,7 @@
- clean:
- $(MAKE) -C cunit clean
- rm -f $(LT_OBJS) $(SA_OBJS) $(NM_OBJS)
-- rm -f liblwgeom.la
-+ rm -f liblwgeom.la liblwgeom-$(SOVER).la
- rm -rf .libs
-
- distclean: clean
-@@ -157,7 +158,7 @@
- parser:
- $(YACC) -o'lwin_wkt_parse.c' -d lwin_wkt_parse.y
- $(LEX) -i lwin_wkt_lex.l
--
-+
- # $(YACC) --debug --verbose -o'$@' -d $<
- # $(YACC) -o'$@' -d $^
- # $(LEX) -i $<
--- a/raster/loader/Makefile.in
+++ b/raster/loader/Makefile.in
@@ -31,7 +31,7 @@
@@ -135,37 +47,7 @@ Last-Update: 2013-04-14
RT_CORE=../rt_core
-LIBLWGEOM_LDFLAGS=../../liblwgeom/liblwgeom.la
-+LIBLWGEOM_LDFLAGS=-L../../liblwgeom/.libs -llwgeom-2.0.3
++LIBLWGEOM_LDFLAGS=-L../../liblwgeom/.libs -llwgeom
LIBLWGEOM_CFLAGS=-I../../liblwgeom
LIBGDAL_CFLAGS=@LIBGDAL_CFLAGS@
LIBGDAL_LDFLAGS=@LIBGDAL_LDFLAGS@
---- a/loader/Makefile.in
-+++ b/loader/Makefile.in
-@@ -42,7 +42,7 @@
- ICONV_CFLAGS=@ICONV_CFLAGS@
-
- # liblwgeom
--LIBLWGEOM=../liblwgeom/liblwgeom.la
-+LIBLWGEOM=../liblwgeom/liblwgeom-2.0.3.la
-
- # GTK includes and libraries
- GTK_CFLAGS = @GTK_CFLAGS@ @IGE_MAC_CFLAGS@
---- a/doc/html/image_src/Makefile.in
-+++ b/doc/html/image_src/Makefile.in
-@@ -152,12 +152,12 @@
- convert $@ -resize 100x100 $@
-
- # Build the main executable
--generator: ../../../liblwgeom/.libs/liblwgeom.a $(OBJS)
-- $(CC) -o $@ $(OBJS) ../../../liblwgeom/.libs/liblwgeom.a -lm $(CUNIT_LDFLAGS)
-+generator: ../../../liblwgeom/.libs/liblwgeom-2.0.3.a $(OBJS)
-+ $(CC) -o $@ $(OBJS) ../../../liblwgeom/.libs/liblwgeom-2.0.3.a -lm $(CUNIT_LDFLAGS)
-
- # Build liblwgeom
--../../../liblwgeom/.libs/liblwgeom.a:
-- make -C ../../../liblwgeom liblwgeom.la
-+../../../liblwgeom/.libs/liblwgeom-2.0.3.a:
-+ make -C ../../../liblwgeom liblwgeom-2.0.3.la
-
- # Clean target
- clean:
--
PostGIS for PostgreSQL
More information about the Pkg-grass-devel
mailing list