Bug#511852: xnecview: Error in parameters - intend to NMU

2009-01-20 Thread Cyril Brulebois
Evgeni Golov  (19/01/2009):
> Great, attached is a more verbose diff, that also does two minor
> cleanups.
> 
> Alan, I plan to NMU that soon, any objections?

After some suggestions from me, it has been uploaded to DELAYED/1. Final
debdiff is attached.

Mraw,
KiBi.
diff -u xnecview-1.35/debian/changelog xnecview-1.35/debian/changelog
--- xnecview-1.35/debian/changelog
+++ xnecview-1.35/debian/changelog
@@ -1,3 +1,18 @@
+xnecview (1.35-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Always use C locale to prevent issues with locales that have
+different (other than '.') decimal-point chars.
+Thanks to Fernando M. Maresca for debugging and testing.
+Closes: #511852.
+  * debian/rules:
++ Call dh_clean instead of several rm -f in the clean target,
+  that cleans debian/ better, especially the debhelper logs.
++ Add Makefile and xnecview._man to the cleaned files,
+  so they don't show up in the diff.gz.
+
+ -- Evgeni Golov   Tue, 20 Jan 2009 08:27:19 +0100
+
 xnecview (1.35-5) unstable; urgency=low
   * Fix md5sums file
   * Change strip options to remove .comment and .note sections
diff -u xnecview-1.35/debian/rules xnecview-1.35/debian/rules
--- xnecview-1.35/debian/rules
+++ xnecview-1.35/debian/rules
@@ -24,10 +24,8 @@
 
 clean:
 	$(checkdir)
-	-rm -f build
-	-rm -f *.o xnecview *.bak
-	-rm -f `find . -name "*~"`
-	-rm -rf debian/tmp debian/files* core debian/substvars
+	dh_clean build *.o xnecview *.bak *~ core Makefile \
+		xnecview._man debian/substvars
 
 binary-indep: checkroot build
 	$(checkdir)
only in patch2:
unchanged:
--- xnecview-1.35.orig/xnecview.c
+++ xnecview-1.35/xnecview.c
@@ -15,6 +15,8 @@
 #include 
 #include 
 
+#include 
+
 #ifndef NO_GETOPT
   #include 
 #endif
@@ -373,6 +375,8 @@
initX(&argc,argv);
inputfilename=NULL;
 
+   setlocale(LC_ALL, "C");
+
wires=mymalloc(maxwires*sizeof(Wire));
surfaces=mymalloc(maxsurfaces*sizeof(Surface));
excis=mymalloc(maxexcis*sizeof(Exci));


signature.asc
Description: Digital signature


Bug#511852: xnecview: Error in parameters - intend to NMU

2009-01-19 Thread Evgeni Golov
Hi,

On Mon, 19 Jan 2009 17:21:22 -0200 Fernando M. Maresca wrote:

> > See the attached debdiff for a proposed NMU.
> Applyed the patch and works here.

Great, attached is a more verbose diff, that also does two minor
cleanups.

Alan, I plan to NMU that soon, any objections?

Regards
Evgeni

-- 
Bruce Schneier Fact Number 81:
Bruce Schneier taught Chuck Norris how to divide by zero as they stood
silent in an elevator.
diff -u xnecview-1.35/debian/changelog xnecview-1.35/debian/changelog
--- xnecview-1.35/debian/changelog
+++ xnecview-1.35/debian/changelog
@@ -1,3 +1,19 @@
+xnecview (1.35-5.1) unstable; urgency=low
+
+  * Non-maintainer upload.
+  * Always use C locale to prevent issues with locales that have
+different (other than '.') decimal-point chars.
+Thanks to Fernando M. Maresca for debugging and testing.
+Closes: #511852.
+  * debian/rules:
++ Call dh_clean instead of several rm -f in the clean target,
+  add Makefile and xnecview._man to the cleaned files.
+  * debian/control:
++ Remove Priority and Section fields from the binary package, they
+  are the same as for the source package.
+
+ -- Evgeni Golov   Mon, 19 Jan 2009 22:10:14 +0100
+
 xnecview (1.35-5) unstable; urgency=low
   * Fix md5sums file
   * Change strip options to remove .comment and .note sections
diff -u xnecview-1.35/debian/control xnecview-1.35/debian/control
--- xnecview-1.35/debian/control
+++ xnecview-1.35/debian/control
@@ -7,8 +7,6 @@
 
 Package: xnecview
 Architecture: any
-Section: hamradio
-Priority: extra
 Depends: ${shlibs:Depends}
 Description: NEC structure and gain pattern viewer
  xnecview allows a representation of a NEC (Numerical Electromagnetics
diff -u xnecview-1.35/debian/rules xnecview-1.35/debian/rules
--- xnecview-1.35/debian/rules
+++ xnecview-1.35/debian/rules
@@ -24,10 +24,8 @@
 
 clean:
 	$(checkdir)
-	-rm -f build
-	-rm -f *.o xnecview *.bak
-	-rm -f `find . -name "*~"`
-	-rm -rf debian/tmp debian/files* core debian/substvars
+	dh_clean build *.o xnecview *.bak *~ core Makefile \
+		xnecview._man debian/substvars
 
 binary-indep: checkroot build
 	$(checkdir)
only in patch2:
unchanged:
--- xnecview-1.35.orig/xnecview.c
+++ xnecview-1.35/xnecview.c
@@ -15,6 +15,8 @@
 #include 
 #include 
 
+#include 
+
 #ifndef NO_GETOPT
   #include 
 #endif
@@ -373,6 +375,8 @@
initX(&argc,argv);
inputfilename=NULL;
 
+   setlocale(LC_ALL, "C");
+
wires=mymalloc(maxwires*sizeof(Wire));
surfaces=mymalloc(maxsurfaces*sizeof(Surface));
excis=mymalloc(maxexcis*sizeof(Exci));


pgpjub0r1ayMf.pgp
Description: PGP signature