date:20090829

[DebianGIS-dev] Bug#542968: Proposed NMU fix

2009-08-29 Thread Andreas Barth

Hi,

the below patch fixes the FTBFS (and also drops the unnecessary
la-file). Unless there are reasons not to I intend to upload it
tomorrow.


Cheers,
Andi


diff -u gdal-1.5.4/debian/rules gdal-1.5.4/debian/rules
--- gdal-1.5.4/debian/rules
+++ gdal-1.5.4/debian/rules
@@ -81,8 +81,6 @@
$(MAKE) -C $(CURDIR)/swig/python clean; \
$(MAKE) -C $(CURDIR)/swig/python generate build; \
$(MAKE) -C $(CURDIR)/swig/python install 
DESTDIR=$(CURDIR)/debian/python-tmp; \
-   echo Patching ogr.py ; \
-   patch 
$(CURDIR)/debian/python-tmp/usr/lib/python$$V/site-packages/osgeo/ogr.py 
$(CURDIR)/debian/ogr.py.diff; \
done
$(MAKE) docs
$(MAKE) man
diff -u gdal-1.5.4/debian/changelog gdal-1.5.4/debian/changelog
--- gdal-1.5.4/debian/changelog
+++ gdal-1.5.4/debian/changelog
@@ -1,3 +1,13 @@
+gdal (1.5.4-4.1) unstable; urgency=low
+
+  * Non-maintainer upload
+  * Take patch from 
http://trac.osgeo.org/gdal/changeset/16826?format=diffnew=16826
+to fix FTBFS with current swig1.3. Closes: #543629, #542968
+  * Drop /usr/lib/libgdal1.5.0.la as part of that release goal and to allow the
+depended-on packages to drop theirs.
+
+ -- Andreas Barth a...@not.so.argh.org  Sat, 29 Aug 2009 15:19:03 +0200
+
 gdal (1.5.4-4) unstable; urgency=low
 
   * Changed section to ruby for ruby-related packages.
diff -u gdal-1.5.4/debian/libgdal1-dev.install 
gdal-1.5.4/debian/libgdal1-dev.install
--- gdal-1.5.4/debian/libgdal1-dev.install
+++ gdal-1.5.4/debian/libgdal1-dev.install
@@ -2,5 +2,4 @@
 usr/include
 usr/lib/libgdal1.5.0.a
-usr/lib/libgdal1.5.0.la
 usr/lib/libgdal1.5.0.so
 usr/share/man/man1/gdal-config.1
diff -u gdal-1.5.4/debian/patches/00list gdal-1.5.4/debian/patches/00list
--- gdal-1.5.4/debian/patches/00list
+++ gdal-1.5.4/debian/patches/00list
@@ -7,0 +8 @@
+542968_swig1.39
only in patch2:
unchanged:
--- gdal-1.5.4.orig/debian/patches/542968_swig1.39.dpatch
+++ gdal-1.5.4/debian/patches/542968_swig1.39.dpatch
@@ -0,0 +1,29 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## 542968_swig1.39.dpatch by Andreas Barth a...@not.so.argh.org
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Fix FTBFS on unstable, see #542968, #543629
+## DP: taken from 
http://trac.osgeo.org/gdal/changeset/16826?format=diffnew=16826
+...@dpatch@
+Index: gdal/swig/include/gdal.i
+===
+--- gdal/swig/include/gdal.i (revision 16479)
 gdal/swig/include/gdal.i (revision 16826)
+@@ -179,4 +179,17 @@
+ #endif
+ 
++
++/* Default memberin typemaps required to support SWIG 1.3.39 and above */
++%typemap(memberin) char *Info %{
++/* char* Info memberin typemap */
++$1;
++%}
++
++%typemap(memberin) char *Id %{
++/* char* Info memberin typemap */
++$1;
++%}
++
++
+ //
+ //



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

[DebianGIS-dev] r2401 - in packages: . mbsystem

2009-08-29 Thread hamish-guest

Author: hamish-guest
Date: 2009-08-29 14:32:17 + (Sat, 29 Aug 2009)
New Revision: 2401

Added:
   packages/mbsystem/
   packages/mbsystem/TODO
   packages/mbsystem/control
Log:
initial packaging for MB-System

Added: packages/mbsystem/TODO
===
--- packages/mbsystem/TODO  (rev 0)
+++ packages/mbsystem/TODO  2009-08-29 14:32:17 UTC (rev 2401)
@@ -0,0 +1,6 @@
+TODO: adapt these beginnings of a Debian build script into full packaging 
rules:
+
+https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
+
+
+

