[SCM] shapelib branch, master, updated. debian/1.2.10-7-5-g2b80d4e
The following commit has been merged in the master branch: commit b03ed139dcd8046ee2f5cf3a5961e02ecc0a955b Author: Arto Jantunen vi...@debian.org Date: Fri Sep 6 13:30:03 2013 +0300 debian/shapelib.docs: update for new file locations diff --git a/debian/shapelib.docs b/debian/shapelib.docs index 12e1ac6..976ecae 100644 --- a/debian/shapelib.docs +++ b/debian/shapelib.docs @@ -1,3 +1,3 @@ -dbf_api.html -shapelib.html -shp_api.html +web/dbf_api.html +web/shapelib-tools.html +web/shp_api.html -- Library for reading and writing ArcView Shapefiles ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] shapelib branch, master, updated. debian/1.2.10-7-5-g2b80d4e
The following commit has been merged in the master branch: commit 2b80d4e8906c52655b9290cc6239dad8ff435286 Author: Arto Jantunen vi...@debian.org Date: Fri Sep 6 13:30:25 2013 +0300 debian/rules: update for new version diff --git a/debian/rules b/debian/rules index 4dd8e75..847cc2c 100755 --- a/debian/rules +++ b/debian/rules @@ -6,21 +6,11 @@ DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) override_dh_auto_test: -override_dh_auto_build: - mv shprewind shprewind.bak - dh_auto_build - -override_dh_auto_clean: - dh_auto_clean - mv shprewind.bak shprewind || true - override_dh_auto_install: -# have to copy the files by hand.:( mkdir -p debian/tmp/usr/bin/ mkdir -p debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH) mkdir debian/tmp/usr/include/ - cp dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shprewind \ - shptest debian/tmp/usr/bin/ + 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 -- Library for reading and writing ArcView Shapefiles ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[SCM] shapelib branch, master, updated. debian/1.2.10-7-5-g2b80d4e
The following commit has been merged in the master branch: commit 6a343f039530617cab5ef4e53c600275b50be668 Author: Arto Jantunen vi...@debian.org Date: Fri Sep 6 13:28:25 2013 +0300 Update build system patches (0003-0005) to match new Makefile diff --git a/debian/patches/0003-Properly-use-libtool.patch b/debian/patches/0003-Properly-use-libtool.patch index 4616282..3732d7f 100644 --- a/debian/patches/0003-Properly-use-libtool.patch +++ b/debian/patches/0003-Properly-use-libtool.patch @@ -1,59 +1,81 @@ From: Riku Voipio riku.voi...@iki.fi Date: Tue, 4 Nov 2008 14:46:56 +0200 -Subject: [PATCH] Properly use libtool +Subject: Properly use libtool The problem is that shapelib throws away a seemingly good libtool linked library and replaces it with something hacks in together almost right. Bug-Debian: http://bugs.debian.org/497160 --- - Makefile | 32 +--- - 1 files changed, 5 insertions(+), 27 deletions(-) + Makefile | 42 -- + 1 file changed, 32 insertions(+), 10 deletions(-) -Index: shapelib-1.2.10/Makefile -=== shapelib-1.2.10.orig/Makefile 2012-05-11 11:23:01.0 +0200 -+++ shapelib-1.2.10/Makefile 2012-05-11 11:23:05.0 +0200 -@@ -99,37 +99,15 @@ - LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry - - lib: -- /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -- gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shpopen.c -o .libs/shpopen.lo -- gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shpopen.c -o shpopen.o /dev/null 21 -- mv -f .libs/shpopen.lo shpopen.lo -- /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -- rm -f .libs/shptree.lo -- gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC shptree.c -o .libs/shptree.lo -- gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c shptree.c -o shptree.o /dev/null 21 -- mv -f .libs/shptree.lo shptree.lo -- /bin/sh ./libtool --mode=compile gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -- rm -f .libs/dbfopen.lo -- gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c -fPIC -DPIC dbfopen.c -o .libs/dbfopen.lo -- gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. -I. -I/usr/local/include -g -O2 -c dbfopen.c -o dbfopen.o /dev/null 21 -- mv -f .libs/dbfopen.lo dbfopen.lo -- /bin/sh ./libtool --mode=link gcc -g -O2 -o libshp.la -rpath /usr/local/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo -- rm -fr .libs/libshp.la .libs/libshp.* .libs/libshp.* -- rm -fr .libs/libshp.lax -- mkdir .libs/libshp.lax -- /usr/bin/ld -G -h libshp.so.1 -o .libs/libshp.so.$(LIBSHP_VERSION) shpopen.lo shptree.lo dbfopen.lo -lc +diff --git a/Makefile b/Makefile +index 0c41d8a..8073f9c 100644 +--- a/Makefile b/Makefile +@@ -21,7 +21,7 @@ shptree.o: shptree.c shapefil.h + dbfopen.o:dbfopen.c shapefil.h + $(CC) $(CFLAGS) -c dbfopen.c + +-safileio.o: safileio.c shapefil.h ++safileio.o:shapefil.h + $(CC) $(CFLAGS) -c safileio.c + + shpcreate:shpcreate.c shpopen.o safileio.o +@@ -57,6 +57,7 @@ shptreedump: shptreedump.c shptree.o shpopen.o safileio.o + + clean: + rm -f *.o shptest $(SHPBIN) libshp.a ++ rm -rf *.lo *.la .libs + + test: test2 test3 + +@@ -97,17 +98,38 @@ test3: + fi + + +-lib: libshp.a +- +-libshp.a: $(LIBOBJ) +- ar r libshp.a $(LIBOBJ) +- +-lib_install: libshp.a +- cp libshp.a $(PREFIX)/lib +- cp shapefil.h $(PREFIX)/include - -- (cd .libs rm -f libshp.so.1 ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) -- (cd .libs rm -f libshp.so ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) -- ar cru .libs/libshp.a shpopen.o shptree.o dbfopen.o -- ranlib .libs/libshp.a -- rm -fr .libs/libshp.lax -- (cd .libs rm -f libshp.la ln -s ../libshp.la libshp.la) + bin_install: $(SHPBIN) + cp $(SHPBIN) $(PREFIX)/bin + + install: lib_install bin_install + ++# - ++# The following is contributed by Jan-Oliver Wagner, and should allow for ++# creating shared libraries on most platforms with gcc, and libtool installed. ++ ++SHPLIB_VERSION=1.2.9
[SCM] shapelib branch, master, updated. debian/1.2.10-7-5-g2b80d4e
The following commit has been merged in the master branch:
commit ea6957973db15701cec494f4aa0c67b3670fd28c
Author: Arto Jantunen vi...@debian.org
Date: Fri Sep 6 13:24:49 2013 +0300
Remove patch 0002 (Thread safety fixes), no longer needed
diff --git a/debian/patches/0002-Thread-safety-fixes.patch
b/debian/patches/0002-Thread-safety-fixes.patch
deleted file mode 100644
index 5468df4..000
--- a/debian/patches/0002-Thread-safety-fixes.patch
+++ /dev/null
@@ -1,181 +0,0 @@
-From: M Joonas Pihlaja jpihl...@cc.helsinki.fi
-Date: Fri, 8 Apr 2005 10:51:19 +0200
-Subject: [PATCH] Thread safety fixes
-
- dbfopen.c | 60 +---
- shapefil.h |5 +
- 2 files changed, 38 insertions(+), 27 deletions(-)
-
-diff --git a/dbfopen.c b/dbfopen.c
-index 43b25ac..178ae18 100644
a/dbfopen.c
-+++ b/dbfopen.c
-@@ -197,8 +197,6 @@ static char rcsid[] =
- # define TRUE1
- #endif
-
--static intnStringFieldLen = 0;
--static char * pszStringField = NULL;
-
- //
- /* SfRealloc() */
-@@ -431,6 +429,12 @@ DBFOpen( const char * pszFilename, const char * pszAccess
)
- psDBF-panFieldOffset[iField-1] + psDBF-panFieldSize[iField-1];
- }
-
-+/* */
-+/* Initialize our temporary input fields. */
-+/* */
-+psDBF-nStringFieldLen = 0;
-+psDBF-pszStringField = NULL;
-+
- return( psDBF );
- }
-
-@@ -489,14 +493,12 @@ DBFClose(DBFHandle psDBF)
- free( psDBF-pszHeader );
- free( psDBF-pszCurrentRecord );
-
--free( psDBF );
--
--if( pszStringField != NULL )
-+if( psDBF-pszStringField != NULL )
- {
--free( pszStringField );
--pszStringField = NULL;
--nStringFieldLen = 0;
-+free( psDBF-pszStringField );
- }
-+
-+free( psDBF );
- }
-
- //
-@@ -571,6 +573,12 @@ DBFCreate( const char * pszFilename )
-
- psDBF-bNoHeader = TRUE;
-
-+/* */
-+/* Initialize our temporary input fields.*/
-+/* */
-+psDBF-nStringFieldLen = 0;
-+psDBF-pszStringField = NULL;
-+
- return( psDBF );
- }
-
-@@ -691,7 +699,6 @@ static void *DBFReadAttribute(DBFHandle psDBF, int
hEntity, int iField,
- unsigned char *pabyRec;
- void *pReturnField = NULL;
-
--static double dDoubleField;
-
- /* */
- /* Verify selection. */
-@@ -734,30 +741,31 @@ static void *DBFReadAttribute(DBFHandle psDBF, int
hEntity, int iField,
- /* */
- /*Ensure our field buffer is large enough to hold this buffer.*/
- /* */
--if( psDBF-panFieldSize[iField]+1 nStringFieldLen )
-+if( psDBF-panFieldSize[iField]+1 psDBF-nStringFieldLen )
- {
-- nStringFieldLen = psDBF-panFieldSize[iField]*2 + 10;
-- pszStringField = (char *) SfRealloc(pszStringField,nStringFieldLen);
-+ psDBF-nStringFieldLen = psDBF-panFieldSize[iField]*2 + 10;
-+ psDBF-pszStringField = (char *) SfRealloc(psDBF-pszStringField,
-+ psDBF-nStringFieldLen);
- }
-
- /* */
- /*Extract the requested field.*/
- /* */
--strncpy( pszStringField,
-+strncpy( psDBF-pszStringField,
-((const char *) pabyRec) + psDBF-panFieldOffset[iField],
-psDBF-panFieldSize[iField] );
--pszStringField[psDBF-panFieldSize[iField]] = '\0';
-+psDBF-pszStringField[psDBF-panFieldSize[iField]] = '\0';
-
--pReturnField = pszStringField;
-+pReturnField = psDBF-pszStringField;
-
- /* */
- /* Decode the field. */
- /* */
- if( chReqType == 'N' )
- {
--dDoubleField = atof(pszStringField);
-+ psDBF-dDoubleField = atof(psDBF-pszStringField);
-
-- pReturnField = dDoubleField;
-+ pReturnField = psDBF-dDoubleField;
- }
-
- /* */
-@@ -768,7 +776,7 @@ static void *DBFReadAttribute(DBFHandle psDBF, int
