This is an automated email from the git hooks/post-receive script. sebastic pushed a commit to branch master in repository shapelib.
commit 3743b1ab9ff11c72a5a791e7e2f6d9ca82eef356 Author: Bas Couwenberg <[email protected]> Date: Tue Dec 6 21:24:53 2016 +0100 Drop obsolete build system patches. --- debian/changelog | 1 + debian/patches/0003-Properly-use-libtool.patch | 79 ---------------------- ...namically-link-the-shp-binaries-to-libshp.patch | 69 ------------------- ...setting-CFLAGS-and-PREFIX-in-the-Makefile.patch | 27 -------- ...ix-FTBFS-avoid-clash-with-_ENDIAN-defines.patch | 39 ----------- ...ildflags-in-contrib-fixes-hardening-warni.patch | 24 ------- debian/patches/series | 5 -- 7 files changed, 1 insertion(+), 243 deletions(-) diff --git a/debian/changelog b/debian/changelog index f40ce79..11c26c1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -14,6 +14,7 @@ shapelib (1.4.0~rc1-1) UNRELEASED; urgency=medium * Override dh_install to use --list-missing. * Include pkgconfig script in -dev package. * Explicitly remove .la files. + * Drop obsolete build system patches. -- Bas Couwenberg <[email protected]> Tue, 06 Dec 2016 19:46:29 +0100 diff --git a/debian/patches/0003-Properly-use-libtool.patch b/debian/patches/0003-Properly-use-libtool.patch deleted file mode 100644 index f8e90af..0000000 --- a/debian/patches/0003-Properly-use-libtool.patch +++ /dev/null @@ -1,79 +0,0 @@ -From: Riku Voipio <[email protected]> -Date: Tue, 4 Nov 2008 14:46:56 +0200 -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 | 42 ++++++++++++++++++++++++++++++++---------- - 1 file changed, 32 insertions(+), 10 deletions(-) - ---- 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 shp - - 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 -- - 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.3.0 -+LIBSHP_VERSION=2.0.0 # still once to be changed manually (see for 1:1:0), sorry -+ -+lib: .libs/libshp.so -+ -+.libs/libshp.so: -+ 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=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 2:0:0 shpopen.lo shptree.lo dbfopen.lo safileio.lo -+ -+lib_install: -+ cp .libs/libshp.la .libs/libshp.lai -+ /bin/sh ./mkinstalldirs /usr/local/lib -+ 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 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 deleted file mode 100644 index 6bbba4c..0000000 --- a/debian/patches/0004-Dynamically-link-the-shp-binaries-to-libshp.patch +++ /dev/null @@ -1,69 +0,0 @@ -From: Arto Jantunen <[email protected]> -Date: Tue, 8 May 2012 14:19:20 +0300 -Subject: Dynamically link the shp* binaries to libshp - -Also use CPPFLAGS and LDFLAGS, necessary for hardening flags. ---- - Makefile | 42 +++++++++++++++++++++--------------------- - 1 file changed, 21 insertions(+), 21 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -24,36 +24,36 @@ dbfopen.o: dbfopen.c shapefil.h - safileio.o: shapefil.h - $(CC) $(CFLAGS) -c safileio.c - --shpcreate: shpcreate.c shpopen.o safileio.o -- $(CC) $(CFLAGS) shpcreate.c shpopen.o safileio.o $(LINKOPT) -o shpcreate -+shpcreate: shpcreate.c .libs/libshp.so -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shpcreate.c $(LINKOPT) -o shpcreate .libs/libshp.so - --shpadd: shpadd.c shpopen.o safileio.o -- $(CC) $(CFLAGS) shpadd.c shpopen.o safileio.o $(LINKOPT) -o shpadd -+shpadd: shpadd.c .libs/libshp.so -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shpadd.c $(LINKOPT) -o shpadd .libs/libshp.so - --shpdump: shpdump.c shpopen.o safileio.o -- $(CC) $(CFLAGS) shpdump.c shpopen.o safileio.o $(LINKOPT) -o shpdump -+shpdump: shpdump.c .libs/libshp.so -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shpdump.c $(LINKOPT) -o shpdump .libs/libshp.so - --shprewind: shprewind.c shpopen.o safileio.o -- $(CC) $(CFLAGS) shprewind.c shpopen.o safileio.o $(LINKOPT) -o shprewind -+shprewind: shprewind.c .libs/libshp.so -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shprewind.c $(LINKOPT) -o shprewind .libs/libshp.so - --dbfcreate: dbfcreate.c dbfopen.o safileio.o -- $(CC) $(CFLAGS) dbfcreate.c dbfopen.o safileio.o $(LINKOPT) -o dbfcreate -+dbfcreate: dbfcreate.c .libs/libshp.so -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) dbfcreate.c $(LINKOPT) -o dbfcreate .libs/libshp.so - --dbfadd: dbfadd.c dbfopen.o safileio.o -- $(CC) $(CFLAGS) dbfadd.c dbfopen.o safileio.o $(LINKOPT) -o dbfadd -+dbfadd: dbfadd.c .libs/libshp.so -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) dbfadd.c $(LINKOPT) -o dbfadd .libs/libshp.so - --dbfdump: dbfdump.c dbfopen.o safileio.o -- $(CC) $(CFLAGS) dbfdump.c dbfopen.o safileio.o $(LINKOPT) -o dbfdump -+dbfdump: dbfdump.c .libs/libshp.so -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) dbfdump.c $(LINKOPT) -o dbfdump .libs/libshp.so - --shptest: shptest.c shpopen.o safileio.o -- $(CC) $(CFLAGS) shptest.c shpopen.o safileio.o $(LINKOPT) -o shptest -+shptest: shptest.c .libs/libshp.so -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shptest.c $(LINKOPT) -o shptest .libs/libshp.so - --shputils: shputils.c shpopen.o safileio.o dbfopen.o -- $(CC) $(CFLAGS) shputils.c shpopen.o safileio.o dbfopen.o $(LINKOPT) -o shputils -+shputils: shputils.c .libs/libshp.so -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shputils.c $(LINKOPT) -o shputils .libs/libshp.so - --shptreedump: shptreedump.c shptree.o shpopen.o safileio.o -- $(CC) $(CFLAGS) shptreedump.c shptree.o shpopen.o safileio.o $(LINKOPT) \ -- -o shptreedump -+shptreedump: shptreedump.c .libs/libshp.so -+ $(CC) $(CPPFLAGS) $(CFLAGS) $(LDFLAGS) shptreedump.c $(LINKOPT) \ -+ -o shptreedump .libs/libshp.so - - clean: - rm -f *.o shptest $(SHPBIN) libshp.a diff --git a/debian/patches/0005-Stop-setting-CFLAGS-and-PREFIX-in-the-Makefile.patch b/debian/patches/0005-Stop-setting-CFLAGS-and-PREFIX-in-the-Makefile.patch deleted file mode 100644 index 8d34ce7..0000000 --- a/debian/patches/0005-Stop-setting-CFLAGS-and-PREFIX-in-the-Makefile.patch +++ /dev/null @@ -1,27 +0,0 @@ -From: Arto Jantunen <[email protected]> -Date: Tue, 8 May 2012 14:31:56 +0300 -Subject: Stop setting CFLAGS and PREFIX in the Makefile - ---- - Makefile | 6 ++++-- - 1 file changed, 4 insertions(+), 2 deletions(-) - ---- a/Makefile -+++ b/Makefile -@@ -1,12 +1,14 @@ - --PREFIX = /usr/local --CFLAGS = -g -Wall -fPIC -+#PREFIX = /usr/local -+#CFLAGS = -g -Wall -fPIC - #CFLAGS = -g -DUSE_CPL - #CC = g++ - - LIBOBJ = shpopen.o dbfopen.o safileio.o shptree.o - SHPBIN = shpcreate shpadd shpdump shprewind dbfcreate dbfadd dbfdump \ - shptreedump -+#LINKOPT = /usr/local/lib/libdbmalloc.a -+#CFLAGS = -g - - default: all - diff --git a/debian/patches/0006-Fix-FTBFS-avoid-clash-with-_ENDIAN-defines.patch b/debian/patches/0006-Fix-FTBFS-avoid-clash-with-_ENDIAN-defines.patch deleted file mode 100644 index ebaffbb..0000000 --- a/debian/patches/0006-Fix-FTBFS-avoid-clash-with-_ENDIAN-defines.patch +++ /dev/null @@ -1,39 +0,0 @@ -Description: Avoid clashing with _*_ENDIAN. -Author: Cyril Brulebois <[email protected]> - -Defining _{LITTLE,BIG}_ENDIAN is a bad idea since it can clash with -architecture-specific #define's. So prefix those with LIBSHAPE to -avoid name clashing. ---- -Origin: Debian -Bug-Debian: http://bugs.debian.org/742148 -Last-Update: 2014-03-26 - ---- a/contrib/Makefile -+++ b/contrib/Makefile -@@ -2,8 +2,8 @@ - #LINKOPT = /usr/local/lib/libdbmalloc.a - #CFLAGS = -g - --# Endian: define either _LITTLE_ENDIAN or _BIG_ENDIAN --ENDIAN = -D_LITTLE_ENDIAN -+# Endian: define either LIBSHAPE_LITTLE_ENDIAN or LIBSHAPE_BIG_ENDIAN -+ENDIAN = -DLIBSHAPE_LITTLE_ENDIAN - - CFLAGS = -g -I.. -I$(HOME)/bld/include -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 - ---- a/contrib/my_nan.h -+++ b/contrib/my_nan.h -@@ -26,10 +26,10 @@ - - /* IEEE Not A Number. */ - --#ifdef _BIG_ENDIAN -+#ifdef LIBSHAPE_BIG_ENDIAN - # define __nan_bytes { 0x7f, 0xf8, 0, 0, 0, 0, 0, 0 } - #endif --#ifdef _LITTLE_ENDIAN -+#ifdef LIBSHAPE_LITTLE_ENDIAN - # define __nan_bytes { 0, 0, 0, 0, 0, 0, 0xf8, 0x7f } - #endif - diff --git a/debian/patches/0007-Use-dpkg-buildflags-in-contrib-fixes-hardening-warni.patch b/debian/patches/0007-Use-dpkg-buildflags-in-contrib-fixes-hardening-warni.patch deleted file mode 100644 index 1041f7c..0000000 --- a/debian/patches/0007-Use-dpkg-buildflags-in-contrib-fixes-hardening-warni.patch +++ /dev/null @@ -1,24 +0,0 @@ -From: Johan Van de Wauw <[email protected]> -Date: Wed, 8 Oct 2014 22:21:49 +0200 -Subject: Use dpkg-buildflags in contrib (fixes hardening warnings) - ---- - contrib/Makefile | 3 ++- - 1 file changed, 2 insertions(+), 1 deletion(-) - ---- a/contrib/Makefile -+++ b/contrib/Makefile -@@ -1,11 +1,12 @@ - - #LINKOPT = /usr/local/lib/libdbmalloc.a -+LINKOPT = $(LDFLAGS) - #CFLAGS = -g - - # Endian: define either LIBSHAPE_LITTLE_ENDIAN or LIBSHAPE_BIG_ENDIAN - ENDIAN = -DLIBSHAPE_LITTLE_ENDIAN - --CFLAGS = -g -I.. -I$(HOME)/bld/include -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 -+override CFLAGS += -g -I.. -I$(HOME)/bld/include -DPROJ4 $(ENDIAN) -DDEBUG -DDEBUG2 - - SHPOBJ = ../shpopen.o ../dbfopen.o ../safileio.o - diff --git a/debian/patches/series b/debian/patches/series index 68f64bb..610ecee 100644 --- a/debian/patches/series +++ b/debian/patches/series @@ -1,8 +1,3 @@ -#0003-Properly-use-libtool.patch -#0004-Dynamically-link-the-shp-binaries-to-libshp.patch -#0005-Stop-setting-CFLAGS-and-PREFIX-in-the-Makefile.patch -#0006-Fix-FTBFS-avoid-clash-with-_ENDIAN-defines.patch -#0007-Use-dpkg-buildflags-in-contrib-fixes-hardening-warni.patch soversion.patch spelling-errors.patch privacy-breach-generic.patch -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/shapelib.git _______________________________________________ Pkg-grass-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-grass-devel
