Package: drawmap
Version: 2.5-1.1
Severity: normal
Tags: patch
As part of a bug squashing party to fix g++ transition issues
( http://lists.debian.org/debian-devel-announce/2005/09/msg00004.html ),
I have made a non-maintainer upload of drawmap. The diff between -1 and
-1.1 is attached.
Hamish
diff -u drawmap-2.5/debian/changelog drawmap-2.5/debian/changelog
--- drawmap-2.5/debian/changelog
+++ drawmap-2.5/debian/changelog
@@ -1,3 +1,13 @@
+drawmap (2.5-1.1) unstable; urgency=low
+
+ * BSP NMU
+ * Fix FTBFS with gcc-4.0 due to source conflict with library functions
+ (drawmap.h) and labels at end of case statement (dlg.c).
+ (Closes: #258622). Thanks to Andreas Jochens for the patch.
+ * Upgrade from debhelper 2 to 4.
+
+ -- Hamish Moffatt <[EMAIL PROTECTED]> Sat, 10 Sep 2005 21:51:47 +1000
+
drawmap (2.5-1) unstable; urgency=low
* New upstream release closes: Bug#219081
diff -u drawmap-2.5/debian/control drawmap-2.5/debian/control
--- drawmap-2.5/debian/control
+++ drawmap-2.5/debian/control
@@ -2,7 +2,7 @@
Section: math
Priority: optional
Maintainer: James W. Penny <[EMAIL PROTECTED]>
-Build-Depends: debhelper (>> 3.0.0), groff
+Build-Depends: debhelper (>> 4), groff
Standards-Version: 3.6.1
Package: drawmap
diff -u drawmap-2.5/debian/rules drawmap-2.5/debian/rules
--- drawmap-2.5/debian/rules
+++ drawmap-2.5/debian/rules
@@ -6,7 +6,7 @@
# export DH_VERBOSE=1
# This is the debhelper compatability version to use.
-export DH_COMPAT=2
+export DH_COMPAT=4
configure: configure-stamp
configure-stamp:
@@ -65,7 +65,7 @@
# dh_installpam
# dh_installinit
dh_installcron
- dh_installmanpages
+ dh_installman *.1n
dh_installinfo
# dh_undocumented
dh_installchangelogs
only in patch2:
unchanged:
--- drawmap-2.5.orig/dlg.c
+++ drawmap-2.5/dlg.c
@@ -1156,25 +1156,17 @@
if (pointflags & 1) {
latitude2 = p_lat1;
longitude2 = image_corners->sw_long;
- goto DONE2;
- }
- if (pointflags & 2) {
+ } else if (pointflags & 2) {
latitude2 = p_lat2;
longitude2 = image_corners->ne_long;
- goto DONE2;
- }
- if (pointflags & 4) {
+ } else if (pointflags & 4) {
latitude2 = image_corners->sw_lat;
longitude2 = p_long1;
- goto DONE2;
- }
- if (pointflags & 8) {
+ } else if (pointflags & 8) {
latitude2 = image_corners->ne_lat;
longitude2 = p_long2;
- goto DONE2;
}
}
-DONE2:
}
only in patch2:
unchanged:
--- drawmap-2.5.orig/drawmap.h
+++ drawmap-2.5/drawmap.h
@@ -196,6 +196,7 @@
+#define round(x) lround(x) /* avoid type conflict with built-in function */
long round(double);
long max(long, long);
double max3(double, double, double);
