Author: frankie
Date: 2007-02-28 17:52:47 +0100 (Wed, 28 Feb 2007)
New Revision: 623

Removed:
   packages/gdal/trunk/debian/patches/351372_mipsel_ftbfs.dpatch
   packages/gdal/trunk/debian/patches/357189_gcc4.1_ftbfs.dpatch
   packages/gdal/trunk/debian/patches/360389_amd64_ftbfs.dpatch
   packages/gdal/trunk/debian/patches/ogrili2layer.cpp.dpatch
Modified:
   packages/gdal/trunk/debian/changelog
   packages/gdal/trunk/debian/control
   packages/gdal/trunk/debian/patches/00list
   packages/gdal/trunk/debian/patches/libname.dpatch
   packages/gdal/trunk/debian/rules
Log:
Starting 1.4.0 packaging


Modified: packages/gdal/trunk/debian/changelog
===================================================================
--- packages/gdal/trunk/debian/changelog        2007-02-28 14:36:08 UTC (rev 
622)
+++ packages/gdal/trunk/debian/changelog        2007-02-28 16:52:47 UTC (rev 
623)
@@ -1,3 +1,16 @@
+gdal (1.4.0-1) UNRELEASED; urgency=low
+
+  * New upstream version. Moved to libgdal1-dev package, which allows rebuilds
+    of dependent packages without source changes. It is currently superfluous
+    changing the -dev package at every new release because we do not support
+    many different versions of the gdal lib.
+  * libname patch updated.
+  * Removed obsolete patches.
+  * debian/rules: removed previous hack for gdal-config. Now DESTDIR is 
managed correctly 
+    in building scripts. 
+
+ -- Francesco Paolo Lovergine <[EMAIL PROTECTED]>  Wed, 28 Feb 2007 15:38:36 
+0100
+
 gdal (1.3.2-5) UNRELEASED; urgency=low
 
   * debian/watch: fixed.

Modified: packages/gdal/trunk/debian/control
===================================================================
--- packages/gdal/trunk/debian/control  2007-02-28 14:36:08 UTC (rev 622)
+++ packages/gdal/trunk/debian/control  2007-02-28 16:52:47 UTC (rev 623)
@@ -7,13 +7,13 @@
 Standards-Version: 3.7.2
 XS-Python-Version: all
 
-Package: libgdal1-1.3.2
+Package: libgdal1-1.4.0
 Section: libs
 Architecture: any
 Depends: ${shlibs:Depends}
 Recommends: proj
-Conflicts: libgdal1, libgdal1c2, libgdal1c2a, libgdal1-1.3.1
-Replaces: libgdal1, libgdal1c2, libgdal1c2a, libgdal1-1.3.1
+Conflicts: libgdal1, libgdal1c2, libgdal1c2a, libgdal1-1.3.1, libgdal1-1.3.2
+Replaces: libgdal1, libgdal1c2, libgdal1c2a, libgdal1-1.3.1, libgdal1-1.3.2
 Description: Geospatial Data Abstraction Library
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the
@@ -35,14 +35,14 @@
  .
   Homepage: http://www.gdal.org/
 
-Package: libgdal1-1.3.2-dev
+Package: libgdal1-dev
 Section: libdevel
 Architecture: any
-Depends: libgdal1-1.3.2 (=${Source-Version}), libc6-dev, libcfitsio-dev, 
netcdfg-dev, libtiff4-dev, libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, 
libungif4-dev, libhdf4g-dev, libpq-dev | postgresql-dev, libxerces27-dev, 
unixodbc-dev, libsqlite0-dev, libgeos-dev, libmysqlclient15-dev
+Depends: libgdal1-1.4.0 (=${Source-Version}), libc6-dev, libcfitsio-dev, 
netcdfg-dev, libtiff4-dev, libjasper-1.701-dev, libpng12-dev, libjpeg62-dev, 
libungif4-dev, libhdf4g-dev, libpq-dev | postgresql-dev, libxerces27-dev, 
unixodbc-dev, libsqlite0-dev, libgeos-dev, libmysqlclient15-dev
 Suggests: libgdal-doc
 Provides: libgdal-dev