Added: packages/mbsystem/control
===
--- packages/mbsystem/control   (rev 0)
+++ packages/mbsystem/control   2009-08-29 14:32:17 UTC (rev 2401)
@@ -0,0 +1,20 @@
+Source: mbsystem
+Section: science
+Priority: optional
+Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Uploaders: 
+Build-depends: libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev, 
libgl1-mesa-dev
+Standards-Version: 
+Homepage: http://www.ldeo.columbia.edu/res/pi/MB-System/
+
+Package: mbsystem
+Section: science
+Architecture: any
+Depends: ${shlibs:Depends}, gmt, lesstif2, libnetcdf4, libgl1-mesa-glx, 
libglu1-mesa
+Suggests: ghostscript, xv
+Recommends: 
+Description: Processing tools for multibeam and sidescan sonar data
+ MB-System is an open source software package for the processing and
+ display of bathymetry and backscatter imagery data derived from
+ multibeam, interferometry, and sidescan sonars. It interacts with GMT
+ (The Generic Mapping Tools) and other GIS applications.


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

[DebianGIS-dev] r2402 - in packages/mbsystem: . patches

2009-08-29 Thread hamish-guest

Author: hamish-guest
Date: 2009-08-29 15:25:56 + (Sat, 29 Aug 2009)
New Revision: 2402

Added:
   packages/mbsystem/changelog
   packages/mbsystem/copyright
   packages/mbsystem/patches/
   packages/mbsystem/patches/00list
   packages/mbsystem/patches/install_makefiles.dpatch
   packages/mbsystem/patches/mbps_c_gmt431.dpatch
   packages/mbsystem/watch
Log:
a few more initial files

Added: packages/mbsystem/changelog
===
--- packages/mbsystem/changelog (rev 0)
+++ packages/mbsystem/changelog 2009-08-29 15:25:56 UTC (rev 2402)
@@ -0,0 +1,5 @@
+mbsystem (5.1.2beta11-0) UNRELEASED; urgency=low
+
+  * Initial packaging
+
+ -- Hamish Bowman hamish_b yahoo com  Sat, 29 Aug 2009 14:24:12 +1200

Added: packages/mbsystem/copyright
===
--- packages/mbsystem/copyright (rev 0)
+++ packages/mbsystem/copyright 2009-08-29 15:25:56 UTC (rev 2402)
@@ -0,0 +1,4 @@
+GPL 2
+
+http://www.ldeo.columbia.edu/res/pi/MB-System/html/gpl.html
+

Added: packages/mbsystem/patches/00list
===
--- packages/mbsystem/patches/00list(rev 0)
+++ packages/mbsystem/patches/00list2009-08-29 15:25:56 UTC (rev 2402)
@@ -0,0 +1,2 @@
+install_makefiles
+mbps_c_gmt431

Added: packages/mbsystem/patches/install_makefiles.dpatch
===
--- packages/mbsystem/patches/install_makefiles.dpatch  
(rev 0)
+++ packages/mbsystem/patches/install_makefiles.dpatch  2009-08-29 15:25:56 UTC 
(rev 2402)
@@ -0,0 +1,39 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## install_makefiles.dpatch by Hamish Bowman hamish_b yahoo com
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: Makefile adjustments suitable for Debian
+
+...@dpatch@
+--- install_makefiles.ORIG  2009-08-27 23:53:46.0 +1200
 install_makefiles   2009-08-28 00:01:00.0 +1200
+@@ -97,21 +97,21 @@
+ #
+ # Required parameters:
+ $MBSYSTEM_HOME = /usr/share/mbsystem;
+-$OS = DARWIN;
++$OS = LINUX;
+ $CFLAGS = -g -I/usr/X11R6/include;
+-$LFLAGS = -Wl -lm -bind_at_load 
-Wl,-dylib_file,/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/libGL.dylib:/System/Library/Frameworks/OpenGL.framework/Versions/A/Libraries/LibGL.dylib;
+-$NETCDFLIBDIR = /sw/lib;
+-$NETCDFINCDIR = /sw/include;
+-$GMTLIBDIR = /usr/local/gmt/lib;
+-$GMTINCDIR = /usr/local/gmt/include;
++$LFLAGS = -Wl -lm;
++$NETCDFLIBDIR = /usr/lib;
++$NETCDFINCDIR = /usr/include;
++$GMTLIBDIR = /usr/lib;
++$GMTINCDIR = /usr/include/gmt;
+ $LEVITUS = $MBSYSTEM_HOME/share/LevitusAnnual82.dat;
+ $PROJECTIONS = $MBSYSTEM_HOME/share/Projections.dat;
+ #
+ # Required paramters for graphical tools
+ #   - graphical tools will not be built if these
+ # are commented out
+-$MOTIFINCDIR = /sw/include;
+-$MOTIFLIBS = -L/sw/lib -L/usr/X11R6/lib -lXm -lXt -lX11;
++$MOTIFINCDIR = /usr/include;
++$MOTIFLIBS = -L/usr/lib -L/usr/X11R6/lib -lXm -lXt -lX11;
+ #
+ # Required paramter for visualization tools
+ #   - visualization tools will not be built if this

