diff -Nru rlplot-1.5/debian/changelog rlplot-1.5/debian/changelog --- rlplot-1.5/debian/changelog 2011-11-29 10:07:12.000000000 +0000 +++ rlplot-1.5/debian/changelog 2011-12-10 06:22:52.000000000 +0000 @@ -1,3 +1,25 @@ +rlplot (1.5-2) unstable; urgency=low + + * QA upload. + * debian/rlplot.1: Fix "hyphen-used-as-minus-sign". + * Add DEP3 patch headers. + + -- Olly Betts Sat, 10 Dec 2011 06:21:01 +0000 + +rlplot (1.4-3) unstable; urgency=low + + * QA upload. + * New patch remove-linux-fs-h-requirement.patch to fix build on non-Linux + platforms. + * New patch do-not-call-free-on-arrays.patch which removes two calls to + free with an array as the argument. + * debian/control: + + Add ${misc:Depends}, fixing lintian warning. + + Improve short description. + * debian/rules: Use dh_install to copy the binaries. + + -- Olly Betts Wed, 30 Nov 2011 00:16:58 +0000 + rlplot (1.5-1) experimental; urgency=low * QA upload. diff -Nru rlplot-1.5/debian/patches/do-not-call-free-on-arrays.patch rlplot-1.5/debian/patches/do-not-call-free-on-arrays.patch --- rlplot-1.5/debian/patches/do-not-call-free-on-arrays.patch 1970-01-01 00:00:00.000000000 +0000 +++ rlplot-1.5/debian/patches/do-not-call-free-on-arrays.patch 2011-12-01 23:20:06.000000000 +0000 @@ -0,0 +1,24 @@ +Description: Remove two calls to free with an array as the argument + This is bad code, invoking undefined behaviour if executed. I suspect it + never actually will be, as by default "new" in C++ throws an exception if + it fails, and I don't see anything in the rlplot code to change that. + + The issue was spotted by a new GCC warning. +Author: Olly Betts + +--- + +Origin: debian +Forwarded: via http://rlplot.sourceforge.net/Support/index.html +Last-Update: 2011-12-02 + +--- rlplot-1.5.orig/rlplot.cpp ++++ rlplot-1.5/rlplot.cpp +@@ -1396,7 +1396,6 @@ + if(yref2[0] &&((nPnt = rX->CountItems()) == (rY1->CountItems()))) { + if(!(Values = (lfPOINT *)realloc(Values, ((nPnt*2+2) * sizeof(lfPOINT))))) return; + if(!(rY2 = new AccRange(yref2))) { +- if(yref1) free(yref1); if(yref2) free(yref2); + if(rX) delete(rX); if(rY1) delete(rY1); + return; + } diff -Nru rlplot-1.5/debian/patches/fix-ftbfs-with-gold.patch rlplot-1.5/debian/patches/fix-ftbfs-with-gold.patch --- rlplot-1.5/debian/patches/fix-ftbfs-with-gold.patch 2011-11-29 10:12:46.000000000 +0000 +++ rlplot-1.5/debian/patches/fix-ftbfs-with-gold.patch 2011-12-01 23:25:13.000000000 +0000 @@ -1,4 +1,5 @@ -Patch from Ubuntu to fix FTBFS with binutils-gold (#556322): +Description: Fix build with binutils-gold + Patch from Ubuntu to fix FTBFS with binutils-gold (#556322): rlplot (1.4-1ubuntu2) natty; urgency=low @@ -8,6 +9,14 @@ -- Felix Geyer Sat, 15 Jan 2011 18:08:18 +0100 +Author: Felix Geyer + +--- +Bug-Debian: http://bugs.debian.org/556322 +Origin: ubuntu +Forwarded: no +Last-Update: 2011-01-15 + --- rlplot-1.5.orig/Makefile +++ rlplot-1.5/Makefile @@ -19,7 +19,7 @@ diff -Nru rlplot-1.5/debian/patches/fix-ftbfs-with-qt4.7.patch rlplot-1.5/debian/patches/fix-ftbfs-with-qt4.7.patch --- rlplot-1.5/debian/patches/fix-ftbfs-with-qt4.7.patch 2011-11-29 04:54:25.000000000 +0000 +++ rlplot-1.5/debian/patches/fix-ftbfs-with-qt4.7.patch 2011-12-01 23:22:15.000000000 +0000 @@ -1,4 +1,5 @@ -Patch from Ubuntu to fix FTBFS with Qt 4.7 (#610150 and #618048): +Description: Fix build with Qt 4.7 + Patch from Ubuntu to fix FTBFS with Qt 4.7 (#610150 and #618048): rlplot (1.4-1ubuntu1) maverick; urgency=low @@ -7,6 +8,15 @@ -- Felix Geyer Fri, 17 Sep 2010 21:14:41 +0200 +Author: Felix Geyer + +--- +Bug-Debian: http://bugs.debian.org/610150 +Bug-Debian: http://bugs.debian.org/618048 +Origin: ubuntu +Forwarded: via http://rlplot.sourceforge.net/Support/index.html +Last-Update: 2010-09-17 + --- rlplot-1.4.orig/QT_Spec.cpp +++ rlplot-1.4/QT_Spec.cpp @@ -1187,7 +1187,7 @@ diff -Nru rlplot-1.5/debian/patches/remove-linux-fs-h-requirement.patch rlplot-1.5/debian/patches/remove-linux-fs-h-requirement.patch --- rlplot-1.5/debian/patches/remove-linux-fs-h-requirement.patch 1970-01-01 00:00:00.000000000 +0000 +++ rlplot-1.5/debian/patches/remove-linux-fs-h-requirement.patch 2011-12-01 23:20:33.000000000 +0000 @@ -0,0 +1,19 @@ +Description: Fix build for non-Linux platforms + The header linux/fs.h doesn't actually seem to be needed! +Author: Olly Betts + +--- +Origin: debian +Forwarded: via http://rlplot.sourceforge.net/Support/index.html +Last-Update: 2011-11-30 + +--- rlplot-1.4.orig/QT_Spec.h ++++ rlplot-1.4/QT_Spec.h +@@ -50,7 +50,6 @@ + #include + #include + #include +- #include + #endif + + bool ProcMenuEvent(int id, QWidget *parent, anyOutput *OutputClass, GraphObj *BaseObj); diff -Nru rlplot-1.5/debian/patches/series rlplot-1.5/debian/patches/series --- rlplot-1.5/debian/patches/series 2011-11-29 07:20:04.000000000 +0000 +++ rlplot-1.5/debian/patches/series 2011-12-01 23:18:13.000000000 +0000 @@ -1,2 +1,4 @@ fix-ftbfs-with-gold.patch fix-ftbfs-with-qt4.7.patch +remove-linux-fs-h-requirement.patch +do-not-call-free-on-arrays.patch diff -Nru rlplot-1.5/debian/rlplot.1 rlplot-1.5/debian/rlplot.1 --- rlplot-1.5/debian/rlplot.1 2011-11-29 08:02:41.000000000 +0000 +++ rlplot-1.5/debian/rlplot.1 2011-12-10 06:20:53.000000000 +0000 @@ -66,7 +66,7 @@ output Scalable Vector Graphics, *.svg .TP .B \-S -like -s, start output with "Content-Type: image/svg+xml" +like \-s, start output with "Content-Type: image/svg+xml" .TP .B \-v print RLPlot version