-Replaces: libgdal1-dev, libgdal1-1.3.1-dev
-Conflicts: libgdal-dev, libgdal1-dev, libgdal1-1.3.1-dev
+Replaces: libgdal1-1.3.1-dev, libgdal1-1.3.2-dev
+Conflicts: libgdal1-1.3.2-dev, libgdal1-1.3.1-dev
 Description: Geospatial Data Abstraction Library - Development files
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the
@@ -68,7 +68,7 @@
 Package: libgdal-doc
 Section: doc
 Architecture: all
-Suggests: libgdal1-1.3.2 (=${Source-Version})
+Suggests: libgdal1-1.4.0 (=${Source-Version})
 Description: Documentation for the Geospatial Data Abstraction Library
  GDAL is a translator library for raster geospatial data formats.
  As a library, it presents a single abstract data model to the

Modified: packages/gdal/trunk/debian/patches/00list
===================================================================
--- packages/gdal/trunk/debian/patches/00list   2007-02-28 14:36:08 UTC (rev 
622)
+++ packages/gdal/trunk/debian/patches/00list   2007-02-28 16:52:47 UTC (rev 
623)
@@ -1,2 +1 @@
 libname
-ogrili2layer.cpp

Deleted: packages/gdal/trunk/debian/patches/351372_mipsel_ftbfs.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/351372_mipsel_ftbfs.dpatch       
2007-02-28 14:36:08 UTC (rev 622)
+++ packages/gdal/trunk/debian/patches/351372_mipsel_ftbfs.dpatch       
2007-02-28 16:52:47 UTC (rev 623)
@@ -1,70 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 351372_mipsel_ftbfs.dpatch by Paul Wise <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix #351372: mipsel FTBFS
-
[EMAIL PROTECTED]@
-diff -urNad gdal-1.3.1~/frmts/pcraster/libcsf/csftypes.h 
gdal-1.3.1/frmts/pcraster/libcsf/csftypes.h
---- gdal-1.3.1~/frmts/pcraster/libcsf/csftypes.h       2005-09-29 
04:54:53.000000000 +0800
-+++ gdal-1.3.1/frmts/pcraster/libcsf/csftypes.h        2006-02-08 
00:10:55.000000000 +0800
-@@ -91,19 +91,22 @@
- #endif
- 
- /* endian mode
-- * DEFINE WITH -D
-- * first probe a few:
-+ * DEFINE WITH -D or find here
-  */
- #ifndef CPU_BIG_ENDIAN
- # ifndef CPU_LITTLE_ENDIAN
- 
--/* GDAL CPL STYLE */
--#ifdef CPL_LSB
--# define CPU_LITTLE_ENDIAN
--#endif
--#ifdef CPL_MSB
--# define CPU_BIG_ENDIAN
--#endif
-+#ifdef USE_IN_GDAL
-+  /* GDAL CPL STYLE */
-+# ifdef CPL_LSB
-+#  define CPU_LITTLE_ENDIAN
-+# endif
-+# ifdef CPL_MSB
-+#  define CPU_BIG_ENDIAN
-+# endif
-+
-+#else
-+ /* probe a few: */
- 
- #ifdef _AIX
- /* IBM AIX defines this on RS/6000 */
-@@ -115,10 +118,13 @@
- # define CPU_BIG_ENDIAN
- #endif
- 
--#ifdef mips
--/* works on the SGI machines */
--# define CPU_BIG_ENDIAN
--#endif
-+/*
-+ * #ifdef mips
-+ * worked once on the SGI machines
-+ * but mips has both endian architectures
-+ * # define CPU_BIG_ENDIAN
-+ * #endif
-+ */
- 
- #ifdef __alpha
- /* DEC alpha defines this
-@@ -145,6 +151,9 @@
- #  define CPU_BIG_ENDIAN
- #endif
- 
-+/* endif probing */
-+# endif 
-+
- /* endif no ENDIAN defined */
- # endif
- #endif

