[SCM] shapelib branch, master, updated. debian/1.2.10-7-6-g9b39065

Arto Jantunen viiru at debian.org
Sat Nov 23 09:42:23 UTC 2013

The following commit has been merged in the master branch:
commit 9b390658d2ebbb00c048b83bc40c1721623f0827
Author: Arto Jantunen <viiru at debian.org>
Date:   Tue Oct 29 14:45:45 2013 +0200

    Bump SONAME due to API and ABI changes in 1.3.0

diff --git a/debian/control b/debian/control
index 89ba9ba..99dbbaa 100644
--- a/debian/control
+++ b/debian/control
@@ -25,7 +25,7 @@ Description: Library for reading and writing ArcView Shapefiles - tools
 Package: libshp-dev
 Section: libdevel
 Architecture: any
-Depends: libshp1 (= ${binary:Version}), ${misc:Depends}
+Depends: libshp2 (= ${binary:Version}), ${misc:Depends}
 Multi-Arch: same
 Description: Library for reading and writing ArcView Shapefiles - development files
  The Shapefile format is a working and interchange format promoted by
@@ -35,7 +35,7 @@ Description: Library for reading and writing ArcView Shapefiles - development fi
  This package includes the development files.
-Package: libshp1
+Package: libshp2
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}
 Pre-Depends: ${misc:Pre-Depends}
diff --git a/debian/libshp1.dirs b/debian/libshp2.dirs
similarity index 100%
rename from debian/libshp1.dirs
rename to debian/libshp2.dirs
diff --git a/debian/libshp1.install b/debian/libshp2.install
similarity index 100%
rename from debian/libshp1.install
rename to debian/libshp2.install
diff --git a/debian/patches/0003-Properly-use-libtool.patch b/debian/patches/0003-Properly-use-libtool.patch
index 3732d7f..afb737a 100644
--- a/debian/patches/0003-Properly-use-libtool.patch
+++ b/debian/patches/0003-Properly-use-libtool.patch
@@ -11,7 +11,7 @@ Bug-Debian: http://bugs.debian.org/497160
  1 file changed, 32 insertions(+), 10 deletions(-)
 diff --git a/Makefile b/Makefile
-index 0c41d8a..8073f9c 100644
+index 0c41d8a..2b8cefb 100644
 --- a/Makefile
 +++ b/Makefile
 @@ -21,7 +21,7 @@ shptree.o:	shptree.c shapefil.h
@@ -53,8 +53,8 @@ index 0c41d8a..8073f9c 100644
 +# The following is contributed by Jan-Oliver Wagner, and should allow for
 +# creating shared libraries on most platforms with gcc, and libtool installed.
-+LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry
++LIBSHP_VERSION=2.0.0 # still once to be changed manually (see for 1:1:0), sorry
 +lib: .libs/libshp.so
@@ -63,7 +63,7 @@ index 0c41d8a..8073f9c 100644
 +	libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. $(CPPFLAGS) $(CFLAGS) -c shptree.c
 +	libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. $(CPPFLAGS) $(CFLAGS) -c dbfopen.c
 +	libtool --mode=compile gcc -DPACKAGE=\"libshp\" -DVERSION=\"$(SHPLIB_VERSION)\" -DSTDC_HEADERS=1  -I. $(CPPFLAGS) $(CFLAGS) -c safileio.c
-+	libtool --mode=link gcc $(CFLAGS) $(LDFLAGS) -o libshp.la -rpath /usr/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo safileio.lo
++	libtool --mode=link gcc $(CFLAGS) $(LDFLAGS) -o libshp.la -rpath /usr/lib -version-info 2:0:0 shpopen.lo shptree.lo dbfopen.lo safileio.lo
 +	cp .libs/libshp.la .libs/libshp.lai
diff --git a/debian/rules b/debian/rules
index 847cc2c..b7d6516 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,8 +12,8 @@ override_dh_auto_install:
 	mkdir debian/tmp/usr/include/
 	make bin_install PREFIX=debian/tmp/usr
 	cp .libs/libshp.a debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
-	cp .libs/libshp.so.1.0.1 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
-	ln -s libshp.so.1.0.1 libshp.so
-	ln -s libshp.so.1.0.1 libshp.so.1
+	cp .libs/libshp.so.2.0.0 debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
+	ln -s libshp.so.2.0.0 libshp.so
+	ln -s libshp.so.2.0.0 libshp.so.2
 	mv libshp.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/
 	cp shapefil.h debian/tmp/usr/include/

Library for reading and writing ArcView Shapefiles

More information about the Pkg-grass-devel mailing list