Added: packages/mbsystem/patches/mbps_c_gmt431.dpatch
===
--- packages/mbsystem/patches/mbps_c_gmt431.dpatch  
(rev 0)
+++ packages/mbsystem/patches/mbps_c_gmt431.dpatch  2009-08-29 15:25:56 UTC 
(rev 2402)
@@ -0,0 +1,27 @@
+#! /bin/sh /usr/share/dpatch/dpatch-run
+## mbps_c_gmt431.dpatch by Hamish Bowman hamish_b yahoo com
+##
+## All lines beginning with `## DP:' are a description of the patch.
+## DP: allow to work with GMT older than version 4.5.0
+
+...@dpatch@
+--- src/utilities/mbps.c.ORIG   2009-08-28 00:21:17.0 +1200
 src/utilities/mbps.c2009-08-28 00:22:54.0 +1200
+@@ -842,10 +842,17 @@
+}
+
+/* initialize the Postscript plotting */
++#ifdef GMT_MINOR_VERSION
+ps_plotinit_hires(NULL,0,orient,x_off,y_off,1.0,1.0,1,300,1,
+gmtdefs.paper_width, gmtdefs.page_rgb, 
+gmtdefs.encoding.name, 
+GMT_epsinfo (argv[0]));
++#else
++   ps_plotinit(NULL,0,orient,x_off,y_off,1.0,1.0,1,300,1,
++   gmtdefs.paper_width, gmtdefs.page_rgb, 
++   gmtdefs.encoding.name, 
++   GMT_epsinfo (argv[0]));
++#endif
+GMT_echo_command (argc, argv);
+
+/* now loop over the data in the appropriate order

Added: packages/mbsystem/watch
===
--- packages/mbsystem/watch (rev 0)
+++ packages/mbsystem/watch 2009-08-29 15:25:56 UTC (rev 2402)
@@ -0,0 +1,5 @@
+version=
+ftp://ftp.ldeo.columbia.edu/pub/MB-System/mbsystem-( ??? ).tar.gz
+#
+# e.g.

[DebianGIS-dev] r2403 - in packages/mbsystem: . trunk trunk/debian trunk/debian/patches

2009-08-29 Thread hamish-guest

Author: hamish-guest
Date: 2009-08-29 15:28:47 + (Sat, 29 Aug 2009)
New Revision: 2403

Added:
   packages/mbsystem/trunk/
   packages/mbsystem/trunk/debian/
   packages/mbsystem/trunk/debian/TODO
   packages/mbsystem/trunk/debian/changelog
   packages/mbsystem/trunk/debian/control
   packages/mbsystem/trunk/debian/copyright
   packages/mbsystem/trunk/debian/patches/
   packages/mbsystem/trunk/debian/watch
Removed:
   packages/mbsystem/TODO
   packages/mbsystem/changelog
   packages/mbsystem/control
   packages/mbsystem/copyright
   packages/mbsystem/patches/
   packages/mbsystem/watch
Log:
proper dir structure

Deleted: packages/mbsystem/TODO
===
--- packages/mbsystem/TODO  2009-08-29 15:25:56 UTC (rev 2402)
+++ packages/mbsystem/TODO  2009-08-29 15:28:47 UTC (rev 2403)
@@ -1,6 +0,0 @@
-TODO: adapt these beginnings of a Debian build script into full packaging 
rules:
-
-https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
-
-
-

Deleted: packages/mbsystem/changelog
===
--- packages/mbsystem/changelog 2009-08-29 15:25:56 UTC (rev 2402)
+++ packages/mbsystem/changelog 2009-08-29 15:28:47 UTC (rev 2403)
@@ -1,5 +0,0 @@
-mbsystem (5.1.2beta11-0) UNRELEASED; urgency=low
-
-  * Initial packaging
-
- -- Hamish Bowman hamish_b yahoo com  Sat, 29 Aug 2009 14:24:12 +1200

Deleted: packages/mbsystem/control
===
--- packages/mbsystem/control   2009-08-29 15:25:56 UTC (rev 2402)
+++ packages/mbsystem/control   2009-08-29 15:28:47 UTC (rev 2403)
@@ -1,20 +0,0 @@
-Source: mbsystem
-Section: science
-Priority: optional
-Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
-Uploaders: 
-Build-depends: libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev, 
libgl1-mesa-dev
-Standards-Version: 
-Homepage: http://www.ldeo.columbia.edu/res/pi/MB-System/
-
-Package: mbsystem
-Section: science
-Architecture: any
-Depends: ${shlibs:Depends}, gmt, lesstif2, libnetcdf4, libgl1-mesa-glx, 
libglu1-mesa
-Suggests: ghostscript, xv
-Recommends: 
-Description: Processing tools for multibeam and sidescan sonar data
- MB-System is an open source software package for the processing and
- display of bathymetry and backscatter imagery data derived from
- multibeam, interferometry, and sidescan sonars. It interacts with GMT
- (The Generic Mapping Tools) and other GIS applications.

Deleted: packages/mbsystem/copyright
===
--- packages/mbsystem/copyright 2009-08-29 15:25:56 UTC (rev 2402)
+++ packages/mbsystem/copyright 2009-08-29 15:28:47 UTC (rev 2403)
@@ -1,4 +0,0 @@
-GPL 2
-
-http://www.ldeo.columbia.edu/res/pi/MB-System/html/gpl.html
-

Copied: packages/mbsystem/trunk/debian/TODO (from rev 2401, 
packages/mbsystem/TODO)
===
--- packages/mbsystem/trunk/debian/TODO (rev 0)
+++ packages/mbsystem/trunk/debian/TODO 2009-08-29 15:28:47 UTC (rev 2403)
@@ -0,0 +1,6 @@
+TODO: adapt these beginnings of a Debian build script into full packaging 
rules:
+
+https://trac.osgeo.org/osgeo/browser/livedvd/gisvm/trunk/bin/install_mb-system.sh
+
+
+


Property changes on: packages/mbsystem/trunk/debian/TODO
___
Added: svn:mergeinfo
   + 

Copied: packages/mbsystem/trunk/debian/changelog (from rev 2402, 
packages/mbsystem/changelog)
===
--- packages/mbsystem/trunk/debian/changelog(rev 0)
+++ packages/mbsystem/trunk/debian/changelog2009-08-29 15:28:47 UTC (rev 
2403)
@@ -0,0 +1,5 @@
+mbsystem (5.1.2beta11-0) UNRELEASED; urgency=low
+
+  * Initial packaging
+
+ -- Hamish Bowman hamish_b yahoo com  Sat, 29 Aug 2009 14:24:12 +1200


Property changes on: packages/mbsystem/trunk/debian/changelog
___
Added: svn:mergeinfo
   + 

Copied: packages/mbsystem/trunk/debian/control (from rev 2401, 
packages/mbsystem/control)
===
--- packages/mbsystem/trunk/debian/control  (rev 0)
+++ packages/mbsystem/trunk/debian/control  2009-08-29 15:28:47 UTC (rev 
2403)
@@ -0,0 +1,20 @@
+Source: mbsystem
+Section: science
+Priority: optional
+Maintainer: Debian GIS Project pkg-grass-devel@lists.alioth.debian.org
+Uploaders: 
+Build-depends: libgmt-dev, lesstif2-dev, libnetcdf-dev, libglu1-mesa-dev, 
libgl1-mesa-dev
+Standards-Version: 
+Homepage: http://www.ldeo.columbia.edu/res/pi/MB-System/
+
+Package: mbsystem
+Section: science
+Architecture: any
+Depends: ${shlibs:Depends}, gmt, lesstif2, libnetcdf4, libgl1-mesa-glx, 
libglu1-mesa
+Suggests: ghostscript, xv

[DebianGIS-dev] Bug#542968: Proposed NMU fix

[DebianGIS-dev] r2401 - in packages: . mbsystem

[DebianGIS-dev] r2402 - in packages/mbsystem: . patches

[DebianGIS-dev] r2403 - in packages/mbsystem: . trunk trunk/debian trunk/debian/patches

4 matches

Site Navigation

Mail list logo

Footer information