[rlplot] 15/23: Imported Debian patch 1.4-1
Andreas Tille
tille at debian.org
Wed Jun 29 09:50:57 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 6d00344c0a328a7663d88ce72cf9bb30704ff5af
Merge: afab1a7 947649a
Author: James Stone <jamesmstone at gmail.com>
Date: Sun Sep 16 21:33:38 2007 +0100
Imported Debian patch 1.4-1
Axes.cpp | 189 +-
Export.cpp | 813 ++---
Fileio.cpp | 10 +-
Makefile | 63 +-
ODbuttons.cpp | 19 +-
Output.cpp | 28 +-
PlotObs.cpp | 175 +-
PropertyDlg.cpp | 1113 ++++---
QT_Spec.h => QT3_Spec.h | 632 ++--
QT_Spec.cpp | 7318 ++++++++++++++++++++++++-------------------
QT_Spec.h | 666 ++--
README | 111 +-
RLPLOT.ICO | Bin
RLPlot.bmp | Bin
RLPlot.xpm | 0
TheDialog.cpp | 244 +-
TheDialog.h | 5 +-
UtilObj.cpp | 189 +-
Utils.cpp | 53 +-
Version.h | 2 +-
WinSpec.cpp | 129 +-
debian/changelog | 9 +
debian/control | 2 +-
debian/menu | 2 +-
debian/rlplot.desktop | 2 +-
debian/rules | 3 +-
menu.h | 14 +-
mfcalc.cpp | 1872 +++++++----
mfcalc.y | 994 ++++--
reports.cpp | 1439 ++++++++-
rlp_math.cpp | 320 +-
rlplot.cpp | 661 ++--
rlplot.h | 80 +-
RLPLOT.RC => rlplot.rc | 9 +-
rlplot.spec | 7 +-
rlplot.spec => rlplot.spec~ | 0
spreadwi.cpp | 71 +-
use_gui.cpp | 83 +-
38 files changed, 10591 insertions(+), 6736 deletions(-)
diff --cc Makefile
index 6e072b2,aacf7b2..817b4f4
--- a/Makefile
+++ b/Makefile
@@@ -27,10 -24,21 +24,24 @@@ CC = g+
X11LIBS = -lX11 -lm
SRCDIR = ./
-QT3DIR = /usr/lib/qt-3.3
-QT3MOC = /usr/lib/qt-3.3/bin/moc
++BIN = $(DESTDIR)/usr/bin
++MAN= $(DESTDIR)/usr/share/man/man1
++
++QT3DIR = /usr/share/qt-3
++QT3MOC = /usr/share/qt-3/bin/moc
+ MOC3FLAGS =
+ QT3CFLAGS = "-I$(QT3DIR)/include -pipe -O2"
+ QT3H = QT3_Spec.h
+ QT3LIBS = "-L$(QT3DIR)/lib -L/usr/X11R6/lib -lqt-mt"
+
-QT4DIR = /usr/lib/qt4
-QT4MOC = /usr/lib/qt4/bin/moc-qt4
++QT4DIR = /usr/share/qt4
++QT4MOC = /usr/share/qt4/bin/moc
+ MOC4FLAGS = "MOCFLAGS=-DQT_VERSION=0x040000"
-QT4CFLAGS = "-I/usr/include/Qt -pipe -O2"
++QT4CFLAGS = "-I/usr/include/qt4/Qt -I/usr/include/qt4 -pipe -O2"
+ QT4H = QT_Spec.h
+ QT4LIBS = "-L$(QT4DIR)/lib -L/usr/X11R6/lib -lQtCore -lQtGui -lQtNetwork"
+
+
GENOBJ = exprlp.o rlplot.o Output.o Utils.o UtilObj.o\
Fileio.o Export.o PlotObs.o Axes.o mfcalc.o rlp_math.o no_gui.o
@@@ -50,14 -63,9 +66,16 @@@ rlplot: $(OBJECTS
exprlp: $(GENOBJ)
$(CC) -o exprlp $(GENOBJ)
+install:
+ install -d $(BIN) $(MAN)
+ install ./rlplot $(BIN)
+ install ./exprlp $(BIN)
+
clean:
rm -f *.o *~
-- rm moc_QT_Spec.cpp
++ rm -f moc_QT_Spec.cpp
++ rm -f rlplot
++ rm -f exprlp
####### Compile
diff --cc debian/changelog
index 807a91f,0000000..d63c57d
mode 100644,000000..100644
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,110 -1,0 +1,119 @@@
++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/control
index 45a19d9,0000000..d6775b1
mode 100644,000000..100644
--- a/debian/control
+++ b/debian/control
@@@ -1,19 -1,0 +1,19 @@@
+Source: rlplot
+Section: math
+Priority: optional
+Maintainer: James Stone <jamesmstone at gmail.com>
- Build-Depends: debhelper (>= 4.0.0), libqt3-mt-dev (>= 3), libx11-dev (>= 4.3)
++Build-Depends: debhelper (>= 4.0.0), libqt4-dev (>= 4.3), libx11-dev (>= 4.3)
+Standards-Version: 3.7.2
+
+Package: rlplot
+Architecture: any
+Depends: ${shlibs:Depends}
+Description: Generate 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
+ charts than gnuplot (filled bar chart boxes are possible without
+ any additional programs). Output is generated on the X display where
+ further changes can be made to the graph using point and click methods.
+ Images can be exported as scalable vector graphics (SVG) as well as
+ EPS, WMF and TIFF formats.
diff --cc debian/menu
index 2fb92ed,0000000..ffcdcc2
mode 100644,000000..100644
--- a/debian/menu
+++ b/debian/menu
@@@ -1,1 -1,0 +1,1 @@@
- ?package(rlplot): needs="X11" section="Apps/Math" title="RLPlot" command="rlplot"
++?package(rlplot): needs="X11" section="Applications/Science/Mathematics" title="RLPlot" command="rlplot"
diff --cc debian/rlplot.desktop
index 429d890,0000000..9f94d48
mode 100644,000000..100644
--- a/debian/rlplot.desktop
+++ b/debian/rlplot.desktop
@@@ -1,10 -1,0 +1,10 @@@
+[Desktop Entry]
+Version=1.1.2
+Encoding=UTF-8
+Name=Rlplot Graph Generator
+Comment=Generate publication quality graphs
+Exec=rlplot
+Icon=RLPlot.xpm
+Type=Application
+Terminal=false
- Categories=Application;Math;Science;
++Categories=Education;Math
diff --cc debian/rules
index 347c7cb,0000000..b2945f8
mode 100755,000000..100755
--- a/debian/rules
+++ b/debian/rules
@@@ -1,93 -1,0 +1,94 @@@
+#!/usr/bin/make -f
+# -*- makefile -*-
+# Sample debian/rules that uses debhelper.
+# GNU copyright 1997 to 1999 by Joey Hess.
+#
+# Modified to make a template file for a multi-binary package with separated
+# build-arch and build-indep targets by Bill Allombert 2001
+
+# Uncomment this to turn on verbose mode.
+#export DH_VERBOSE=1
+
+# This has to be exported to make some magic below work.
+export DH_OPTIONS
+
+ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS)))
+ INSTALL_PROGRAM += -s
+endif
+
+configure: configure-stamp
+configure-stamp:
+ dh_testdir
+ # Add here commands to configure the package.
+
+ touch configure-stamp
+
+
+#Architecture
+build: build-arch
+
+build-arch: build-arch-stamp
+build-arch-stamp: configure-stamp
+
+ # Add here commands to compile the arch part of the package.
+ $(MAKE)
+ touch build-arch-stamp
+
+# Build architecture-independent files here.
+binary-indep: build install
+# We have nothing to do by default.
+
+clean:
+ dh_testdir
+ dh_testroot
+ rm -f build-arch-stamp
++ rm -f configure-stamp
+
+ # Add here commands to clean up after the build process.
- -$(MAKE) clean
++ $(MAKE) clean
+
+ dh_clean
+
+install: install-arch
+
+install-arch:
+ dh_testdir
+ dh_testroot
+ dh_clean -k -s
+ dh_installdirs -s
+
+ # Add here commands to install the arch part of the package into
+ # debian/tmp.
+ $(MAKE) install DESTDIR=$(CURDIR)/debian/rlplot
+
+ dh_install -s
+# Must not depend on anything. This is to be called by
+# binary-arch/binary-indep
+# in another 'make' thread.
+binary-common:
+ dh_testdir
+ dh_testroot
+ dh_install RLPlot.xpm usr/share/pixmaps
+ dh_install debian/rlplot.desktop usr/share/applications
+ dh_installchangelogs
+ dh_installdocs
+ dh_installexamples
+ dh_installmenu
+ dh_installman debian/rlplot.1
+ dh_link usr/share/man/man1/rlplot.1 usr/share/man/man1/exprlp.1
+ dh_strip
+ dh_compress
+ dh_fixperms
+ dh_makeshlibs
+ dh_installdeb
+ dh_shlibdeps
+ dh_gencontrol
+ dh_md5sums
+ dh_builddeb
+
+# Build architecture dependant packages using the common target.
+binary-arch: build-arch install-arch
+ $(MAKE) -f debian/rules DH_OPTIONS=-a binary-common
+
+binary: binary-arch binary-indep
+.PHONY: build clean binary-indep binary-arch binary install install-arch configure
--
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