Author: frankie Date: 2009-11-29 08:00:35 +0000 (Sun, 29 Nov 2009) New Revision: 2603
Added: packages/shapelib/trunk/Makefile Modified: packages/shapelib/trunk/debian/changelog packages/shapelib/trunk/debian/control packages/shapelib/trunk/debian/rules Log: Some fixes due to previuous NMUs. Added: packages/shapelib/trunk/Makefile =================================================================== --- packages/shapelib/trunk/Makefile (rev 0) +++ packages/shapelib/trunk/Makefile 2009-11-29 08:00:35 UTC (rev 2603) @@ -0,0 +1,142 @@ + +#LINKOPT = /usr/local/lib/libdbmalloc.a +CFLAGS = -g + +default: all + +all: shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump shptest + +shpopen.o: shpopen.c shapefil.h + $(CC) $(CFLAGS) -c shpopen.c + +shptree.o: shptree.c shapefil.h + $(CC) $(CFLAGS) -c shptree.c + +dbfopen.o: dbfopen.c shapefil.h + $(CC) $(CFLAGS) -c dbfopen.c + +shpcreate: shpcreate.c shpopen.o + $(CC) $(CFLAGS) shpcreate.c shpopen.o $(LINKOPT) -o shpcreate + +shpadd: shpadd.c shpopen.o + $(CC) $(CFLAGS) shpadd.c shpopen.o $(LINKOPT) -o shpadd + +shpdump: shpdump.c shpopen.o + $(CC) $(CFLAGS) shpdump.c shpopen.o $(LINKOPT) -o shpdump + +shprewind: shprewind.c shpopen.o + $(CC) $(CFLAGS) shprewind.c shpopen.o $(LINKOPT) -o shprewind + +dbfcreate: dbfcreate.c dbfopen.o + $(CC) $(CFLAGS) dbfcreate.c dbfopen.o $(LINKOPT) -o dbfcreate + +dbfadd: dbfadd.c dbfopen.o + $(CC) $(CFLAGS) dbfadd.c dbfopen.o $(LINKOPT) -o dbfadd + +dbfdump: dbfdump.c dbfopen.o + $(CC) $(CFLAGS) dbfdump.c dbfopen.o $(LINKOPT) -o dbfdump + +shptest: shptest.c shpopen.o + $(CC) $(CFLAGS) shptest.c shpopen.o $(LINKOPT) -o shptest + +shputils: shputils.c shpopen.o dbfopen.o + $(CC) $(CFLAGS) shputils.c shpopen.o dbfopen.o $(LINKOPT) -o shputils + +shptreedump: shptreedump.c shptree.o shpopen.o + $(CC) $(CFLAGS) shptreedump.c shptree.o shpopen.o $(LINKOPT) \ + -o shptreedump + +clean: + rm -f *.o dbfdump dbfcreate dbfadd shpdump shpcreate shpadd shputils + rm -f shptreedump + rm -rf *.lo *.la .libs + rm -f shptest + +test: test2 test3 + +# +# Note this stream only works if example data is accessable. +# Fetch ftp://gdal.velocet.ca/pub/outgoing/shape_eg_data.zip +# +test1: + @./stream1.sh > s1.out + @if test "`diff s1.out stream1.out`" = '' ; then \ + echo "******* Stream 1 Succeeded *********"; \ + rm s1.out; \ + else \ + echo "******* Stream 1 Failed *********"; \ + diff s1.out stream1.out; \ + fi + +test2: + @./stream2.sh > s2.out + @if test "`diff s2.out stream2.out`" = '' ; then \ + echo "******* Stream 2 Succeeded *********"; \ + rm s2.out; \ + rm test*.s??; \ + else \ + echo "******* Stream 2 Failed *********"; \ + diff s2.out stream2.out; \ + fi + +test3: + @./makeshape.sh > s3.out + @if test "`diff s3.out stream3.out`" = '' ; then \ + echo "******* Stream 3 Succeeded *********"; \ + rm s3.out; \ + rm test.*; \ + else \ + echo "******* Stream 3 Failed *********"; \ + diff s3.out stream3.out; \ + fi + + +# ----------------------------------------------------------------------------- +# 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 +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 2>&1 + 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 2>&1 + 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 2>&1 + mv -f .libs/dbfopen.lo dbfopen.lo + /bin/sh ./libtool --mode=link gcc -g -O2 -o libshp.la -rpath /usr/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 +# +# (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) + +lib_install: + cp .libs/libshp.la .libs/libshp.lai + /bin/sh ./mkinstalldirs /usr/local/lib + /bin/sh ./libtool --mode=install /usr/bin/install -c libshp.la /usr/local/lib/libshp.la + /usr/bin/install -c .libs/libshp.so.$(LIBSHP_VERSION) /usr/local/lib/libshp.so.$(LIBSHP_VERSION) + (cd /usr/local/lib && rm -f libshp.so.1 && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so.1) + (cd /usr/local/lib && rm -f libshp.so && ln -s libshp.so.$(LIBSHP_VERSION) libshp.so) + chmod +x /usr/local/lib/libshp.so.$(LIBSHP_VERSION) + /usr/bin/install -c .libs/libshp.la /usr/local/lib/libshp.la + /usr/bin/install -c .libs/libshp.a /usr/local/lib/libshp.a + ranlib /usr/local/lib/libshp.a + chmod 644 /usr/local/lib/libshp.a + /bin/sh ./mkinstalldirs /usr/local/include/libshp + /usr/bin/install -c -m 644 shapefil.h /usr/local/include/libshp/shapefil.h Modified: packages/shapelib/trunk/debian/changelog =================================================================== --- packages/shapelib/trunk/debian/changelog 2009-11-26 10:46:24 UTC (rev 2602) +++ packages/shapelib/trunk/debian/changelog 2009-11-29 08:00:35 UTC (rev 2603) @@ -1,18 +1,23 @@ shapelib (1.2.10-4) unstable; urgency=low - * NOT RELEASED. + * Long due upload. * Maintainership moved to DebianGis team. Thanks Noèl. - * Policy changed to 3.8.1. + * Policy changed to 3.8.3. * Debhelper level set to 7. * debian/rules revised to use dh_install and dh_prep. * debian/control now has better descriptions. * debian/control variables changed to 3.7+ versions. * debian/watch revised. + (closes: #539342) * Fixed debian/changelog typo. * Added copyright notice in debian/control. * Removed obsolete (?) man2html build-dep. + * Ack previous couple of NMUs. + (closes: #553256, #497160) + * Long descriptions revised. + (closes: #556606) - -- Francesco Paolo Lovergine <fran...@debian.org> Sun, 22 Mar 2009 10:46:21 +0100 + -- Francesco Paolo Lovergine <fran...@debian.org> Sun, 29 Nov 2009 08:46:41 +0100 shapelib (1.2.10-3) unstable; urgency=low Modified: packages/shapelib/trunk/debian/control =================================================================== --- packages/shapelib/trunk/debian/control 2009-11-26 10:46:24 UTC (rev 2602) +++ packages/shapelib/trunk/debian/control 2009-11-29 08:00:35 UTC (rev 2603) @@ -3,7 +3,7 @@ Maintainer: Debian GIS Project <pkg-grass-devel@lists.alioth.debian.org> Uploaders: Francesco Paolo Lovergine <fran...@debian.org> Build-Depends: debhelper (>= 7) -Standards-Version: 3.8.1 +Standards-Version: 3.8.3 Homepage: http://shapelib.maptools.org/ Package: shapelib @@ -11,10 +11,10 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: A library for reading and writing ArcView Shapefiles - tools - The Shapefile format is a new working and interchange format - promulagated by ESRI for simple vector data with attributes. It is - apparently the only file format that can be edited in ARCView 2/3, and - can also be exported and imported in Arc/Info. + The Shapefile format is a working and interchange format promoted by + ESRI for simple vector data with attributes. It is apparently the only + file format that can be edited in ARCView 2/3, and can also be exported + and imported in Arc/Info. . This package contains a useful set of tools to manage shapefiles. @@ -23,10 +23,9 @@ Architecture: any Depends: libshp1 (= ${binary:Version}), ${misc:Depends} Description: A library for reading and writing ArcView Shapefiles - development files - The Shapefile format is a new working and interchange format - promulagated by ESRI for simple vector - data with attributes. It is apparently the only file format - that can be edited in ARCView 2/3, and can also be exported + The Shapefile format is a working and interchange format promoted by + ESRI for simple vector data with attributes. It is apparently the only + file format that can be edited in ARCView 2/3, and can also be exported and imported in Arc/Info. . This package includes the development files. @@ -36,10 +35,9 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Description: A library for reading and writing ArcView Shapefiles - The Shapefile format is a new working and interchange format - promulagated by ESRI for simple vector - data with attributes. It is apparently the only file format - that can be edited in ARCView 2/3, and can also be exported + The Shapefile format is a working and interchange format promoted by + ESRI for simple vector data with attributes. It is apparently the only + file format that can be edited in ARCView 2/3, and can also be exported and imported in Arc/Info. . This package includes the shared library. Modified: packages/shapelib/trunk/debian/rules =================================================================== --- packages/shapelib/trunk/debian/rules 2009-11-26 10:46:24 UTC (rev 2602) +++ packages/shapelib/trunk/debian/rules 2009-11-29 08:00:35 UTC (rev 2603) @@ -1,6 +1,4 @@ #!/usr/bin/make -f -# Sample debian/rules that uses debhelper. -# GNU copyright 1997 to 1999 by Joey Hess. # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 _______________________________________________ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel