[DebianGIS-dev] r2168 - in packages/gdal/trunk/debian: . patches
frankie at alioth.debian.org
frankie at alioth.debian.org
Fri Apr 17 10:05:24 UTC 2009
Author: frankie
Date: 2009-04-17 10:05:24 +0000 (Fri, 17 Apr 2009)
New Revision: 2168
Added:
packages/gdal/trunk/debian/patches/hdf4.dpatch
Removed:
packages/gdal/trunk/debian/patches/hdf5.dpatch
Modified:
packages/gdal/trunk/debian/changelog
packages/gdal/trunk/debian/patches/00list
Log:
Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog 2009-04-16 21:12:35 UTC (rev 2167)
+++ packages/gdal/trunk/debian/changelog 2009-04-17 10:05:24 UTC (rev 2168)
@@ -1,3 +1,13 @@
+gdal (1.6.0-4) experimental; urgency=low
+
+ * NOT RELEASED.
+ * Patch hdf5.dpatch renamed into hdf4.dpatch, sorry.
+ * The mysql5.1.dpatch is a dirty trick to avoid FTBS due to MySQL 5.1 client
+ lib headers which collide with g++ headers. This should be fixed at MySQL
+ level, but at least it allows building.
+
+ -- Francesco Paolo Lovergine <frankie at debian.org> Fri, 17 Apr 2009 12:02:35 +0200
+
gdal (1.6.0-3) experimental; urgency=low
* Fixed rubymakefile.dpatch to also work with libtool 2.2.
Modified: packages/gdal/trunk/debian/patches/00list
===================================================================
--- packages/gdal/trunk/debian/patches/00list 2009-04-16 21:12:35 UTC (rev 2167)
+++ packages/gdal/trunk/debian/patches/00list 2009-04-17 10:05:24 UTC (rev 2168)
@@ -6,6 +6,6 @@
gdalpaths
python
doxygen
-hdf5
+hdf4
mysql5.1
swig1338
Copied: packages/gdal/trunk/debian/patches/hdf4.dpatch (from rev 2157, packages/gdal/trunk/debian/patches/hdf5.dpatch)
===================================================================
--- packages/gdal/trunk/debian/patches/hdf4.dpatch (rev 0)
+++ packages/gdal/trunk/debian/patches/hdf4.dpatch 2009-04-17 10:05:24 UTC (rev 2168)
@@ -0,0 +1,88 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## hdf5.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: No description.
+
+ at DPATCH@
+diff -urNad gdal-1.6.0~/configure gdal-1.6.0/configure
+--- gdal-1.6.0~/configure 2009-04-06 22:37:03.000000000 +0200
++++ gdal-1.6.0/configure 2009-04-06 22:47:36.000000000 +0200
+@@ -22244,13 +22244,13 @@
+ LIBS="-L$HDF_LIB_DIR $LIBS"
+ fi
+
+- { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdf" >&5
+-echo $ECHO_N "checking for SDreaddata in -lmfhdf... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdfalt" >&5
++echo $ECHO_N "checking for SDreaddata in -lmfhdfalt.. $ECHO_C" >&6; }
+ if test "${ac_cv_lib_mfhdf_SDreaddata+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmfhdf -ldf $LIBS"
++LIBS="-lmfhdfalt -ldfalt $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22306,7 +22306,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
+ echo "${ECHO_T}$ac_cv_lib_mfhdf_SDreaddata" >&6; }
+ if test $ac_cv_lib_mfhdf_SDreaddata = yes; then
+- HDF_LIB_NAME="-lmfhdf -ldf"
++ HDF_LIB_NAME="-lmfhdfalt -ldfalt"
+ else
+ HDF_LIB_NAME=missing
+ fi
+@@ -22384,13 +22384,13 @@
+
+ if test "$HDF_LIB_NAME" = "missing" ; then
+ unset ac_cv_lib_mfhdf_SDreaddata
+- { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdf" >&5
+-echo $ECHO_N "checking for SDreaddata in -lmfhdf... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdfalt" >&5
++echo $ECHO_N "checking for SDreaddata in -lmfhdfalt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_mfhdf_SDreaddata+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmfhdf -ldf -ljpeg -lz $LIBS"
++LIBS="-lmfhdfalt -ldfalt -ljpeg -lz $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22446,7 +22446,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
+ echo "${ECHO_T}$ac_cv_lib_mfhdf_SDreaddata" >&6; }
+ if test $ac_cv_lib_mfhdf_SDreaddata = yes; then
+- HDF_LIB_NAME="-lmfhdf -ldf"
++ HDF_LIB_NAME="-lmfhdfalt -ldfalt"
+ else
+ HDF_LIB_NAME=missing
+ fi
+@@ -22455,13 +22455,13 @@
+
+ if test "$HDF_LIB_NAME" = "missing" ; then
+ unset ac_cv_lib_mfhdf_SDreaddata
+- { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdf" >&5
+-echo $ECHO_N "checking for SDreaddata in -lmfhdf... $ECHO_C" >&6; }
++ { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdfalt" >&5
++echo $ECHO_N "checking for SDreaddata in -lmfhdfalt... $ECHO_C" >&6; }
+ if test "${ac_cv_lib_mfhdf_SDreaddata+set}" = set; then
+ echo $ECHO_N "(cached) $ECHO_C" >&6
+ else
+ ac_check_lib_save_LIBS=$LIBS
+-LIBS="-lmfhdf -ldf -lsz -ljpeg -lz $LIBS"
++LIBS="-lmfhdfalt -ldfalt -lsz -ljpeg -lz $LIBS"
+ cat >conftest.$ac_ext <<_ACEOF
+ /* confdefs.h. */
+ _ACEOF
+@@ -22517,7 +22517,7 @@
+ { echo "$as_me:$LINENO: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
+ echo "${ECHO_T}$ac_cv_lib_mfhdf_SDreaddata" >&6; }
+ if test $ac_cv_lib_mfhdf_SDreaddata = yes; then
+- HDF_LIB_NAME="-lmfhdf -ldf -lsz"
++ HDF_LIB_NAME="-lmfhdfalt -ldfalt -lsz"
+ else
+ HDF_LIB_NAME=missing
+ fi
Deleted: packages/gdal/trunk/debian/patches/hdf5.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/hdf5.dpatch 2009-04-16 21:12:35 UTC (rev 2167)
+++ packages/gdal/trunk/debian/patches/hdf5.dpatch 2009-04-17 10:05:24 UTC (rev 2168)
@@ -1,88 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## hdf5.dpatch by Francesco Paolo Lovergine <frankie at debian.org>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
- at DPATCH@
-diff -urNad gdal-1.6.0~/configure gdal-1.6.0/configure
---- gdal-1.6.0~/configure 2009-04-06 22:37:03.000000000 +0200
-+++ gdal-1.6.0/configure 2009-04-06 22:47:36.000000000 +0200
-@@ -22244,13 +22244,13 @@
- LIBS="-L$HDF_LIB_DIR $LIBS"
- fi
-
-- { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdf" >&5
--echo $ECHO_N "checking for SDreaddata in -lmfhdf... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdfalt" >&5
-+echo $ECHO_N "checking for SDreaddata in -lmfhdfalt.. $ECHO_C" >&6; }
- if test "${ac_cv_lib_mfhdf_SDreaddata+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmfhdf -ldf $LIBS"
-+LIBS="-lmfhdfalt -ldfalt $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22306,7 +22306,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
- echo "${ECHO_T}$ac_cv_lib_mfhdf_SDreaddata" >&6; }
- if test $ac_cv_lib_mfhdf_SDreaddata = yes; then
-- HDF_LIB_NAME="-lmfhdf -ldf"
-+ HDF_LIB_NAME="-lmfhdfalt -ldfalt"
- else
- HDF_LIB_NAME=missing
- fi
-@@ -22384,13 +22384,13 @@
-
- if test "$HDF_LIB_NAME" = "missing" ; then
- unset ac_cv_lib_mfhdf_SDreaddata
-- { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdf" >&5
--echo $ECHO_N "checking for SDreaddata in -lmfhdf... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdfalt" >&5
-+echo $ECHO_N "checking for SDreaddata in -lmfhdfalt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_mfhdf_SDreaddata+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmfhdf -ldf -ljpeg -lz $LIBS"
-+LIBS="-lmfhdfalt -ldfalt -ljpeg -lz $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22446,7 +22446,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
- echo "${ECHO_T}$ac_cv_lib_mfhdf_SDreaddata" >&6; }
- if test $ac_cv_lib_mfhdf_SDreaddata = yes; then
-- HDF_LIB_NAME="-lmfhdf -ldf"
-+ HDF_LIB_NAME="-lmfhdfalt -ldfalt"
- else
- HDF_LIB_NAME=missing
- fi
-@@ -22455,13 +22455,13 @@
-
- if test "$HDF_LIB_NAME" = "missing" ; then
- unset ac_cv_lib_mfhdf_SDreaddata
-- { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdf" >&5
--echo $ECHO_N "checking for SDreaddata in -lmfhdf... $ECHO_C" >&6; }
-+ { echo "$as_me:$LINENO: checking for SDreaddata in -lmfhdfalt" >&5
-+echo $ECHO_N "checking for SDreaddata in -lmfhdfalt... $ECHO_C" >&6; }
- if test "${ac_cv_lib_mfhdf_SDreaddata+set}" = set; then
- echo $ECHO_N "(cached) $ECHO_C" >&6
- else
- ac_check_lib_save_LIBS=$LIBS
--LIBS="-lmfhdf -ldf -lsz -ljpeg -lz $LIBS"
-+LIBS="-lmfhdfalt -ldfalt -lsz -ljpeg -lz $LIBS"
- cat >conftest.$ac_ext <<_ACEOF
- /* confdefs.h. */
- _ACEOF
-@@ -22517,7 +22517,7 @@
- { echo "$as_me:$LINENO: result: $ac_cv_lib_mfhdf_SDreaddata" >&5
- echo "${ECHO_T}$ac_cv_lib_mfhdf_SDreaddata" >&6; }
- if test $ac_cv_lib_mfhdf_SDreaddata = yes; then
-- HDF_LIB_NAME="-lmfhdf -ldf -lsz"
-+ HDF_LIB_NAME="-lmfhdfalt -ldfalt -lsz"
- else
- HDF_LIB_NAME=missing
- fi
More information about the Pkg-grass-devel
mailing list