[rlplot] 19/23: Imported Debian patch 1.4-3

[Andreas Tille]

This is an automated email from the git hooks/post-receive script.

tille pushed a commit to branch master
in repository rlplot.

commit 54946161bcfcf413933c20352eb2a418838c611f
Author: Olly Betts <olly at survex.com>
Date:   Wed Nov 30 00:16:58 2011 +0000

    Imported Debian patch 1.4-3
---
 debian/changelog                                   | 14 +++++++++++++
 debian/control                                     |  4 ++--
 debian/patches/do-not-call-free-on-arrays.patch    | 24 ++++++++++++++++++++++
 debian/patches/remove-linux-fs-h-requirement.patch | 19 +++++++++++++++++
 debian/patches/series                              |  2 ++
 debian/rules                                       |  4 +---
 6 files changed, 62 insertions(+), 5 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index b0a343f..5e70311 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+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 <olly at survex.com>  Wed, 30 Nov 2011 00:16:58 +0000
+
 rlplot (1.4-2) unstable; urgency=low
 
   * QA upload.
diff --git a/debian/control b/debian/control
index 9ea0b4b..3a104a8 100644
--- a/debian/control
+++ b/debian/control
@@ -8,8 +8,8 @@ Homepage: http://rlplot.sourceforge.net/
 
 Package: rlplot
 Architecture: any
-Depends: ${shlibs:Depends}
-Description: Generate publication quality graphs
+Depends: ${shlibs:Depends}, ${misc:Depends}
+Description: GUI application for generating publication quality graphs
  RLPlot is a GUI based program for displaying scientific data in 
  standard formats. It has full support for all error-bar types and 
  it has greater flexibility with displaying colour and texture in 
diff --git a/debian/patches/do-not-call-free-on-arrays.patch b/debian/patches/do-not-call-free-on-arrays.patch
new file mode 100644
index 0000000..28a6ae5
--- /dev/null
+++ b/debian/patches/do-not-call-free-on-arrays.patch
@@ -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 <olly at survex.com>
+
+---
+
+Origin: debian
+Forwarded: no
+Last-Update: 2011-11-30
+
+--- rlplot-1.4.orig/rlplot.cpp
++++ rlplot-1.4/rlplot.cpp
+@@ -1391,7 +1391,6 @@ DataLine::SetValues()
+ 	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 --git a/debian/patches/remove-linux-fs-h-requirement.patch b/debian/patches/remove-linux-fs-h-requirement.patch
new file mode 100644
index 0000000..b09c029
--- /dev/null
+++ b/debian/patches/remove-linux-fs-h-requirement.patch
@@ -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 <olly at survex.com>
+
+---
+Origin: debian
+Forwarded: no
+Last-Update: 2011-11-30
+
+--- rlplot-1.4.orig/QT_Spec.h
++++ rlplot-1.4/QT_Spec.h
+@@ -50,7 +50,6 @@
+ 	#include <fcntl.h>
+ 	#include <unistd.h>
+ 	#include <sys/ioctl.h>
+-	#include <linux/fs.h> 
+ #endif
+ 
+ bool ProcMenuEvent(int id, QWidget *parent, anyOutput *OutputClass, GraphObj *BaseObj);
diff --git a/debian/patches/series b/debian/patches/series
index 33f446f..dec68d6 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -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 --git a/debian/rules b/debian/rules
index 4fde353..c96be6b 100755
--- a/debian/rules
+++ b/debian/rules
@@ -10,9 +10,7 @@ override_dh_auto_build:
 	     QT4CFLAGS='"-I/usr/include/qt4/Qt -I/usr/include/qt4 -pipe -O2"'
 
 override_dh_install:
-	install ./rlplot debian/rlplot/usr/bin
-	install ./exprlp debian/rlplot/usr/bin
-	dh_install
+	dh_install rlplot exprlp usr/bin
 	dh_install RLPlot.xpm usr/share/pixmaps
 	# Shouldn't be executable:
 	chmod a-x debian/rlplot/usr/share/pixmaps/RLPlot.xpm

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/rlplot.git