Your message dated Fri, 28 Apr 2006 01:32:12 -0700
with message-id <[EMAIL PROTECTED]>
and subject line Bug#327475: fixed in drawmap 2.5-2
has caused the attached Bug report to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what I am
talking about this indicates a serious mail system misconfiguration
somewhere. Please contact me immediately.)
Debian bug tracking system administrator
(administrator, Debian Bugs database)
--- Begin Message ---
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);
--- End Message ---
--- Begin Message ---
Source: drawmap
Source-Version: 2.5-2
We believe that the bug you reported is fixed in the latest version of
drawmap, which is due to be installed in the Debian FTP archive:
drawmap_2.5-2.diff.gz
to pool/main/d/drawmap/drawmap_2.5-2.diff.gz
drawmap_2.5-2.dsc
to pool/main/d/drawmap/drawmap_2.5-2.dsc
drawmap_2.5-2_i386.deb
to pool/main/d/drawmap/drawmap_2.5-2_i386.deb
A summary of the changes between this version and the previous one is
attached.
Thank you for reporting the bug, which will now be closed. If you
have further comments please address them to [EMAIL PROTECTED],
and the maintainer will reopen the bug report if appropriate.
Debian distribution maintenance software
pp.
Michael Ablassmeier <[EMAIL PROTECTED]> (supplier of updated drawmap package)
(This message was generated automatically at their request; if you
believe that there is a problem with it please contact the archive
administrators by mailing [EMAIL PROTECTED])
-----BEGIN PGP SIGNED MESSAGE-----
Hash: SHA1
Format: 1.7
Date: Fri, 28 Apr 2006 09:40:19 +0200
Source: drawmap
Binary: drawmap
Architecture: source i386
Version: 2.5-2
Distribution: unstable
Urgency: low
Maintainer: Debian QA Group <[EMAIL PROTECTED]>
Changed-By: Michael Ablassmeier <[EMAIL PROTECTED]>
Description:
drawmap - draws customized maps, using raw USGS data files
Closes: 327475
Changes:
drawmap (2.5-2) unstable; urgency=low
.
* QA Upload
* Set Maintainer to QA Group
* Integrate NMU Patches with dpatch (Closes: #327475)
+ Build-Depend on Dpatch
* clean up debian/rules
* Upgrade Standards Version
Files:
8d04862a12e8ec1ad1c532dc109f9f2e 573 math optional drawmap_2.5-2.dsc
d99fcc7d42a5bae3409388d806733f00 8523 math optional drawmap_2.5-2.diff.gz
417d37c98946cfdd078f664ac20bf842 206232 math optional drawmap_2.5-2_i386.deb
-----BEGIN PGP SIGNATURE-----
Version: GnuPG v1.4.3 (GNU/Linux)
iD8DBQFEUc8HEFV7g4B8rCURAoqcAJ9cjWyuPo9KUPxImZsZwmS9l6FjegCfdX0m
ufJ+o6v+2rq9tCeIpQkhl7A=
=TzKY
-----END PGP SIGNATURE-----
--- End Message ---
