[SCM] shapelib branch, master, updated. debian/1.2.10-6-2-g75a9b42

2012-05-24 Thread Arto Jantunen 
The following commit has been merged in the master branch:
commit 75a9b42cbb329cc5508388aad0cd232336f4e6e4
Author: Arto Jantunen 
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 
 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:shpcreat

[SCM] shapelib branch, master, updated. debian/1.2.10-6-2-g75a9b42

2012-05-24 Thread Arto Jantunen 
The following commit has been merged in the master branch:
commit ed0f77b70dc551e2fa899a616de7269605447ed3
Author: Arto Jantunen 
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 .
-

- 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

2012-05-09 Thread Arto Jantunen 
The following commit has been merged in the master branch:
commit 1de38926a73243c4cc4917bfad8a3d3dccb2d8eb
Author: Arto Jantunen 
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   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