[shapelib] 01/01: Add build-dependency on libtool-bin (Closes: #761786)
This is an automated email from the git hooks/post-receive script. viiru pushed a commit to branch master in repository shapelib. commit 60ac2b4904e8b02880375941ab469f3486e332d0 Author: Arto Jantunen vi...@debian.org Date: Sat Sep 20 13:41:31 2014 +0300 Add build-dependency on libtool-bin (Closes: #761786) --- debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/debian/control b/debian/control index 63cce91..fb4ed0e 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Section: libs Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org -Build-Depends: debhelper (= 9), libtool, libproj-dev +Build-Depends: debhelper (= 9), libtool, libproj-dev, libtool-bin Standards-Version: 3.9.5 Homepage: http://shapelib.maptools.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/shapelib.git -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/shapelib.git ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[shapelib] branch master updated (d4e9041 - 60ac2b4)
This is an automated email from the git hooks/post-receive script. viiru pushed a change to branch master in repository shapelib. from d4e9041 Fixed #742148 new 60ac2b4 Add build-dependency on libtool-bin (Closes: #761786) The 1 revisions listed above as new are entirely new to this repository and will be described in separate emails. The revisions listed as adds were already present in the repository and have only been added to this reference. Summary of changes: debian/control | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/shapelib.git ___ 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-6-g9b39065
The following commit has been merged in the master branch: commit 9b390658d2ebbb00c048b83bc40c1721623f0827 Author: Arto Jantunen vi...@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. + -+SHPLIB_VERSION=1.2.9 -+LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry ++SHPLIB_VERSION=1.3.0 ++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 + +lib_install: + 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 ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Re: [SCM] shapelib annotated tag, upstream/1.3.0, created. upstream/1.3.0
Francesco P. Lovergine fran...@debian.org writes: Hi I think the recent changes to shapelib (i.e. the whole new version) have been lost in the dark due to recent RAID issues on alioth. Could you please push again them? I see that on alioth, the only thing missing I can see was the soname bump that I hadn't pushed. Even that should be there now. -- Arto Jantunen ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#526984: shapelib 1.3.0
Francesco P. Lovergine fran...@debian.org writes: On Sat, Nov 02, 2013 at 07:58:07PM +0200, Arto Jantunen wrote: Kurt Roeckx k...@roeckx.be writes: I wanted a newer version, so I've prepared a package for myself and put it up at: http://people.debian.org/~kroeckx/shapelib/ I really dislike that they dropped the support for a shared library. They never had a shared library, it's a Debian modification. I have a version of this package done that keeps the shared lib (and bumps the soname) waiting for comments from the rest of the team before I push it out. There are not rdepends that could cause problems, so it is ok for me pushing that change. Any reason to have policy stuck to 3.9.3? No real reason, I simply haven't gone through the policy changes and verified that it's ok to bump standards-version. I'll do that soonish unless someone beats me to it. Also I did successfully build test all of the rdeps, but this is still a transition and as such needs an ok by the release team before uploading to unstable. -- Arto Jantunen ___ 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 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
[SCM] shapelib branch, pristine-tar, updated. 7d677d83a9203be5c583b60949384b99076f1160
The following commit has been merged in the pristine-tar branch: commit 7d677d83a9203be5c583b60949384b99076f1160 Author: Arto Jantunen vi...@debian.org Date: Fri May 18 10:33:12 2012 +0300 pristine-tar data for shapelib_1.3.0.orig.tar.gz diff --git a/shapelib_1.3.0.orig.tar.gz.delta b/shapelib_1.3.0.orig.tar.gz.delta new file mode 100644 index 000..1e45170 Binary files /dev/null and b/shapelib_1.3.0.orig.tar.gz.delta differ diff --git a/shapelib_1.3.0.orig.tar.gz.id b/shapelib_1.3.0.orig.tar.gz.id new file mode 100644 index 000..9b5ff38 --- /dev/null +++ b/shapelib_1.3.0.orig.tar.gz.id @@ -0,0 +1 @@ +796f930ea312f1ab4ff627ad15f0bd9c39d71d45 -- 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 annotated tag, upstream/1.3.0, created. upstream/1.3.0
The annotated tag, upstream/1.3.0 has been created at f852fedb93384ca3fce37153ab74073aa70d9187 (tag) tagging 796f930ea312f1ab4ff627ad15f0bd9c39d71d45 (commit) replaces upstream/1.2.10 tagged by Arto Jantunen on Fri May 18 10:33:12 2012 +0300 - Shortlog Upstream version 1.3.0 Arto Jantunen (1): Imported Upstream version 1.3.0 --- -- 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
Bug#526984: shapelib 1.3.0
Kurt Roeckx k...@roeckx.be writes: I wanted a newer version, so I've prepared a package for myself and put it up at: http://people.debian.org/~kroeckx/shapelib/ I really dislike that they dropped the support for a shared library. They never had a shared library, it's a Debian modification. I have a version of this package done that keeps the shared lib (and bumps the soname) waiting for comments from the rest of the team before I push it out. A copy of the source package is available at http://people.debian.org/~viiru/shapelib/shapelib_1.3.0-1.dsc -- Arto Jantunen ___ 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] postgis annotated tag, debian/1.5.3-2_bpo60+1, created. debian/1.5.3-2_bpo60+1
The annotated tag, debian/1.5.3-2_bpo60+1 has been created at 0a898ed1d10752e4205667eb77630760a68af590 (tag) tagging 5c091b5adc2490db13f4eb1316fd7f7b6e1274d4 (commit) replaces upstream/1.5.3 tagged by Arto Jantunen on Mon Jan 28 12:07:35 2013 +0200 - Shortlog Debian release 1.5.3-2~bpo60+1 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAlEGTegACgkQQ9/iJIjcFnpliACfbcc2P8L+KpIag+q5jnIcTG0c ngQAn0vLfEJ3cwVBTn6wWpZ/tMaK1Gqe =OPyS -END PGP SIGNATURE- Alan Boudreault (2): New upstream release of postgis New upstream release of postgis: 1.5.2 Arto Jantunen (2): Update changelog for backport Include the changelog entry of the previous backport as well Fabio Tranchitella (22): Merged trunk with upstream (postgis-1.1.3). Added a new changelog entry for 1.1.3-1 release. Merged trunk with upstream (postgis-1.1.4). Changes for the debian release 1.1.4-1. Merge with new upstream release (1.1.5). Merge with new upstream release. Fixes. Changes for the new release. Merge with new upstream release. Preparing the new release. Removed upstream source code, we'll store only the debian/ dir in the repository. Set executable property on debian/rules. * New upstream release. * Add support for postgresql-8.3. (Closes: #466417, #471689) fix New upstream release. * New upstream release. patch the utils to fix some lintian warnings added missing dpatch updated utils.dpatch we don't care about utils fixed watch file Francesco P. Lovergine (2): Fixed typo in debian/control Reordered build-deps and fixed typo. Francesco Paolo Lovergine (46): Changing root tree to a more reasonable name. Fixing #425919 Uhm, changed doc file Minor fixes Removing postgres 8.2 support. Releasing 1.3.3-2 Fix for inter-versions support Fixating postinst script Added purging mechanism Postinst was postrm for postgis :-( Ready for release. Some minor changes. Supporting 1.4.0 on 8.3/8.4 Ops, typo... commit b91d8412246b3b9615037bade3979d4377632106 Minor changes to debian/rules Useful msg commit 1fc9ebae623798d3371fdf8ef5f0e02d30d4f270 Updated README.Debian Another template added and changed a bit doc. Now supporting pgsql 8.4 only, old scripts mantained for backports. Fixing #560409 Update for 1.5.0. Fixed rules for using *_VERSION macros. Fixed outdated information in README.Debian Added a patch to solve an alpha issue. 1.5.1-3 Solving mips/mipsel FTBS. Fixed calls Some more fixes. Merge branch 'upstream' Merge commit 'upstream/1.5.2' Main changes after squeeze. Fixed #575622 and #596663 Now supporting (again) multiple versions of PostgreSQL. Added missig additional -dev package for pgsql. Added a forced removing of stuff after building. Moved to 9.1 version for PostgreSQL. Fix for PGSQL 9.1 added. Fixed series for a fake patch. Dropped support for pgsql 8.4. Merge commit 'upstream/1.5.3' Updated to 1.5.3 version. Merge branch 'master' of ssh://git.debian.org/git/pkg-grass/postgis Annotated one more bug report closed. Fixating a couple of issues in current 1.5.3 Stephen Frost (5): - Initial import Copying upstream PostGIS 1.1.2 to trunk for initial import - Add in initial Debian modifications - Remove mistakenly-kept files (they're not in the upstream 1.2.1 tarball) - Update for PG 8.2 --- -- PostGIS for PostgreSQL ___ 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] postgis branch, squeeze-bpo, updated. debian/1.5.3-2_bpo60+1
The following commit has been merged in the squeeze-bpo branch: commit 5c091b5adc2490db13f4eb1316fd7f7b6e1274d4 Author: Arto Jantunen vi...@debian.org Date: Thu Jan 10 19:04:30 2013 +0200 Include the changelog entry of the previous backport as well diff --git a/debian/changelog b/debian/changelog index 85b4476..da1902d 100644 --- a/debian/changelog +++ b/debian/changelog @@ -37,6 +37,12 @@ postgis (1.5.3-1) unstable; urgency=low -- Francesco Paolo Lovergine fran...@debian.org Thu, 15 Sep 2011 15:14:57 +0200 +postgis (1.5.2-1~bpo60+1) squeeze-backports; urgency=low + + * Rebuild for squeeze-backports. + + -- Marco Nenciarini mnen...@debian.org Fri, 08 Apr 2011 09:47:51 +0200 + postgis (1.5.2-1) unstable; urgency=low * New upstream release, with a few bug fixes. -- PostGIS for PostgreSQL ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#667966: postgis: PostGIS 2.0.0 Released
Moritz Lennert mlenn...@club.worldonline.be writes: I would like to ping this issue. Is this just an issue of manpower, or are there other reasons why PostGIS is not packaged, yet ? Postgis 2 is packaged in Git, but has not been uploaded to Debian (I assume it exists in some version of Ubuntu, however). The fact that Debian is currently frozen and attempting to release is also a reason. We currently have the same version of Postgis in both unstable and wheezy, which is an advantage in case Postgis still needs an update before the release. Normal updates to unstable will resume after wheezy is released. -- Arto Jantunen ___ 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] postgis branch, squeeze-bpo, created. upstream/1.5.3-20-gf26ba04
The branch, squeeze-bpo has been created at f26ba04ab8cf7d515759972b2175ebc442523b97 (commit) - Shortlog commit f26ba04ab8cf7d515759972b2175ebc442523b97 Author: Arto Jantunen vi...@debian.org Date: Thu Nov 15 19:41:15 2012 +0200 Update changelog for backport --- -- PostGIS for PostgreSQL ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
Bug#684808: mapserver: FTBFS: ld: cannot find -lstdc++
tags 684808 +patch thanks Lucas Nussbaum lu...@lucas-nussbaum.net writes: Source: mapserver Version: 6.0.1-3.1 Severity: serious Tags: wheezy sid User: debian...@lists.debian.org Usertags: qa-ftbfs-20120814 qa-ftbfs Justification: FTBFS in wheezy on amd64 Hi, During a rebuild of all packages in *wheezy*, your package failed to build on amd64. Relevant part: gcc-4.6 -shared -o mapscript.so mapscript_wrap.o -L. -L/usr/lib -L. -Wl,-z,relro -rdynamic -Wl,-export-dynamic -fPIC -L../.. -L. -lmapserver -L/usr/lib/x86_64-linux-gnu -lfreetype -lz -lgd -ljpeg -L/usr/lib/x86_64-linux-gnu -lfreetype -lz -lpng -lz -lXpm -lX11 -lexpat -lproj -ljpeg -lpng -lgif -L/usr/lib -lgdal -L/usr/lib -lpq -L/usr/lib/x86_64-linux-gnu -lcurl -L/usr/lib -lgeos_c -lpthread -lc -lfcgi -lz -L/usr/lib -lxml2 -lfribidi -lm -lstdc++ -lfreetype -lz -lcairo -lpng12 -lruby1.8 -lpthread -lrt -ldl -lcrypt -lm -lc /usr/bin/ld: cannot find -lstdc++ collect2: ld returned 1 exit status The full build log is available from: http://people.debian.org/~lucas/logs/2012/08/14/mapserver_6.0.1-3.1_wheezy.log A list of current common problems and possible solutions is available at http://wiki.debian.org/qa.debian.org/FTBFS . You're welcome to contribute! About the archive rebuild: The rebuild was done on EC2 VM instances from Amazon Web Services, using a clean, minimal and up-to-date chroot. Every failed build was retried once to eliminate random failures. This is caused by ruby1.8 forcing the use of gcc-4.6 and linking against a C++ library. Adding a build-dep on libstdc++6-4.6-dev (or g++-4.6) fixes the problem. I was thinking of fixing this directly in the git repo, but apparently that is messed up and doesn't contain the commits leading to 6.0.3-1. A (trivial) patch is attached anyhow. -- Arto Jantunen diff --git a/debian/control b/debian/control index 73679f0..91ffced 100644 --- a/debian/control +++ b/debian/control @@ -10,7 +10,8 @@ Build-Depends: debhelper (= 9), libcurl4-gnutls-dev, libpng-dev, zlib1g-dev (= ruby1.8, ruby1.8-dev, ruby1.9.1, ruby1.9.1-dev, sharutils, libsdl1.2-dev, libfreetype6-dev, libx11-dev, libfcgi-dev, libxml2-dev, libogdi3.2-dev, libxslt1-dev, libpam0g-dev, libreadline-dev, - libfribidi-dev, libming-dev, libedit-dev, libepsilon-dev, libcairo2-dev + libfribidi-dev, libming-dev, libedit-dev, libepsilon-dev, libcairo2-dev, + libstdc++6-4.6-dev Build-Conflicts: libcurl3-openssl-dev Homepage: http://www.mapserver.org Vcs-Browser: http://git.debian.org/?p=pkg-grass/mapserver.git ___ 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
The following commit has been merged in the master branch: commit ece410d6e7cc309b8455f836f68a0e347c6f917e Author: Arto Jantunen vi...@debian.org Date: Sun Jun 3 12:02:18 2012 +0300 Update changelog for 1.2.10-7 diff --git a/debian/changelog b/debian/changelog index ed198eb..0912031 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,12 @@ +shapelib (1.2.10-7) unstable; urgency=low + + * Team Upload + * Remove patch 0001 (Disable proj_api.h include), this was never used + * Apply patch from Simon Ruderich to use all hardening flags +(Closes: #672465) + + -- Arto Jantunen vi...@debian.org Sun, 03 Jun 2012 12:01:04 +0300 + shapelib (1.2.10-6) unstable; urgency=low * Team Upload -- 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-6-2-g75a9b42
The following commit has been merged in the master branch: commit ed0f77b70dc551e2fa899a616de7269605447ed3 Author: Arto Jantunen vi...@debian.org Date: Fri May 18 10:21:09 2012 +0300 Remove patch 0001 (Disable proj_api.h include), this was never used Since we don't build the contrib tools this isn't actually used for anything. diff --git a/debian/patches/0002-Add-manpages.patch b/debian/patches/0001-Add-manpages.patch similarity index 100% rename from debian/patches/0002-Add-manpages.patch rename to debian/patches/0001-Add-manpages.patch diff --git a/debian/patches/0001-Disable-proj_api.h-include.patch b/debian/patches/0001-Disable-proj_api.h-include.patch deleted file mode 100644 index 02ef2bf..000 --- a/debian/patches/0001-Disable-proj_api.h-include.patch +++ /dev/null @@ -1,25 +0,0 @@ -From: Author unknown -Date: Unknown -Subject: [PATCH] Disable proj_api.h include - -This patch was included in the monolithic patch which existed before the -split, the author is most likely Noel Köthe n...@debian.org. - - contrib/shpgeo.h |2 +- - 1 files changed, 1 insertions(+), 1 deletions(-) - -diff --git a/contrib/shpgeo.h b/contrib/shpgeo.h -index 02276b1..4210d04 100644 a/contrib/shpgeo.h -+++ b/contrib/shpgeo.h -@@ -67,7 +67,7 @@ - extern C { - #endif - --#include proj_api.h -+## #include proj_api.h - - - #define SHPD_POINT 1 --- diff --git a/debian/patches/0003-Thread-safety-fixes.patch b/debian/patches/0002-Thread-safety-fixes.patch similarity index 100% rename from debian/patches/0003-Thread-safety-fixes.patch rename to debian/patches/0002-Thread-safety-fixes.patch diff --git a/debian/patches/0004-Properly-use-libtool.patch b/debian/patches/0003-Properly-use-libtool.patch similarity index 100% rename from debian/patches/0004-Properly-use-libtool.patch rename to debian/patches/0003-Properly-use-libtool.patch diff --git a/debian/patches/0005-Dynamically-link-the-shp-binaries-to-libshp.patch b/debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch similarity index 100% rename from debian/patches/0005-Dynamically-link-the-shp-binaries-to-libshp.patch rename to debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch diff --git a/debian/patches/0006-Stop-setting-CFLAGS-in-the-Makefile.patch b/debian/patches/0005-Stop-setting-CFLAGS-in-the-Makefile.patch similarity index 100% rename from debian/patches/0006-Stop-setting-CFLAGS-in-the-Makefile.patch rename to debian/patches/0005-Stop-setting-CFLAGS-in-the-Makefile.patch diff --git a/debian/patches/series b/debian/patches/series index f2754e9..08694c6 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,6 +1,5 @@ -0001-Disable-proj_api.h-include.patch -0002-Add-manpages.patch -0003-Thread-safety-fixes.patch -0004-Properly-use-libtool.patch -0005-Dynamically-link-the-shp-binaries-to-libshp.patch -0006-Stop-setting-CFLAGS-in-the-Makefile.patch +0001-Add-manpages.patch +0002-Thread-safety-fixes.patch +0003-Properly-use-libtool.patch +0004-Dynamically-link-the-shp-binaries-to-libshp.patch +0005-Stop-setting-CFLAGS-in-the-Makefile.patch -- 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-6-2-g75a9b42
The following commit has been merged in the master branch: commit 75a9b42cbb329cc5508388aad0cd232336f4e6e4 Author: Arto Jantunen vi...@debian.org Date: Fri May 18 10:27:16 2012 +0300 Apply patch from Simon Ruderich to use all hardening flags (Closes: #672465) LDFLAGS and CPPFLAGS were previously missed, include those as well. diff --git a/debian/patches/0003-Properly-use-libtool.patch b/debian/patches/0003-Properly-use-libtool.patch index feaf2f0..4616282 100644 --- a/debian/patches/0003-Properly-use-libtool.patch +++ b/debian/patches/0003-Properly-use-libtool.patch @@ -10,11 +10,11 @@ Bug-Debian: http://bugs.debian.org/497160 Makefile | 32 +--- 1 files changed, 5 insertions(+), 27 deletions(-) -diff --git a/Makefile b/Makefile -index 6d24091..f325e66 100644 a/Makefile -+++ b/Makefile -@@ -99,37 +99,15 @@ SHPLIB_VERSION=1.2.9 +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: @@ -44,10 +44,10 @@ index 6d24091..f325e66 100644 - ranlib .libs/libshp.a - rm -fr .libs/libshp.lax - (cd .libs rm -f libshp.la ln -s ../libshp.la libshp.la) -+ libtool --mode=compile gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. $(CFLAGS) -c shpopen.c -+ libtool --mode=compile gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. $(CFLAGS) -c shptree.c -+ libtool --mode=compile gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. $(CFLAGS) -c dbfopen.c -+ libtool --mode=link gcc -g -O2 -o libshp.la -rpath /usr/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo ++ libtool --mode=compile gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. $(CPPFLAGS) $(CFLAGS) -c shpopen.c ++ 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=link gcc $(CFLAGS) $(LDFLAGS) -o libshp.la -rpath /usr/lib -version-info 1:1:0 shpopen.lo shptree.lo dbfopen.lo lib_install: cp .libs/libshp.la .libs/libshp.lai @@ -57,4 +57,3 @@ index 6d24091..f325e66 100644 /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) --- diff --git a/debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch b/debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch index a22ce20..e2b9843 100644 --- a/debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch +++ b/debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch @@ -2,62 +2,64 @@ From: Arto Jantunen vi...@debian.org Date: Tue, 8 May 2012 14:19:20 +0300 Subject: [PATCH] Dynamically link the shp* binaries to libshp +Also use CPPFLAGS and LDFLAGS, necessary for hardening flags. + --- Makefile | 55 --- 1 files changed, 24 insertions(+), 31 deletions(-) -diff --git a/Makefile b/Makefile -index f325e66..3e53d15 100644 a/Makefile -+++ b/Makefile -@@ -6,45 +6,36 @@ default: all +Index: shapelib-1.2.10/Makefile +=== +--- shapelib-1.2.10.orig/Makefile 2012-05-11 11:23:05.0 +0200 shapelib-1.2.10/Makefile 2012-05-11 11:23:09.0 +0200 +@@ -6,45 +6,36 @@ all: shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump shptest -shpopen.o:shpopen.c shapefil.h - $(CC) $(CFLAGS) -c shpopen.c +shpcreate:shpcreate.c .libs/libshp.so -+ $(CC) $(CFLAGS) shpcreate.c $(LINKOPT) -o shpcreate .libs/libshp.so ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shpcreate.c $(LINKOPT) -o shpcreate .libs/libshp.so -shptree.o:shptree.c shapefil.h - $(CC) $(CFLAGS) -c shptree.c +shpadd: shpadd.c .libs/libshp.so -+ $(CC) $(CFLAGS) shpadd.c $(LINKOPT) -o shpadd .libs/libshp.so ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shpadd.c $(LINKOPT) -o shpadd .libs/libshp.so -dbfopen.o:dbfopen.c shapefil.h - $(CC) $(CFLAGS) -c dbfopen.c +shpdump: shpdump.c .libs/libshp.so -+ $(CC) $(CFLAGS) shpdump.c $(LINKOPT) -o shpdump .libs/libshp.so ++ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shpdump.c $(LINKOPT) -o shpdump .libs/libshp.so -shpcreate:shpcreate.c
Bug#673917: libgeographiclib-dev: should depend on libgeographiclib1 but doesn't
Sergey Gromov snake.sc...@gmail.com writes: Package: libgeographiclib-dev Version: 1.2-1 Severity: normal libgeographiclib-dev installs /usr/lib/libGeographic.so which is a symbolic link to libGeographic.so.1.1.0. The latter however is a part of the libgeographiclib1 package. This makes the -dev package unusable if it is installed alone. This bug has been fixed in the current development version of the package (1.8-2, to be exact), and the severity of the bug does not warrant an upload to correct the problem in the current stable release. For this reason I'm merging this bug to the original report of the same issue (see http://bugs.debian.org/624181 ), and closing it. -- Arto Jantunen ___ 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 annotated tag, debian/1.2.10-6, created. debian/1.2.10-6
The annotated tag, debian/1.2.10-6 has been created at ce31638a7d0dd43c74953a7ab5d26309ac0c4f56 (tag) tagging 1de38926a73243c4cc4917bfad8a3d3dccb2d8eb (commit) replaces upstream/1.2.10 tagged by Arto Jantunen on Wed May 9 18:20:40 2012 +0300 - Shortlog Debian release 1.2.10-6 -BEGIN PGP SIGNATURE- Version: GnuPG v1.4.12 (GNU/Linux) iEYEABECAAYFAk+qi0gACgkQQ9/iJIjcFnrfKACaA/YwbI1itYle85tI5xb5Ofz3 9uEAoK8wNSA2PPWerUbn1R9GxJkOFSqa =RehG -END PGP SIGNATURE- Arto Jantunen (12): Update to the dh tool (and debhelper compat 9) Stop distributing libtool .la file Enable multiarch (Closes: #670632) Update Standards-Version, no (further) changes Add section to the source package (thanks lintian) Modify short description to not start with an article (thanks lintian) Add Vcs-* fields to debian/control Convert to source-format 3.0 (quilt) Update libtool patch to fully use system libtool without any kludges (Closes: #316945) Add patch to dynamically link the shp* binaries to libshp Add patch to stop setting CFLAGS in the Makefile, allowing debhelper to set it instead Update changelog for 1.2.10-6 Francesco Paolo Lovergine (5): Applying Debian modifications to trunk Still needs some refinements. Some fixes due to previuous NMUs. Fixed debian version. commit 7cadb51efa14498a729113e907d3fb6674b746fc --- -- 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-6
The following commit has been merged in the master branch: commit 1de38926a73243c4cc4917bfad8a3d3dccb2d8eb Author: Arto Jantunen vi...@debian.org Date: Tue May 8 23:00:57 2012 +0300 Update changelog for 1.2.10-6 diff --git a/debian/changelog b/debian/changelog index 5dd9b42..ed198eb 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,22 @@ +shapelib (1.2.10-6) unstable; urgency=low + + * Team Upload + * Update to the dh tool (and debhelper compat 9) + * Stop distributing libtool .la file + * Enable multiarch (Closes: #670632) + * Update Standards-Version, no (further) changes + * Add section to the source package (thanks lintian) + * Modify short description to not start with an article (thanks lintian) + * Add Vcs-* fields to debian/control + * Convert to source-format 3.0 (quilt) + * Update libtool patch to fully use system libtool without any kludges +(Closes: #316945) + * Add patch to dynamically link the shp* binaries to libshp + * Add patch to stop setting CFLAGS in the Makefile, allowing debhelper +to set it instead + + -- Arto Jantunen vi...@debian.org Tue, 08 May 2012 22:59:51 +0300 + shapelib (1.2.10-5) unstable; urgency=low * Long due upload. -- 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. upstream/1.2.10-16-g9df21f8
The following commit has been merged in the master branch: commit 622e67fb99814350f3d1207ca3264cfcfb9718de Author: Arto Jantunen vi...@debian.org Date: Tue May 8 12:39:43 2012 +0300 Update libtool patch to fully use system libtool without any kludges (Closes: #316945) Also obey CFLAGS when building the library. diff --git a/debian/control b/debian/control index 3026acf..89ba9ba 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Section: libs Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org -Build-Depends: debhelper (= 9) +Build-Depends: debhelper (= 9), libtool Standards-Version: 3.9.3 Homepage: http://shapelib.maptools.org/ Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/shapelib.git diff --git a/debian/patches/0004-Properly-use-libtool.patch b/debian/patches/0004-Properly-use-libtool.patch index 79d10a3..feaf2f0 100644 --- a/debian/patches/0004-Properly-use-libtool.patch +++ b/debian/patches/0004-Properly-use-libtool.patch @@ -7,17 +7,31 @@ library and replaces it with something hacks in together almost right. Bug-Debian: http://bugs.debian.org/497160 --- - Makefile | 24 - 1 files changed, 12 insertions(+), 12 deletions(-) + Makefile | 32 +--- + 1 files changed, 5 insertions(+), 27 deletions(-) diff --git a/Makefile b/Makefile -index 6d24091..3dd053e 100644 +index 6d24091..f325e66 100644 --- a/Makefile +++ b/Makefile -@@ -113,18 +113,18 @@ lib: - 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 +@@ -99,37 +99,15 @@ 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 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 @@ -30,19 +44,17 @@ index 6d24091..3dd053e 100644 - ranlib .libs/libshp.a - rm -fr .libs/libshp.lax - (cd .libs rm -f libshp.la ln -s ../libshp.la libshp.la) -+ /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) ++ libtool --mode=compile gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. $(CFLAGS) -c shpopen.c
[SCM] shapelib branch, master, updated. upstream/1.2.10-16-g9df21f8
The following commit has been merged in the master branch: commit d7d142a1440b7439e6555c6d87123e094b5f96dd Author: Arto Jantunen vi...@debian.org Date: Tue May 8 14:31:08 2012 +0300 Add patch to dynamically link the shp* binaries to libshp diff --git a/debian/patches/0005-Dynamically-link-the-shp-binaries-to-libshp.patch b/debian/patches/0005-Dynamically-link-the-shp-binaries-to-libshp.patch new file mode 100644 index 000..a22ce20 --- /dev/null +++ b/debian/patches/0005-Dynamically-link-the-shp-binaries-to-libshp.patch @@ -0,0 +1,91 @@ +From: Arto Jantunen vi...@debian.org +Date: Tue, 8 May 2012 14:19:20 +0300 +Subject: [PATCH] Dynamically link the shp* binaries to libshp + +--- + Makefile | 55 --- + 1 files changed, 24 insertions(+), 31 deletions(-) + +diff --git a/Makefile b/Makefile +index f325e66..3e53d15 100644 +--- a/Makefile b/Makefile +@@ -6,45 +6,36 @@ default: all + + all: shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump shptest + +-shpopen.o:shpopen.c shapefil.h +- $(CC) $(CFLAGS) -c shpopen.c ++shpcreate:shpcreate.c .libs/libshp.so ++ $(CC) $(CFLAGS) shpcreate.c $(LINKOPT) -o shpcreate .libs/libshp.so + +-shptree.o:shptree.c shapefil.h +- $(CC) $(CFLAGS) -c shptree.c ++shpadd: shpadd.c .libs/libshp.so ++ $(CC) $(CFLAGS) shpadd.c $(LINKOPT) -o shpadd .libs/libshp.so + +-dbfopen.o:dbfopen.c shapefil.h +- $(CC) $(CFLAGS) -c dbfopen.c ++shpdump: shpdump.c .libs/libshp.so ++ $(CC) $(CFLAGS) shpdump.c $(LINKOPT) -o shpdump .libs/libshp.so + +-shpcreate:shpcreate.c shpopen.o +- $(CC) $(CFLAGS) shpcreate.c shpopen.o $(LINKOPT) -o shpcreate ++shprewind:shprewind.c .libs/libshp.so ++ $(CC) $(CFLAGS) shprewind.c $(LINKOPT) -o shprewind .libs/libshp.so + +-shpadd: shpadd.c shpopen.o +- $(CC) $(CFLAGS) shpadd.c shpopen.o $(LINKOPT) -o shpadd ++dbfcreate:dbfcreate.c .libs/libshp.so ++ $(CC) $(CFLAGS) dbfcreate.c $(LINKOPT) -o dbfcreate .libs/libshp.so + +-shpdump: shpdump.c shpopen.o +- $(CC) $(CFLAGS) shpdump.c shpopen.o $(LINKOPT) -o shpdump ++dbfadd: dbfadd.c .libs/libshp.so ++ $(CC) $(CFLAGS) dbfadd.c $(LINKOPT) -o dbfadd .libs/libshp.so + +-shprewind:shprewind.c shpopen.o +- $(CC) $(CFLAGS) shprewind.c shpopen.o $(LINKOPT) -o shprewind ++dbfdump: dbfdump.c .libs/libshp.so ++ $(CC) $(CFLAGS) dbfdump.c $(LINKOPT) -o dbfdump .libs/libshp.so + +-dbfcreate:dbfcreate.c dbfopen.o +- $(CC) $(CFLAGS) dbfcreate.c dbfopen.o $(LINKOPT) -o dbfcreate ++shptest: shptest.c .libs/libshp.so ++ $(CC) $(CFLAGS) shptest.c $(LINKOPT) -o shptest .libs/libshp.so + +-dbfadd: dbfadd.c dbfopen.o +- $(CC) $(CFLAGS) dbfadd.c dbfopen.o $(LINKOPT) -o dbfadd ++shputils: shputils.c .libs/libshp.so ++ $(CC) $(CFLAGS) shputils.c $(LINKOPT) -o shputils .libs/libshp.so + +-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 ++shptreedump: shptreedump.c .libs/libshp.so ++ $(CC) $(CFLAGS) shptreedump.c $(LINKOPT) \ ++ -o shptreedump .libs/libshp.so + + clean: + rm -f *.o dbfdump dbfcreate dbfadd shpdump shpcreate shpadd shputils +@@ -98,7 +89,9 @@ test3: + SHPLIB_VERSION=1.2.9 + LIBSHP_VERSION=1.0.1 # still once to be changed manually (see for 1:1:0), sorry + +-lib: ++lib: .libs/libshp.so ++ ++.libs/libshp.so: + libtool --mode=compile gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. $(CFLAGS) -c shpopen.c + libtool --mode=compile gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. $(CFLAGS) -c shptree.c + libtool --mode=compile gcc -DPACKAGE=\libshp\ -DVERSION=\$(SHPLIB_VERSION)\ -DSTDC_HEADERS=1 -I. $(CFLAGS) -c dbfopen.c +-- diff --git a/debian/patches/series b/debian/patches/series index dad392a..c9d3362 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -2,3 +2,4 @@ 0002-Add-manpages.patch 0003-Thread-safety-fixes.patch 0004-Properly-use-libtool.patch +0005-Dynamically-link-the-shp-binaries-to-libshp.patch diff --git a/debian/rules b/debian/rules index 9e58484..4dd8e75 100755 --- a/debian/rules +++ b/debian/rules @@ -9,7 +9,6 @@ override_dh_auto_test: override_dh_auto_build: mv shprewind shprewind.bak dh_auto_build - $(MAKE) lib override_dh_auto_clean: dh_auto_clean -- Library for reading and writing ArcView Shapefiles
[SCM] shapelib branch, master, updated. upstream/1.2.10-16-g9df21f8
The following commit has been merged in the master branch: commit 9df21f82c5f3a453ce70ddb88af8c08db548e51a Author: Arto Jantunen vi...@debian.org Date: Tue May 8 14:32:26 2012 +0300 Add patch to stop setting CFLAGS in the Makefile, allowing debhelper to set it instead This makes the package obey DEB_BUILD_OPTIONS, enables some hardening features, etc. diff --git a/debian/patches/0006-Stop-setting-CFLAGS-in-the-Makefile.patch b/debian/patches/0006-Stop-setting-CFLAGS-in-the-Makefile.patch new file mode 100644 index 000..81e167d --- /dev/null +++ b/debian/patches/0006-Stop-setting-CFLAGS-in-the-Makefile.patch @@ -0,0 +1,21 @@ +From: Arto Jantunen vi...@debian.org +Date: Tue, 8 May 2012 14:31:56 +0300 +Subject: [PATCH] Stop setting CFLAGS in the Makefile + +--- + Makefile |2 +- + 1 files changed, 1 insertions(+), 1 deletions(-) + +diff --git a/Makefile b/Makefile +index 3e53d15..6a614f1 100644 +--- a/Makefile b/Makefile +@@ -1,6 +1,6 @@ + + #LINKOPT = /usr/local/lib/libdbmalloc.a +-CFLAGS= -g ++#CFLAGS = -g + + default: all + +-- diff --git a/debian/patches/series b/debian/patches/series index c9d3362..f2754e9 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -3,3 +3,4 @@ 0003-Thread-safety-fixes.patch 0004-Properly-use-libtool.patch 0005-Dynamically-link-the-shp-binaries-to-libshp.patch +0006-Stop-setting-CFLAGS-in-the-Makefile.patch -- 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. upstream/1.2.10-12-gf376094
The following commit has been merged in the master branch: commit f3760941caa6a5d735524af8663d61c2319e1ee9 Author: Arto Jantunen vi...@debian.org Date: Fri May 4 18:30:00 2012 +0300 Add Vcs-* fields to debian/control diff --git a/debian/control b/debian/control index 56afef5..3026acf 100644 --- a/debian/control +++ b/debian/control @@ -6,6 +6,8 @@ Uploaders: Francesco Paolo Lovergine fran...@debian.org Build-Depends: debhelper (= 9) Standards-Version: 3.9.3 Homepage: http://shapelib.maptools.org/ +Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/shapelib.git +Vcs-Git: git://anonscm.debian.org/pkg-grass/shapelib.git Package: shapelib Section: graphics -- 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, upstream, created. eb21870f0d5b6ee4e48b2a7c72bee19c8e9d2eb7
The branch, upstream has been created at eb21870f0d5b6ee4e48b2a7c72bee19c8e9d2eb7 (commit) - Shortlog commit eb21870f0d5b6ee4e48b2a7c72bee19c8e9d2eb7 Author: Arto Jantunen vi...@debian.org Date: Thu May 3 18:22:41 2012 +0300 New upstream version 1.2.10 --- -- 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, pristine-tar, created. e10b4bce3b142de8cd4cbe1201c6793015466c53
The branch, pristine-tar has been created at e10b4bce3b142de8cd4cbe1201c6793015466c53 (commit) - Shortlog commit e10b4bce3b142de8cd4cbe1201c6793015466c53 Author: Arto Jantunen vi...@debian.org Date: Thu May 3 18:22:41 2012 +0300 pristine-tar data for shapelib_1.2.10.orig.tar.gz --- -- 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, created. 26b6cf14707424ab43ac5cdce1203f4030cec8e4
The branch, master has been created at 26b6cf14707424ab43ac5cdce1203f4030cec8e4 (commit) - Shortlog commit 26b6cf14707424ab43ac5cdce1203f4030cec8e4 Author: Francesco Paolo Lovergine fran...@debian.org Date: Sun Nov 29 09:53:14 2009 + commit 7cadb51efa14498a729113e907d3fb6674b746fc Author: Francesco Paolo Lovergine fran...@debian.org Date: Sun Nov 29 09:52:33 2009 + Fixed debian version. commit 5d010f9b3021056d207d6addf485e28c038fcfd5 Author: Francesco Paolo Lovergine fran...@debian.org Date: Sun Nov 29 08:00:35 2009 + Some fixes due to previuous NMUs. commit db7cfcce4a6fdeb6a0dfc19e4d22c9a1fee1e3ec Author: Francesco Paolo Lovergine fran...@debian.org Date: Sun Mar 22 09:52:30 2009 + Still needs some refinements. commit f178fa92f2eee4ec5cefe1f016ba5693aa782677 Author: Francesco Paolo Lovergine fran...@debian.org Date: Sun Mar 22 09:50:20 2009 + Applying Debian modifications to trunk --- -- 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 tag, debian/1.2.10-5, created. upstream/1.2.10-5-g26b6cf1
The tag, debian/1.2.10-5 has been created at 26b6cf14707424ab43ac5cdce1203f4030cec8e4 (commit) - Shortlog commit 26b6cf14707424ab43ac5cdce1203f4030cec8e4 Author: Francesco Paolo Lovergine fran...@debian.org Date: Sun Nov 29 09:53:14 2009 + --- -- 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 annotated tag, upstream/1.2.10, created. upstream/1.2.10
The annotated tag, upstream/1.2.10 has been created at aae2dacdc9fca9a3a3b8a12106ff97513fed01fd (tag) tagging eb21870f0d5b6ee4e48b2a7c72bee19c8e9d2eb7 (commit) tagged by Arto Jantunen on Thu May 3 18:22:41 2012 +0300 - Shortlog Upstream version 1.2.10 Arto Jantunen (1): New upstream version 1.2.10 --- -- 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. upstream/1.2.10-11-g89f5fae
The following commit has been merged in the master branch: commit 8556d7e9b0405c011a69d90cd55c7b016f0f7c51 Author: Arto Jantunen arto.jantu...@logica.com Date: Mon Apr 30 14:27:23 2012 +0300 Update to the dh tool (and debhelper compat 9) diff --git a/debian/compat b/debian/compat index 7f8f011..ec63514 100644 --- a/debian/compat +++ b/debian/compat @@ -1 +1 @@ -7 +9 diff --git a/debian/control b/debian/control index 691ec0e..88e080e 100644 --- a/debian/control +++ b/debian/control @@ -2,7 +2,7 @@ Source: shapelib Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org -Build-Depends: debhelper (= 7) +Build-Depends: debhelper (= 9) Standards-Version: 3.8.3 Homepage: http://shapelib.maptools.org/ diff --git a/debian/rules b/debian/rules index 874e879..303bca5 100755 --- a/debian/rules +++ b/debian/rules @@ -1,81 +1,29 @@ #!/usr/bin/make -f +%: + dh $@ -# Uncomment this to turn on verbose mode. -#export DH_VERBOSE=1 +override_dh_auto_test: -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g -endif -ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_PROGRAM += -s -endif - -configure: configure-stamp -configure-stamp: - dh_testdir - touch configure-stamp - -build: build-stamp -build-stamp: configure-stamp - dh_testdir - # Add here commands to compile the package. - $(MAKE) +override_dh_auto_build: + mv shprewind shprewind.bak + dh_auto_build $(MAKE) lib - touch build-stamp -clean: - dh_testdir - dh_testroot - # Add here commands to clean up after the build process. - $(MAKE) clean - rm -f shprewind - dh_clean +override_dh_auto_clean: + dh_auto_clean + mv shprewind.bak shprewind || true -install: build - dh_testdir - dh_testroot - dh_prep - dh_installdirs - # have to copy the files by hand.:( - mkdir debian/tmp/ - mkdir debian/tmp/usr/ - mkdir debian/tmp/usr/bin/ - cp dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shprewind shptest \ - debian/tmp/usr/bin/. - +override_dh_auto_install: +# have to copy the files by hand.:( + mkdir -p debian/tmp/usr/bin/ mkdir debian/tmp/usr/lib/ + mkdir debian/tmp/usr/include/ + cp dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shprewind \ + shptest debian/tmp/usr/bin/ cp .libs/libshp.a debian/tmp/usr/lib/ cp libshp.la debian/tmp/usr/lib/ cp .libs/libshp.so.1.0.1 debian/tmp/usr/lib/ ln -s libshp.so.1.0.1 libshp.so ln -s libshp.so.1.0.1 libshp.so.1 mv libshp.so* debian/tmp/usr/lib/ - - mkdir debian/tmp/usr/include/ cp shapefil.h debian/tmp/usr/include/ - -# Build architecture-independent files here. -binary-indep: build install -# We have nothing to do by default. - -# Build architecture-dependent files here. -binary-arch: build install - dh_testdir - dh_testroot - dh_install --sourcedir=debian/tmp - dh_installdocs *.html - dh_installman - dh_installchangelogs ChangeLog - dh_link - dh_strip - dh_compress - dh_fixperms - dh_makeshlibs - dh_installdeb - dh_shlibdeps - dh_gencontrol - dh_md5sums - dh_builddeb - -binary: binary-indep binary-arch -.PHONY: build clean binary-indep binary-arch binary install configure diff --git a/debian/shapelib.docs b/debian/shapelib.docs new file mode 100644 index 000..12e1ac6 --- /dev/null +++ b/debian/shapelib.docs @@ -0,0 +1,3 @@ +dbf_api.html +shapelib.html +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. upstream/1.2.10-11-g89f5fae
The following commit has been merged in the master branch: commit bfa5eb4719062e9e5db6df5661c47f2570155ab7 Author: Arto Jantunen arto.jantu...@logica.com Date: Mon Apr 30 15:02:09 2012 +0300 Stop distributing libtool .la file diff --git a/debian/libshp-dev.install b/debian/libshp-dev.install index 55f55ea..d1bffed 100644 --- a/debian/libshp-dev.install +++ b/debian/libshp-dev.install @@ -1,4 +1,3 @@ usr/include/* usr/lib/lib*.a -usr/lib/lib*.la usr/lib/lib*.so diff --git a/debian/rules b/debian/rules index 303bca5..89795ad 100755 --- a/debian/rules +++ b/debian/rules @@ -21,7 +21,6 @@ override_dh_auto_install: cp dbfadd dbfcreate dbfdump shpadd shpcreate shpdump shprewind \ shptest debian/tmp/usr/bin/ cp .libs/libshp.a debian/tmp/usr/lib/ - cp libshp.la debian/tmp/usr/lib/ cp .libs/libshp.so.1.0.1 debian/tmp/usr/lib/ ln -s libshp.so.1.0.1 libshp.so ln -s libshp.so.1.0.1 libshp.so.1 -- 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. upstream/1.2.10-11-g89f5fae
The following commit has been merged in the master branch: commit 4c7f64e924efacc7e87de4081195e326104d77ce Author: Arto Jantunen arto.jantu...@logica.com Date: Mon Apr 30 15:15:22 2012 +0300 Enable multiarch (Closes: #670632) diff --git a/debian/control b/debian/control index 88e080e..402ae03 100644 --- a/debian/control +++ b/debian/control @@ -10,6 +10,7 @@ Package: shapelib Section: graphics Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Multi-Arch: foreign Description: A library for reading and writing ArcView Shapefiles - tools The Shapefile format is a working and interchange format promoted by ESRI for simple vector data with attributes. It is apparently the only @@ -22,6 +23,7 @@ Package: libshp-dev Section: libdevel Architecture: any Depends: libshp1 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same Description: A library for reading and writing ArcView Shapefiles - development files The Shapefile format is a working and interchange format promoted by ESRI for simple vector data with attributes. It is apparently the only @@ -34,6 +36,8 @@ Package: libshp1 Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} +Pre-Depends: ${misc:Pre-Depends} +Multi-Arch: same Description: A library for reading and writing ArcView Shapefiles The Shapefile format is a working and interchange format promoted by ESRI for simple vector data with attributes. It is apparently the only diff --git a/debian/libshp-dev.install b/debian/libshp-dev.install index d1bffed..a3c8f6c 100644 --- a/debian/libshp-dev.install +++ b/debian/libshp-dev.install @@ -1,3 +1,3 @@ usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so +usr/lib/*/lib*.a +usr/lib/*/lib*.so diff --git a/debian/libshp1.install b/debian/libshp1.install index d0dbfd1..3ddde58 100644 --- a/debian/libshp1.install +++ b/debian/libshp1.install @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff --git a/debian/rules b/debian/rules index 89795ad..9e58484 100755 --- a/debian/rules +++ b/debian/rules @@ -1,4 +1,6 @@ #!/usr/bin/make -f +DEB_HOST_MULTIARCH ?= $(shell dpkg-architecture -qDEB_HOST_MULTIARCH) + %: dh $@ @@ -16,13 +18,13 @@ override_dh_auto_clean: override_dh_auto_install: # have to copy the files by hand.:( mkdir -p debian/tmp/usr/bin/ - mkdir debian/tmp/usr/lib/ + 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/ - cp .libs/libshp.a debian/tmp/usr/lib/ - cp .libs/libshp.so.1.0.1 debian/tmp/usr/lib/ + 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 - mv libshp.so* debian/tmp/usr/lib/ + mv libshp.so* debian/tmp/usr/lib/$(DEB_HOST_MULTIARCH)/ cp shapefil.h debian/tmp/usr/include/ -- 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. upstream/1.2.10-11-g89f5fae
The following commit has been merged in the master branch: commit e3e7256b78e59a7f10be59ee561d84bd583bc424 Author: Arto Jantunen arto.jantu...@logica.com Date: Mon Apr 30 15:57:24 2012 +0300 Update Standards-Version, no (further) changes diff --git a/debian/control b/debian/control index 402ae03..feaf25c 100644 --- a/debian/control +++ b/debian/control @@ -3,7 +3,7 @@ Priority: optional Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org Build-Depends: debhelper (= 9) -Standards-Version: 3.8.3 +Standards-Version: 3.9.3 Homepage: http://shapelib.maptools.org/ Package: shapelib -- 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. upstream/1.2.10-11-g89f5fae
The following commit has been merged in the master branch: commit 40c607bca556b1c54b7da252ff852b1deb51 Author: Arto Jantunen arto.jantu...@logica.com Date: Mon Apr 30 14:33:42 2012 +0300 Add section to the source package (thanks lintian) diff --git a/debian/control b/debian/control index feaf25c..7a6cd01 100644 --- a/debian/control +++ b/debian/control @@ -1,5 +1,6 @@ Source: shapelib Priority: optional +Section: libs Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org Uploaders: Francesco Paolo Lovergine fran...@debian.org Build-Depends: debhelper (= 9) @@ -33,7 +34,6 @@ Description: A library for reading and writing ArcView Shapefiles - development This package includes the development files. Package: libshp1 -Section: libs Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} -- 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. upstream/1.2.10-11-g89f5fae
The following commit has been merged in the master branch: commit 89f5fae9a182f39fdb384beaf82b2543d4412fab Author: Arto Jantunen arto.jantu...@logica.com Date: Mon Apr 30 15:22:23 2012 +0300 Modify short description to not start with an article (thanks lintian) diff --git a/debian/control b/debian/control index 7a6cd01..56afef5 100644 --- a/debian/control +++ b/debian/control @@ -12,7 +12,7 @@ Section: graphics Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Multi-Arch: foreign -Description: A library for reading and writing ArcView Shapefiles - tools +Description: Library for reading and writing ArcView Shapefiles - tools 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 @@ -25,7 +25,7 @@ Section: libdevel Architecture: any Depends: libshp1 (= ${binary:Version}), ${misc:Depends} Multi-Arch: same -Description: A library for reading and writing ArcView Shapefiles - development files +Description: Library for reading and writing ArcView Shapefiles - development files 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 @@ -38,7 +38,7 @@ Architecture: any Depends: ${shlibs:Depends}, ${misc:Depends} Pre-Depends: ${misc:Pre-Depends} Multi-Arch: same -Description: A library for reading and writing ArcView Shapefiles +Description: Library for reading and writing ArcView Shapefiles 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 -- 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
Bug#670632: Please transition libshp1 to multiarch
Package: libshp1 Severity: normal Version: 1.2.10-5 User: multiarch-de...@lists.alioth.debian.org Usertags: multiarch Please transition to use the multiarch library paths as described at http://wiki.debian.org/Multiarch/Implementation. -- Arto Jantunen ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] Bug#598346: Missing dependencies in libgdal1-dev in experimental
Package: libgdal1-dev Version: 1.7.2-2 Tags: experimental patch In experimental libgdal1-dev needs to depend on libdap-dev and libspatialite-dev, otherwise packages that link to gdal fail to build. diff --git a/debian/control b/debian/control index 6eacb71..75232bf 100644 --- a/debian/control +++ b/debian/control @@ -45,8 +45,9 @@ Section: libdevel Architecture: any Depends: libgdal1-1.7.0 (=${binary:Version}), libc6-dev, libnetcdf-dev, libjasper-dev|libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, libgif-dev, libhdf4-alt-dev, - libpq-dev, libxerces-c2-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev, - libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev, libcurl4-dev|libcurl3-dev + libpq-dev, libxerces-c2-dev, unixodbc-dev, libsqlite3-dev, libgeos-dev, libdap-dev, + libmysqlclient-dev, libhdf5-serial-dev, libltdl3-dev, libcurl4-dev|libcurl3-dev, + libspatialite-dev ( 2.4.0~rc2-3) Suggests: libgdal-doc Provides: libgdal-dev Description: Geospatial Data Abstraction Library - Development files -- Arto Jantunen ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] Bug#582273: geos: Please add debug symbols
Source: geos Severity: wishlist Tags: patch Version: 3.2.0-1 I ended up needing to debug an infinite loop issue in either geos or postgis on lenny, and noticed that neither provide debugging symbols. I ended up rebuilding both (and Postgresql itself for good measure) to create -dbg packages, and thought I might as well create proper patches and file bugs.. So here is the patch for geos. -- Arto Jantunen Index: control.in === --- control.in (revision 2881) +++ control.in (working copy) @@ -88,3 +88,15 @@ . This package contains the Ruby bindings for GEOS. +Package: libgeos-dbg +Architecture: any +Section: debug +Priority: extra +Depends: libge...@version@ (= ${binary:Version}), libgeos-c1 (= ${binary:Version}) +Description: debugging symbols for geos + GEOS provides a spatial object model and fundamental geometric + functions. It implements the geometry model defined in the + OpenGIS Consortium Simple Features Specification for SQL. + . + This package contains the debugging symbols for geos. + Index: rules === --- rules (revision 2881) +++ rules (working copy) @@ -133,7 +133,7 @@ dh_installexamples dh_installman dh_link - dh_strip + dh_strip --dbg-package=libgeos-dbg dh_compress dh_fixperms dh_makeshlibs -V ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel
[DebianGIS-dev] Upgrading from Postgis 1.1 to 1.3 on Etch
I tried doing this simply by backporting the Lenny packages to Etch (with the needed modifications to build postgresql 8.1 compatible binaries and such). This fails because the new package removes /usr/lib/postgresql/8.1/lib/liblwgeom.so.1.1, which makes the existing database fail entirely. Is there a known process which allows this to work? If not, I see two options: 1. Create new package that can be installed together with the old postgresql-8.1-postgis (say postgresql-8.1-postgis13) 2. Create a symlink from liblwgeom.so.1.1 to liblwgeom.so.1.3 The gotcha for option 1 is the existing symlinks (liblwgeom.so and liblwgeom.so.1). If something on the system uses these, there may be unexpected trouble. With option 2 the problem is simpler. Is it even supposed to work? Any help would be appreciated, no need to cc me on replies, I am on the list. -- Arto Jantunen ___ Pkg-grass-devel mailing list Pkg-grass-devel@lists.alioth.debian.org http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel