[rlplot] 20/23: Imported Debian patch 1.5-1
Andreas Tille
tille at debian.org
Wed Jun 29 09:50:59 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 45640d62f90be2c358f3a14a39f71ea7440d5748
Merge: 5494616 2b3b5e3
Author: Olly Betts <olly at survex.com>
Date: Tue Nov 29 09:58:35 2011 +0000
Imported Debian patch 1.5-1
.kdbgrc.rlplot | 18 +
Axes.cpp | 4130 ++--
Export.cpp | 2170 +-
Fileio.cpp | 7985 ++++----
Makefile | 42 +-
ODbuttons.cpp | 3084 +--
Output.cpp | 3919 ++--
PlotObs.cpp | 11865 +++++------
PropertyDlg.cpp | 19991 +++++++++---------
QT3_Spec.h | 17 +-
QT_Spec.cpp | 411 +-
QT_Spec.h | 16 +-
RLPLOT.RC | 307 +
TheDialog.cpp | 9974 ++++-----
TheDialog.h | 1120 +-
UtilObj.cpp | 8115 ++++----
Utils.cpp | 5022 ++---
Version.h | 4 +-
WinSpec.cpp | 378 +-
WinSpec.h | 9 +-
debian/changelog | 10 +-
debian/copyright | 2 +-
debian/dirs | 2 -
debian/patches/do-not-call-free-on-arrays.patch | 24 -
debian/patches/fix-ftbfs-with-gold.patch | 12 +-
debian/patches/remove-linux-fs-h-requirement.patch | 19 -
debian/patches/series | 2 -
debian/rules | 6 -
exprlp.cpp | 488 +-
menu.h | 213 +-
mfcalc.cpp | 1096 +-
mfcalc.y | 241 +-
no_gui.cpp | 1175 +-
reports.cpp | 6323 +++---
rlp_math.cpp | 5235 ++---
rlplot.cpp | 20483 ++++++++++---------
rlplot.h | 6018 +++---
rlplot.spec | 5 +-
rlplot.spec~ | 70 -
spreadwi.cpp | 5293 ++---
use_gui.cpp | 3870 ++--
41 files changed, 65899 insertions(+), 63265 deletions(-)
diff --cc debian/changelog
index 5e70311,0000000..2bc4044
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,156 -1,0 +1,154 @@@
- rlplot (1.4-3) unstable; urgency=low
++rlplot (1.5-1) experimental; 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.
++ * New upstream version. (Closes: #610235)
++ + Upstream Makefile "clean" target fixed, so drop our workaround.
+ * 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
++ -- Olly Betts <olly at survex.com> Tue, 29 Nov 2011 09:58:35 +0000
+
+rlplot (1.4-2) unstable; urgency=low
+
+ * QA upload.
+ + Orphaned, so set maintainer to QA group.
+ * New patch fix-ftbfs-with-gold.patch from Ubuntu to fix FTBFS with gold or
+ --no-add-needed. (Closes: #556322)
+ * New patch fix-ftbfs-with-qt4.7.patch from Ubuntu which replaces 'QString
+ foo(0);' with 'QString foo;' to fix FTBFS with Qt 4.7.
+ (Closes: #618048, #610150)
+ * Clear executable bit on /usr/share/pixmaps/RLPlot.xpm, fixing lintian
+ warning.
+ * debian/rules: Rewrite to use dh.
+ * debian/copyright: Update to point to GPL-2; update copyright holders and
+ years.
+ * Don't package upstream README - debian/copyright has the licence
+ information, and the details about how to build it aren't relevant to
+ those who have installed a binary package.
+ * debian/rlplot.1: Fix typo; fix hyphens to be dashes (fixes lintian
+ warning).
+ * debian/rlplot.desktop: Remove deprecated Encoding field.
+
+ -- Olly Betts <olly at survex.com> Tue, 29 Nov 2011 06:41:40 +0000
+
+rlplot (1.4-1) unstable; urgency=low
+
+ * New upstream release
+ * Fixes to lintian warnings
+ * Fixes to repeat build problem (Closes: #442721)
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jamesmstone at gmail.com> Sun, 16 Sep 2007 21:33:38 +0100
+
+rlplot (1.3-1) unstable; urgency=low
+
+ * New upstream release
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jamesmstone at gmail.com> Mon, 9 Apr 2007 00:12:35 +0100
+
+rlplot (1.2-1) unstable; urgency=low
+
+ * New upstream release (Closes: #408935)
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jamesmstone at gmail.com> Mon, 29 Jan 2007 19:31:26 +0000
+
+rlplot (1.1.2-2) unstable; urgency=low
+
+ * Added binary-indep target to rules file (Closes: #395742)
+ * Added .desktop file and icon (thanks to Vassilis Pandis) (Closes: #375768)
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jamesmstone at gmail.com> Sat, 11 Nov 2006 21:09:11 +0000
+
+rlplot (1.1.2-1) unstable; urgency=low
+
+ * New upstream release
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jamesmstone at gmail.com> Sat, 27 May 2006 21:44:40 +0100
+
+rlplot (1.1-1.1) unstable; urgency=low
+
+ * NMU as part of the GCC 4.1 transition.
+ * Remove extra qualification from C++ header file. closes: #358286
+
+ -- Martin Michlmayr <tbm at cyrius.com> Fri, 26 May 2006 20:24:18 +0200
+
+rlplot (1.1-1) unstable; urgency=low
+
+ * New upstream release
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jmstone at dsl.pipex.com> Sun, 5 Mar 2006 13:11:52 +0000
+
+rlplot (1.0-1) unstable; urgency=low
+
+ * New upstream release
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jmstone at dsl.pipex.com> Fri, 16 Sep 2005 21:08:37 +0100
+
+rlplot (0.99.14-2) unstable; urgency=low
+
+ * Rebuild due to new version of libqt3-mt. closes: #327960
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jmstone at dsl.pipex.com> Wed, 14 Sep 2005 15:41:17 +0100
+
+rlplot (0.99.14-1) unstable; urgency=low
+
+ * New upstream release
+ * Removed build-depends on libstdc++5-3.3-dev.
+ * Upstream change to TheDialog.cpp. closes: #288411
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jmstone at dsl.pipex.com> Tue, 15 Feb 2005 16:58:11 +0000
+
+rlplot (0.99.12-1) unstable; urgency=low
+
+ * New upstream release
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jmstone at dsl.pipex.com> Wed, 22 Dec 2004 16:05:26 +0000
+
+rlplot (0.99.9-1) unstable; urgency=low
+
+ * New upstream release
+ * Updated copyright file since this release is built from tarball 0.99.9b
+ not CVS
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jmstone at dsl.pipex.com> Sat, 9 Oct 2004 13:09:10 +0100
+
+rlplot (0.99.7-2) unstable; urgency=low
+
+ * Remove libc6 build dependency. Closes: #267871
+ * Updated copyright file to reflect fact that source code was from CVS not
+ tarball.
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jmstone at dsl.pipex.com> Fri, 27 Aug 2004 23:27:05 +0100
+
+rlplot (0.99.7-1) unstable; urgency=low
+
+ * New upstream release. Numbering system now in line with upstream.
+ * Upload sponsored by Matthew Palmer <mpalmer at debian.org>
+
+ -- James Stone <jmstone at dsl.pipex.com> Tue, 10 Aug 2004 16:47:51 +0100
+
+rlplot (0.99.4-1) unstable; urgency=low
+
+ * New upstream release
+
+ -- James Stone <jmstone at dsl.pipex.com> Thu, 1 Jul 2004 00:49:35 +0100
+
+rlplot (0.99.3-1) unstable; urgency=low
+
+ * Initial Release. closes: #237116
+
+ -- James Stone <jmstone at dsl.pipex.com> Fri, 16 Apr 2004 20:58:02 +0100
+
diff --cc debian/copyright
index 1131cc6,0000000..ed158e4
mode 100644,000000..100644
--- a/debian/copyright
+++ b/debian/copyright
@@@ -1,25 -1,0 +1,25 @@@
+This package was debianized by James Stone <jmstone at dsl.pipex.com> on
+Fri, 16 Apr 2004 19:26:24 +0100.
+
+It was downloaded from http://rlplot.sourceforge.net/
+
+Upstream Author: Reinhard Lackner <reinhard.lackner at uibk.ac.at>
+
+This software is:
+
- Copyright (c) 2000-2007 Reinhard Lackner
++ Copyright (c) 2000-2008 Reinhard Lackner
+ Copyright (C) 1998 Ross Ihaka
+ Copyright (C) 2000-2005 The R Development Core Team
+
+RLPlot is free software; you can redistribute it and/or modify
+it under the terms of the GNU General Public License as published by
+the Free Software Foundation; either version 2 of the License, or
+(at your option) any later version.
+
+RLPlot is distributed in the hope that it will be useful,
+but WITHOUT ANY WARRANTY; without even the implied warranty of
+MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
+GNU General Public License for more details.
+
+On Debian systems, the complete text of the GNU General Public
+License can be found in the file `/usr/share/common-licenses/GPL-2'.
diff --cc debian/patches/fix-ftbfs-with-gold.patch
index c7bd8e9,0000000..e40ec34
mode 100644,000000..100644
--- a/debian/patches/fix-ftbfs-with-gold.patch
+++ b/debian/patches/fix-ftbfs-with-gold.patch
@@@ -1,30 -1,0 +1,30 @@@
+Patch from Ubuntu to fix FTBFS with binutils-gold (#556322):
+
+ rlplot (1.4-1ubuntu2) natty; urgency=low
+
+ * Fix FTBFS with ld --no-add-needed.
+ - Rearrange linker arguments.
+ - Link against pthread.
+
+ -- Felix Geyer <debfx-pkg at fobos.de> Sat, 15 Jan 2011 18:08:18 +0100
+
- --- rlplot-1.4.orig/Makefile
- +++ rlplot-1.4/Makefile
- @@ -21,7 +21,7 @@
- # visit: http://www.trolltech.com for download and licence information
++--- rlplot-1.5.orig/Makefile
+++++ rlplot-1.5/Makefile
++@@ -19,7 +19,7 @@
++ #
+ #
+ CC = g++
+-X11LIBS = -lX11 -lm
++X11LIBS = -lX11 -lm -lpthread
+ SRCDIR = ./
+
- QT3DIR = /usr/lib/qt-3.3
- @@ -58,7 +58,7 @@
++ #######
++@@ -74,7 +74,7 @@
+ make rlplot QTDIR=$(QT3DIR) MOC=$(QT3MOC) CFLAGS=$(QT3CFLAGS) QTH=$(QT3H) $(MOC3FLAGS) LIBS=$(QT3LIBS)
+
+ rlplot: $(OBJECTS)
+- $(CC) $(LIBS) -o rlplot $(OBJECTS) $(QTLIBS) $(X11LIBS)
++ $(CC) -o rlplot $(OBJECTS) $(LIBS) $(QTLIBS) $(X11LIBS)
+
+ exprlp: $(GENOBJ)
+ $(CC) -o exprlp $(GENOBJ)
diff --cc debian/patches/series
index dec68d6,0000000..33f446f
mode 100644,000000..100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@@ -1,4 -1,0 +1,2 @@@
+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 --cc debian/rules
index c96be6b,0000000..998920e
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,27 -1,0 +1,21 @@@
+#!/usr/bin/make -f
+
+%:
+ dh $@
+
+override_dh_auto_build:
+ # Override incorrect (for debian) values in upstream Makefile:
+ make QT4DIR=/usr/share/qt4 \
+ QT4MOC=/usr/share/qt4/bin/moc \
+ QT4CFLAGS='"-I/usr/include/qt4/Qt -I/usr/include/qt4 -pipe -O2"'
+
+override_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
+ dh_install debian/rlplot.desktop usr/share/applications
+
+override_dh_installman:
+ dh_installman debian/rlplot.1
+ dh_link usr/share/man/man1/rlplot.1 usr/share/man/man1/exprlp.1
-
- override_dh_auto_clean:
- # Upstream's Makefile tries to rm moc_QT_Spec.cpp without -f in "clean"
- # which will fail if that file doesn't exist, so just reimplement it
- # here and also remove the binaries:
- rm -f *.o *~ moc_QT_Spec.cpp rlplot exprlp
--
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