Deleted: packages/gdal/trunk/debian/patches/357189_gcc4.1_ftbfs.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/357189_gcc4.1_ftbfs.dpatch       
2007-02-28 14:36:08 UTC (rev 622)
+++ packages/gdal/trunk/debian/patches/357189_gcc4.1_ftbfs.dpatch       
2007-02-28 16:52:47 UTC (rev 623)
@@ -1,19 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 357189_gcc4.1_ftbfs.dpatch by Martin Michlmayr <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: Fix #357189: GCC 4.1 FTBFS
-
[EMAIL PROTECTED]@
-diff -urNad gdal-1.3.1~/frmts/fit/fitdataset.cpp 
gdal-1.3.1/frmts/fit/fitdataset.cpp
---- gdal-1.3.1~/frmts/fit/fitdataset.cpp       2005-07-06 01:10:52.000000000 
+0800
-+++ gdal-1.3.1/frmts/fit/fitdataset.cpp        2006-03-16 13:40:47.000000000 
+0800
-@@ -174,7 +174,7 @@
- 
- public:
- 
--    FITRasterBand::FITRasterBand( FITDataset *, int );
-+    FITRasterBand( FITDataset *, int );
-       ~FITRasterBand();
-     
-     // should override RasterIO eventually.

Deleted: packages/gdal/trunk/debian/patches/360389_amd64_ftbfs.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/360389_amd64_ftbfs.dpatch        
2007-02-28 14:36:08 UTC (rev 622)
+++ packages/gdal/trunk/debian/patches/360389_amd64_ftbfs.dpatch        
2007-02-28 16:52:47 UTC (rev 623)
@@ -1,27 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## 360389_amd64_ftbfs.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
[EMAIL PROTECTED]@
-diff -urNad gdal-1.3.1~/port/cpl_odbc.h gdal-1.3.1/port/cpl_odbc.h
---- gdal-1.3.1~/port/cpl_odbc.h        2005-09-05 22:18:43.000000000 +0200
-+++ gdal-1.3.1/port/cpl_odbc.h 2006-04-04 00:13:29.000000000 +0200
-@@ -95,14 +95,8 @@
- class CPLODBCStatement;
- 
- 
--#ifdef SQLULEN
--/* ODBC types to support 64 bit compilation */
--#  define _SQLULEN SQLULEN
--#  define _SQLLEN  SQLLEN
--#else
--#  define _SQLULEN SQLUINTEGER
--#  define _SQLLEN  SQLINTEGER
--#endif        /* ifdef SQLULEN */
-+#define _SQLULEN SQLULEN
-+#define _SQLLEN  SQLLEN
- 
- 
- /**

Modified: packages/gdal/trunk/debian/patches/libname.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/libname.dpatch   2007-02-28 14:36:08 UTC 
(rev 622)
+++ packages/gdal/trunk/debian/patches/libname.dpatch   2007-02-28 16:52:47 UTC 
(rev 623)
@@ -5,37 +5,37 @@
 ## DP: No description.
 
 @DPATCH@
-diff -urNad gdal-1.3.2~/GDALmake.opt.in gdal-1.3.2/GDALmake.opt.in
---- gdal-1.3.2~/GDALmake.opt.in        2006-06-20 14:53:51.000000000 +0200
-+++ gdal-1.3.2/GDALmake.opt.in 2006-06-20 15:05:19.000000000 +0200
-@@ -102,7 +102,7 @@
+diff -urNad gdal-1.4.0~/GDALmake.opt.in gdal-1.4.0/GDALmake.opt.in
+--- gdal-1.4.0~/GDALmake.opt.in        2007-02-28 15:49:22.000000000 +0100
++++ gdal-1.4.0/GDALmake.opt.in 2007-02-28 15:50:42.000000000 +0100
+@@ -105,7 +105,7 @@
                        -I$(GDAL_ROOT)/ogr -I$(GDAL_ROOT)/ogr/ogrsf_frmts
  
  # libtool targets and help variables
 -LIBGDAL       :=              libgdal.la
-+LIBGDAL       :=              libgdal1.3.2.la
- LIBGDAL_CURRENT       :=      11
++LIBGDAL       :=              libgdal1.4.0.la
+ LIBGDAL_CURRENT       :=      12
  LIBGDAL_REVISION      :=      0
- LIBGDAL_AGE   :=      10
-@@ -110,9 +110,9 @@
- # native build targets and variables
- GDAL_VER      =       @GDAL_VER@
+ LIBGDAL_AGE   :=      11
+@@ -118,9 +118,9 @@
+ GDAL_VERSION_MINOR =    @GDAL_VERSION_MINOR@
+ GDAL_VERSION_REV   =    @GDAL_VERSION_REV@
  
 -GDAL_LIB      =       $(GDAL_ROOT)/libgdal.a
 -GDAL_SLIB     =       $(GDAL_ROOT)/libgdal.$(SO_EXT)
 -GDAL_SLIB_LINK        =       -L$(GDAL_ROOT) -lgdal
-+GDAL_LIB      =       $(GDAL_ROOT)/libgdal1.3.2.a
-+GDAL_SLIB     =       $(GDAL_ROOT)/libgdal1.3.2.$(SO_EXT)
-+GDAL_SLIB_LINK        =       -L$(GDAL_ROOT) -lgdal1.3.2
++GDAL_LIB      =       $(GDAL_ROOT)/libgdal1.4.0.a
++GDAL_SLIB     =       $(GDAL_ROOT)/libgdal1.4.0.$(SO_EXT)
++GDAL_SLIB_LINK        =       -L$(GDAL_ROOT) -lgdal1.4.0
  
- #
- # OGR/PostgreSQL support.
-@@ -298,14 +298,14 @@
+ # Mac OS X Framework definition
+ MACOSX_FRAMEWORK = @MACOSX_FRAMEWORK@
+@@ -325,14 +325,14 @@
  
  ifeq ($(HAVE_LIBTOOL), yes)
  CONFIG_LIBS   =       $(GDAL_ROOT)/$(LIBGDAL)
 -CONFIG_LIBS_INS       =       -L$(INST_LIB) -lgdal
-+CONFIG_LIBS_INS       =       -L$(INST_LIB) -lgdal1.3.2
++CONFIG_LIBS_INS       =       -L$(INST_LIB) -lgdal1.4.0
  EXE_DEP_LIBS  =       $(GDAL_ROOT)/$(LIBGDAL)
  SO_EXT                =       la
  else
@@ -43,7 +43,7 @@
  ifeq ($(HAVE_LD_SHARED),yes)
  CONFIG_LIBS   =       $(GDAL_SLIB_LINK) $(LIBS)
 -CONFIG_LIBS_INS       =       -L$(INST_LIB) -lgdal
-+CONFIG_LIBS_INS       =       -L$(INST_LIB) -lgdal1.3.2
++CONFIG_LIBS_INS       =       -L$(INST_LIB) -lgdal1.4.0
  EXE_DEP_LIBS  =       $(GDAL_SLIB)
  else
  CONFIG_LIBS   =       $(GDAL_LIBS) $(LIBS)

Deleted: packages/gdal/trunk/debian/patches/ogrili2layer.cpp.dpatch
===================================================================
--- packages/gdal/trunk/debian/patches/ogrili2layer.cpp.dpatch  2007-02-28 
14:36:08 UTC (rev 622)
+++ packages/gdal/trunk/debian/patches/ogrili2layer.cpp.dpatch  2007-02-28 
16:52:47 UTC (rev 623)
@@ -1,34 +0,0 @@
-#! /bin/sh /usr/share/dpatch/dpatch-run
-## ogrili2layer.cpp.dpatch by Francesco Paolo Lovergine <[EMAIL PROTECTED]>
-##
-## All lines beginning with `## DP:' are a description of the patch.
-## DP: No description.
-
[EMAIL PROTECTED]@
-diff -urNad gdal-1.3.2~/ogr/ogrsf_frmts/ili/ogrili2layer.cpp 
gdal-1.3.2/ogr/ogrsf_frmts/ili/ogrili2layer.cpp
---- gdal-1.3.2~/ogr/ogrsf_frmts/ili/ogrili2layer.cpp   2005-11-21 
15:56:31.000000000 +0100
-+++ gdal-1.3.2/ogr/ogrsf_frmts/ili/ogrili2layer.cpp    2006-07-20 
20:37:10.000000000 +0200
-@@ -73,7 +73,6 @@
-     poFeatureDefn->SetGeomType( eReqType );
- 
-     bWriter = bWriterIn;
--    listFeatureIt = 0;
- }
- 
- /************************************************************************/
-@@ -116,6 +115,7 @@
- 
- OGRErr OGRILI2Layer::SetFeature (OGRFeature *poFeature) {
-     listFeature.push_back(poFeature);
-+    if (listFeature.size() == 1) ResetReading();
-     return OGRERR_NONE;
- }
- 
-@@ -132,7 +132,6 @@
- /************************************************************************/
- 
- OGRFeature *OGRILI2Layer::GetNextFeature() {
--    if (listFeatureIt == 0) listFeatureIt = listFeature.begin();
-     if (listFeatureIt != listFeature.end())
-         return *(listFeatureIt++);
-     return NULL;

Modified: packages/gdal/trunk/debian/rules
===================================================================
--- packages/gdal/trunk/debian/rules    2007-02-28 14:36:08 UTC (rev 622)
+++ packages/gdal/trunk/debian/rules    2007-02-28 16:52:47 UTC (rev 623)
@@ -74,23 +74,23 @@
        dh_installdirs
 
        # Save gdal-config for next use
-       cp apps/gdal-config-inst $(CURDIR)/debian/gdal-config.build
+#      cp apps/gdal-config-inst $(CURDIR)/debian/gdal-config.build
 
        for V in $(PYVERS); do \
                cp GDALmake.opt-$$V GDALmake.opt; \
                (cd pymod && $(MAKE) clean); \
                $(MAKE) py-target; \
-               $(MAKE) install prefix=$(CURDIR)/debian/tmp/usr \
+               $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \
                        INST_PYMOD="\$$(prefix)"`awk -F '/usr' '/INST_PYMOD/ 
{print $$2}' GDALmake.opt` ; \
        done
 
-       $(MAKE) install-docs prefix=$(CURDIR)/debian/tmp/usr \
+       $(MAKE) install-docs DESTDIR=$(CURDIR)/debian/tmp \
                "INST_DOCS=\$$(prefix)/share/doc/libgdal-doc"\
                "INST_MAN=\$$(prefix)/share/man"
 
        # Restore build-time gdal-config
-       cp $(CURDIR)/debian/gdal-config.build 
$(CURDIR)/debian/tmp/usr/bin/gdal-config && \
-               rm -f $(CURDIR)/debian/gdal-config.build
+#      cp $(CURDIR)/debian/gdal-config.build 
$(CURDIR)/debian/tmp/usr/bin/gdal-config && \
+#              rm -f $(CURDIR)/debian/gdal-config.build
 
        # To reach compatibility with window-version which puts gdal-header
        # files into /usr/include/gdal. I don't want to place headerfiles 
directly
@@ -111,7 +111,7 @@
        dh_pycentral
        dh_makeshlibs
        dh_installdeb
-       dh_shlibdeps -L libgdal1-1.3.2 -l debian/libgdal1-1.3.2/usr/lib
+       dh_shlibdeps -L libgdal1-1.4.0 -l debian/libgdal1-1.4.0/usr/lib
        dh_gencontrol
        dh_md5sums
        dh_builddeb


_______________________________________________
Pkg-grass-devel mailing list
Pkg-grass-devel@lists.alioth.debian.org
http://lists.alioth.debian.org/mailman/listinfo/pkg-grass-devel

Reply via email to