[rlplot] 21/23: Imported Debian patch 1.5-2
Andreas Tille
tille at debian.org
Wed Jun 29 09:51:00 UTC 2016
This is an automated email from the git hooks/post-receive script.
tille pushed a commit to branch master
in repository rlplot.
commit 1bf76f79f460f64cda756f8a27b2bcd9f651dd59
Author: Olly Betts <olly at survex.com>
Date: Sat Dec 10 06:21:01 2011 +0000
Imported Debian patch 1.5-2
---
debian/changelog | 22 ++++++++++++++++++++
debian/patches/do-not-call-free-on-arrays.patch | 24 ++++++++++++++++++++++
debian/patches/fix-ftbfs-with-gold.patch | 11 +++++++++-
debian/patches/fix-ftbfs-with-qt4.7.patch | 12 ++++++++++-
debian/patches/remove-linux-fs-h-requirement.patch | 19 +++++++++++++++++
debian/patches/series | 2 ++
debian/rlplot.1 | 2 +-
7 files changed, 89 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 2bc4044..290c885 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -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 <olly at survex.com> 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 <olly at survex.com> Wed, 30 Nov 2011 00:16:58 +0000
+
rlplot (1.5-1) experimental; urgency=low
* QA upload.
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..c95e651
--- /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: 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 --git a/debian/patches/fix-ftbfs-with-gold.patch b/debian/patches/fix-ftbfs-with-gold.patch
index e40ec34..c72103b 100644
--- a/debian/patches/fix-ftbfs-with-gold.patch
+++ b/debian/patches/fix-ftbfs-with-gold.patch
@@ -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 @@ Patch from Ubuntu to fix FTBFS with binutils-gold (#556322):
-- Felix Geyer <debfx-pkg at fobos.de> Sat, 15 Jan 2011 18:08:18 +0100
+Author: Felix Geyer <debfx-pkg at fobos.de>
+
+---
+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 --git a/debian/patches/fix-ftbfs-with-qt4.7.patch b/debian/patches/fix-ftbfs-with-qt4.7.patch
index 290bbb7..f33a71a 100644
--- a/debian/patches/fix-ftbfs-with-qt4.7.patch
+++ b/debian/patches/fix-ftbfs-with-qt4.7.patch
@@ -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 @@ Patch from Ubuntu to fix FTBFS with Qt 4.7 (#610150 and #618048):
-- Felix Geyer <debfx-pkg at fobos.de> Fri, 17 Sep 2010 21:14:41 +0200
+Author: Felix Geyer <debfx-pkg at fobos.de>
+
+---
+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 --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..4f236e0
--- /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: 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 <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/rlplot.1 b/debian/rlplot.1
index b082ea7..974210f 100644
--- a/debian/rlplot.1
+++ b/debian/rlplot.1
@@ -66,7 +66,7 @@ output Encapsulated PostScript, *.eps
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
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/rlplot.git
More information about the debian-science-commits
mailing list