diff -u predict-2.2.3/debian/control predict-2.2.3/debian/control --- predict-2.2.3/debian/control +++ predict-2.2.3/debian/control @@ -1,7 +1,8 @@ Source: predict Section: hamradio Priority: optional -Maintainer: A. Maitland Bottoms +Maintainer: Ubuntu Developers +XSBC-Original-Maintainer: A. Maitland Bottoms Uploaders: Bdale Garbee Build-Depends: debhelper (>= 7), quilt, libncurses5-dev, libgtk2.0-dev, libforms-dev, autotools-dev, automake Standards-Version: 3.8.4 diff -u predict-2.2.3/debian/changelog predict-2.2.3/debian/changelog --- predict-2.2.3/debian/changelog +++ predict-2.2.3/debian/changelog @@ -1,3 +1,11 @@ +predict (2.2.3-3ubuntu1) maverick; urgency=low + + * debian/patches/fix-R0-conflict: + - Some systems define an enumeration containing R0 in + sys/ucontext.h. Changing the name avoids any conflict.(LP: #645036) + + -- Niall Creech Wed, 22 Sep 2010 10:28:53 +0100 + predict (2.2.3-3) unstable; urgency=low * Update for libforms2 (Closes: #583174) diff -u predict-2.2.3/debian/patches/series predict-2.2.3/debian/patches/series --- predict-2.2.3/debian/patches/series +++ predict-2.2.3/debian/patches/series @@ -19,0 +20 @@ +fix-R0-conflict.diff only in patch2: unchanged: --- predict-2.2.3.orig/debian/patches/fix-R0-conflict.diff +++ predict-2.2.3/debian/patches/fix-R0-conflict.diff @@ -0,0 +1,150 @@ +Author: Niall Creech +Description: Some systems define an enumeration containing R0 in + sys/ucontext.h. Changing the name avoids any conflict. +Ubuntu-Bug: https://bugs.edge.launchpad.net/ubuntu/+source/predict/+bug/645036 +Index: predict-2.2.3/clients/earthtrack/earthtrack.c +=================================================================== +--- predict-2.2.3.orig/clients/earthtrack/earthtrack.c 2010-09-22 12:16:33.819222073 +0100 ++++ predict-2.2.3/clients/earthtrack/earthtrack.c 2010-09-22 12:16:34.143211509 +0100 +@@ -49,7 +49,7 @@ + #endif + + char string[625], error; +-double R0=6378.16, TWOPI=6.283185307179586, ++double LOCAL_R0=6378.16, TWOPI=6.283185307179586, + HALFPI=1.570796326794896, deg2rad=1.74532925199e-02; + FILE *markerfd=NULL, *greatarcfd=NULL; + +@@ -259,7 +259,7 @@ + + ssplat=ssplat*deg2rad; + ssplong=ssplong*deg2rad; +- beta=(0.5*footprint)/R0; ++ beta=(0.5*footprint)/LOCAL_R0; + + for (azi=0; azi<360; azi++) + { +@@ -612,7 +612,7 @@ + circledrawn=1; + + if (zoom) +- radius=(int)(100.0*(R0/footprint)); ++ radius=(int)(100.0*(LOCAL_R0/footprint)); + else + radius=50; + +Index: predict-2.2.3/clients/earthtrack/earthtrack-old.c +=================================================================== +--- predict-2.2.3.orig/clients/earthtrack/earthtrack-old.c 2010-09-22 12:17:07.406126820 +0100 ++++ predict-2.2.3/clients/earthtrack/earthtrack-old.c 2010-09-22 12:17:41.189025221 +0100 +@@ -46,7 +46,7 @@ + #endif + + char string[625], error; +-double R0=6378.16, TWOPI=6.283185307179586, HALFPI=1.570796326794896, ++double LOCAL_R0=6378.16, TWOPI=6.283185307179586, HALFPI=1.570796326794896, + deg2rad=1.74532925199e-02; + FILE *markerfd=NULL, *greatarcfd=NULL; + +@@ -256,7 +256,7 @@ + + ssplat=ssplat*deg2rad; + ssplong=ssplong*deg2rad; +- beta=(0.5*footprint)/R0; ++ beta=(0.5*footprint)/LOCAL_R0; + + for (azi=0; azi<360; azi++) + { +@@ -496,7 +496,7 @@ + circledrawn=1; + + if (zoom) +- radius=(int)(100.0*(R0/footprint)); ++ radius=(int)(100.0*(LOCAL_R0/footprint)); + else + radius=50; + +Index: predict-2.2.3/clients/earthtrack/earthtrack-really-old.c +=================================================================== +--- predict-2.2.3.orig/clients/earthtrack/earthtrack-really-old.c 2010-09-22 12:17:45.516884101 +0100 ++++ predict-2.2.3/clients/earthtrack/earthtrack-really-old.c 2010-09-22 12:18:05.740224680 +0100 +@@ -46,7 +46,7 @@ + #endif + + char string[625], error; +-double R0=6378.16, TWOPI=6.283185307179586, HALFPI=1.570796326794896, ++double LOCAL_R0=6378.16, TWOPI=6.283185307179586, HALFPI=1.570796326794896, + deg2rad=1.74532925199e-02; + FILE *markerfd=NULL, *greatarcfd=NULL; + +@@ -256,7 +256,7 @@ + + ssplat=ssplat*deg2rad; + ssplong=ssplong*deg2rad; +- beta=(0.5*footprint)/R0; ++ beta=(0.5*footprint)/LOCAL_R0; + + for (azi=0; azi<360; azi++) + { +@@ -486,7 +486,7 @@ + circledrawn=1; + + if (zoom) +- radius=(int)(100.0*(R0/footprint)); ++ radius=(int)(100.0*(LOCAL_R0/footprint)); + else + radius=50; + +Index: predict-2.2.3/clients/gsat-1.1.0/src/comms.c +=================================================================== +--- predict-2.2.3.orig/clients/gsat-1.1.0/src/comms.c 2010-09-22 12:18:56.302576067 +0100 ++++ predict-2.2.3/clients/gsat-1.1.0/src/comms.c 2010-09-22 12:19:16.733909923 +0100 +@@ -326,7 +326,7 @@ + dopplershiftup, dopplershiftdown, dopplershiftbeacon, + rangelat, rangelong, azimuth, ssplat, + ssplong, TWOPI, HALFPI, deg2rad=1.74532925199e-02, +- R0=6378.16, beta, num, dem; ++ LOCAL_R0=6378.16, beta, num, dem; + GdkRectangle updatewin; + gint sx, sy; + GdkPoint footprintdots[360], qthfootprintdots[360]; +@@ -676,7 +676,7 @@ + if( satfootprint ) { + ssplat=slat*deg2rad; + ssplong=slong*deg2rad; +- beta=(0.5*footprint)/R0; ++ beta=(0.5*footprint)/LOCAL_R0; + + for (azi=0; azi<360; azi++) + { +@@ -734,7 +734,7 @@ + if( qthfootprint ) { + ssplat=qthlat*deg2rad; + ssplong=qthlong*deg2rad; +- beta=(0.5*footprint)/R0; ++ beta=(0.5*footprint)/LOCAL_R0; + + for (azi=0; azi<360; azi++) + { +Index: predict-2.2.3/clients/map/map_cb.c +=================================================================== +--- predict-2.2.3.orig/clients/map/map_cb.c 2010-09-22 12:18:27.539513892 +0100 ++++ predict-2.2.3/clients/map/map_cb.c 2010-09-22 12:18:44.390964444 +0100 +@@ -156,7 +156,7 @@ + struct tm gmt, *ptr_gmt; + + double rangelat, rangelong, azimuth, ssplat, ssplong, TWOPI, +- HALFPI, deg2rad=1.74532925199e-02, R0=6378.16, beta, num, dem; ++ HALFPI, deg2rad=1.74532925199e-02, LOCAL_R0=6378.16, beta, num, dem; + + TWOPI=2.0*PI; + HALFPI=PI/2.0; +@@ -237,7 +237,7 @@ + + ssplat=latitude*deg2rad; + ssplong=longitude*deg2rad; +- beta=(0.5*footprint)/R0; ++ beta=(0.5*footprint)/LOCAL_R0; + + fl_drawmode(GXxor); + fl_points(xa,360,FL_WHITE);