[rlplot] 22/23: Suggested NMU by Gert Wollny
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 f0cb986c119cfb23d9050fe1695e66bdf6b21873
Author: Andreas Tille <tille at debian.org>
Date: Wed Jun 29 11:46:25 2016 +0200
Suggested NMU by Gert Wollny
---
debian/changelog | 14 ++++
debian/control | 11 ++-
debian/menu | 1 -
debian/patches/gcc-6.patch | 16 ++++
debian/patches/hardening_flags.patch | 142 +++++++++++++++++++++++++++++++++++
debian/patches/series | 2 +
debian/rlplot.desktop | 1 +
debian/rules | 2 +-
8 files changed, 183 insertions(+), 6 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 290c885..62c6db7 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,17 @@
+rlplot (1.5-3) UNRELEASED; urgency=medium
+
+ * QA upload.
+ * d/p/gcc-6.patch: Add patch to fix compilation with g++-6
+ Closes: #811648
+ * run "cme fix dpkg-control"
+ * remove d/menu file to quell command-in-menu-file-and-desktop-file
+ * d/rules: add debug flag to create proper automatic debug symbols
+ file
+ * d/p/hardening..: Add hardening flags to the build
+ * d/rlplot.desktop: add keywords
+
+ -- Gert Wollny <gw.fossdev at gmail.com> Tue, 28 Jun 2016 10:59:27 +0000
+
rlplot (1.5-2) unstable; urgency=low
* QA upload.
diff --git a/debian/control b/debian/control
index 3a104a8..f3dd07c 100644
--- a/debian/control
+++ b/debian/control
@@ -1,14 +1,17 @@
Source: rlplot
+Maintainer: Debian QA Group <packages at qa.debian.org>
Section: math
Priority: optional
-Maintainer: Debian QA Group <packages at qa.debian.org>
-Build-Depends: debhelper (>= 7.0.50~), libqt4-dev (>= 4.3), libx11-dev (>= 4.3)
-Standards-Version: 3.9.2
+Build-Depends: debhelper (>= 7.0.50~),
+ libqt4-dev,
+ libx11-dev
+Standards-Version: 3.9.8
Homepage: http://rlplot.sourceforge.net/
Package: rlplot
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+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
diff --git a/debian/menu b/debian/menu
deleted file mode 100644
index ffcdcc2..0000000
--- a/debian/menu
+++ /dev/null
@@ -1 +0,0 @@
-?package(rlplot): needs="X11" section="Applications/Science/Mathematics" title="RLPlot" command="rlplot"
diff --git a/debian/patches/gcc-6.patch b/debian/patches/gcc-6.patch
new file mode 100644
index 0000000..d9f464f
--- /dev/null
+++ b/debian/patches/gcc-6.patch
@@ -0,0 +1,16 @@
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Date: 2016-06-27
+Description: Correct compilation with g++-6
+Bug: https://bugs.debian.org/811648
+
+--- a/Fileio.cpp
++++ b/Fileio.cpp
+@@ -854,7 +854,7 @@
+
+ if(Notary || !g) {
+ ErrorBox("Output pending or\nno graph.");
+- return false;
++ return NULL;
+ }
+ cObsW = 0; iFile = -1;
+ cbOut = sizeOut = 0; ptr = 0L;
diff --git a/debian/patches/hardening_flags.patch b/debian/patches/hardening_flags.patch
new file mode 100644
index 0000000..16e13bf
--- /dev/null
+++ b/debian/patches/hardening_flags.patch
@@ -0,0 +1,142 @@
+Author: Gert Wollny <gw.fossdev at gmail.com>
+Description: Add hardening flags to build
+
+--- a/Makefile
++++ b/Makefile
+@@ -22,6 +22,13 @@
+ X11LIBS = -lX11 -lm -lpthread
+ SRCDIR = ./
+
++CPPFLAGS:=$(shell dpkg-buildflags --get CPPFLAGS)
++CFLAGS:=$(shell dpkg-buildflags --get CFLAGS)
++CXXFLAGS:=$(shell dpkg-buildflags --get CXXFLAGS)
++LDFLAGS:=$(shell dpkg-buildflags --get LDFLAGS)
++
++LDFLAGS2 = -Wl,--as-needed -Wl,-z,now -pie -fPIE
++
+ #######
+ ####### Declarations for Qt3
+ QT3DIR = /usr/lib/qt-3.3
+@@ -39,10 +46,10 @@
+
+ #######
+ ####### Declarations for Qt4
+-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"
++CXXFLAGS += -I/usr/include/qt4/Qt -I/usr/include/qt4 -pipe -g -O2 -fPIE -pie
+ QT4H = QT_Spec.h
+ QT4LIBS = "-L$(QT4DIR)/lib -L/usr/X11R6/lib -lQtCore -lQtGui"
+ #
+@@ -68,16 +75,16 @@
+ make exprlp
+
+ Qt4:
+- make rlplot QTDIR=$(QT4DIR) MOC=$(QT4MOC) CFLAGS=$(QT4CFLAGS) QTH=$(QT4H) $(MOC4FLAGS) LIBS=$(QT4LIBS)
++ make rlplot QTDIR=$(QT4DIR) MOC=$(QT4MOC) QTH=$(QT4H) $(MOC4FLAGS) LIBS=$(QT4LIBS)
+
+ Qt3:
+ make rlplot QTDIR=$(QT3DIR) MOC=$(QT3MOC) CFLAGS=$(QT3CFLAGS) QTH=$(QT3H) $(MOC3FLAGS) LIBS=$(QT3LIBS)
+
+ rlplot: $(OBJECTS)
+- $(CC) -o rlplot $(OBJECTS) $(LIBS) $(QTLIBS) $(X11LIBS)
++ $(CC) -o rlplot $(OBJECTS) $(LIBS) $(QTLIBS) $(X11LIBS) $(LDFLAGS) $(LDFLAGS2)
+
+ exprlp: $(GENOBJ)
+- $(CC) -o exprlp $(GENOBJ)
++ $(CC) -o exprlp $(GENOBJ) $(LDFLAGS) $(LDFLAGS2)
+
+ clean:
+ rm -f *.o *~
+@@ -88,68 +95,68 @@
+ ####### Compile
+
+ moc_QT_Spec.o: moc_QT_Spec.cpp $(SRCDIR)QT_Spec.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ moc_QT_Spec.cpp: $(SRCDIR)QT_Spec.h
+ $(MOC) $(SRCDIR)$(QTH) -o moc_QT_Spec.cpp $(MOCFLAGS)
+
+ mfcalc.o: $(SRCDIR)mfcalc.cpp
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ rlp_math.o: $(SRCDIR)rlp_math.cpp
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ #$(SRCDIR)mfcalc.cpp: $(SRCDIR)mfcalc.y
+ # bison -l -o $@ $<
+
+ exprlp.o: $(SRCDIR)exprlp.cpp
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ QT_Spec.o: $(SRCDIR)QT_Spec.cpp $(SRCDIR)QT_Spec.h $(SRCDIR)rlplot.h $(SRCDIR)menu.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ Output.o: $(SRCDIR)Output.cpp $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ Utils.o: $(SRCDIR)Utils.cpp $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ UtilObj.o: $(SRCDIR)UtilObj.cpp $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ TheDialog.o: $(SRCDIR)TheDialog.cpp $(SRCDIR)TheDialog.h $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ rlplot.o: $(SRCDIR)rlplot.cpp $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ Fileio.o: $(SRCDIR)Fileio.cpp $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ PropertyDlg.o: $(SRCDIR)PropertyDlg.cpp $(SRCDIR)rlplot.h $(SRCDIR)TheDialog.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ spreadwi.o: $(SRCDIR)spreadwi.cpp $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ Export.o: $(SRCDIR)Export.cpp $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ PlotObs.o: $(SRCDIR)PlotObs.cpp $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ ODbuttons.o: $(SRCDIR)ODbuttons.cpp $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ Axes.o: $(SRCDIR)Axes.cpp $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ no_gui.o: $(SRCDIR)no_gui.cpp $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ use_gui.o: $(SRCDIR)use_gui.cpp $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
+ reports.o: $(SRCDIR)reports.cpp $(SRCDIR)TheDialog.h $(SRCDIR)rlplot.h
+- $(CC) $(CFLAGS) -o $@ -c $<
++ $(CC) $(CXXFLAGS) $(CPPFLAGS) -o $@ -c $<
+
diff --git a/debian/patches/series b/debian/patches/series
index dec68d6..7e06fe2 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,5 @@ fix-ftbfs-with-gold.patch
fix-ftbfs-with-qt4.7.patch
remove-linux-fs-h-requirement.patch
do-not-call-free-on-arrays.patch
+gcc-6.patch
+hardening_flags.patch
diff --git a/debian/rlplot.desktop b/debian/rlplot.desktop
index 77a89ce..28f7543 100644
--- a/debian/rlplot.desktop
+++ b/debian/rlplot.desktop
@@ -7,3 +7,4 @@ Icon=RLPlot.xpm
Type=Application
Terminal=false
Categories=Education;Math
+Keywords=Plots;Graphs;
diff --git a/debian/rules b/debian/rules
index 998920e..ef3bfec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -7,7 +7,7 @@ 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"'
+ QT4CFLAGS='"-I/usr/include/qt4/Qt -I/usr/include/qt4 -pipe -g -O2"'
override_dh_install:
dh_install rlplot exprlp usr/bin
--
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