Your message dated Sat, 4 Feb 2012 15:52:33 -0500
with message-id
<CANg8-dAG-g8a33ZQ0Fc=bvs7vFqj=qgk+mkx2lkz3oeryjn...@mail.gmail.com>
and subject line duplicate
has caused the Debian Bug report #658645,
regarding scidavis: diff for NMU version 0.2.4-3.1
to be marked as done.
This means that you claim that the problem has been dealt with.
If this is not the case it is now your responsibility to reopen the
Bug report if necessary, and/or fix the problem forthwith.
(NB: If you are a system administrator and have no idea what this
message is talking about, this may indicate a serious mail system
misconfiguration somewhere. Please contact [email protected]
immediately.)
--
658645: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=658645
Debian Bug Tracking System
Contact [email protected] with problems
--- Begin Message ---
Package: scidavis
Version: 0.2.4-3
Severity: normal
Tags: patch pending
Dear maintainer,
I've prepared an NMU for scidavis (versioned as 0.2.4-3.1) and
uploaded it to DELAYED/2. Please feel free to tell me if I
should delay it longer.
Regards.
diff -Nru scidavis-0.2.4/debian/changelog scidavis-0.2.4/debian/changelog
--- scidavis-0.2.4/debian/changelog 2011-03-16 20:40:52.000000000 -0400
+++ scidavis-0.2.4/debian/changelog 2012-02-04 15:28:54.000000000 -0500
@@ -1,3 +1,17 @@
+scidavis (0.2.4-3.1) unstable; urgency=high
+
+ * Non-maintainer upload.
+ * Added --parallel flag to dh in debian/rules
+ * Move plugins to /usr/lib (Closes: #646190)
+ debian/patches/lib64.diff
+ * Fixed declaring Graph as const when it is not (Closes: #655776)
+ debian/patches/graph_const.diff
+ * Recommends on qt-assistant-compat (Closes: #624752)
+ * use dh_python2 since python-support is deprecated (cleaning up
+ lintian error)
+
+ -- Scott Howard <[email protected]> Sat, 04 Feb 2012 15:28:22 -0500
+
scidavis (0.2.4-3) unstable; urgency=low
* Add Build-Depends on libqtassistantclient-dev (Closes: #618199)
diff -Nru scidavis-0.2.4/debian/control scidavis-0.2.4/debian/control
--- scidavis-0.2.4/debian/control 2011-03-16 18:33:56.000000000 -0400
+++ scidavis-0.2.4/debian/control 2012-02-04 15:25:30.000000000 -0500
@@ -5,14 +5,15 @@
Build-Depends: debhelper (>= 7.0.50~), docbook-to-man, python,
pyqt4-dev-tools, libqt4-dev, libqt4-opengl-dev, libqwt5-qt4-dev,
libqwtplot3d-qt4-dev, libmuparser-dev, libgsl0-dev, zlib1g-dev,
- libglu1-mesa-dev, python-dev, python-qt4-dev, python-sip-dev,
- python-support, libqtassistantclient-dev
+ libglu1-mesa-dev, python-dev (>> 2.6.6-3~), python-qt4-dev, python-sip-dev,
+ libqtassistantclient-dev
Standards-Version: 3.9.1
Homepage: http://scidavis.sourceforge.net/
Package: scidavis
Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}
+Recommends: qt-assistant-compat
Description: application for scientific data analysis and visualization
SciDAVis is a free interactive application aimed at data analysis and
publication-quality plotting. It combines a shallow learning curve and
diff -Nru scidavis-0.2.4/debian/patches/graph_const.diff
scidavis-0.2.4/debian/patches/graph_const.diff
--- scidavis-0.2.4/debian/patches/graph_const.diff 1969-12-31
19:00:00.000000000 -0500
+++ scidavis-0.2.4/debian/patches/graph_const.diff 2012-02-04
15:30:47.000000000 -0500
@@ -0,0 +1,25 @@
+Description: remove const qualifier from variables that are not
+Author: Scott Howard <[email protected]>
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=655776
+Index: scidavis-0.2.4/scidavis/src/scidavis.sip
+===================================================================
+--- scidavis-0.2.4.orig/scidavis/src/scidavis.sip 2012-02-04
15:14:55.700694486 -0500
++++ scidavis-0.2.4/scidavis/src/scidavis.sip 2012-02-04 15:15:41.352695571
-0500
+@@ -926,7 +926,7 @@
+ void removeCurve(const QString&);
+ void deleteFitCurves();
+ int curves() /PyName=numCurves/;
+- QList<QwtPlotCurve*> curves() const /NoDerived/;
++ QList<QwtPlotCurve*> curves() /NoDerived/;
+ %MethodCode
+ sipRes = new QList<QwtPlotCurve*>();
+ for (int i = 0; i<sipCpp->curves(); i++)
+@@ -995,7 +995,7 @@
+ sipRes = sipCpp->d_plot->canvas();
+ %End
+
+- QPointF pickPoint() const /NoDerived/;
++ QPointF pickPoint() /NoDerived/;
+ %MethodCode
+ ApplicationWindow *app = sipscidavis_app();
+ sipRes = new QPointF();
diff -Nru scidavis-0.2.4/debian/patches/lib65.diff
scidavis-0.2.4/debian/patches/lib65.diff
--- scidavis-0.2.4/debian/patches/lib65.diff 1969-12-31 19:00:00.000000000
-0500
+++ scidavis-0.2.4/debian/patches/lib65.diff 2012-02-04 15:31:39.000000000
-0500
@@ -0,0 +1,16 @@
+Description: Don't install modules to /usr/lib
+Author: Scott Howard <[email protected]>
+Bug: http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=646190
+Index: scidavis-0.2.4/scidavis/scidavis.pro
+===================================================================
+--- scidavis-0.2.4.orig/scidavis/scidavis.pro 2012-02-04 14:43:54.884650261
-0500
++++ scidavis-0.2.4/scidavis/scidavis.pro 2012-02-04 14:44:11.640650659
-0500
+@@ -30,7 +30,7 @@
+ }
+
+ ### 64 Linux only suffix
+-linux-g++-64: libsuff = 64
++#linux-g++-64: libsuff = 64
+
+ ### where to install
+ unix: INSTALLBASE = /usr # this is what is called "prefix" when
using GNU autotools
diff -Nru scidavis-0.2.4/debian/patches/series
scidavis-0.2.4/debian/patches/series
--- scidavis-0.2.4/debian/patches/series 2011-03-16 19:02:30.000000000
-0400
+++ scidavis-0.2.4/debian/patches/series 2012-02-04 15:09:08.000000000
-0500
@@ -1,2 +1,4 @@
sourcefiles_pri.diff
scidavis_pro.diff
+lib65.diff
+graph_const.diff
diff -Nru scidavis-0.2.4/debian/pycompat scidavis-0.2.4/debian/pycompat
--- scidavis-0.2.4/debian/pycompat 2010-03-26 13:27:38.000000000 -0400
+++ scidavis-0.2.4/debian/pycompat 1969-12-31 19:00:00.000000000 -0500
@@ -1 +0,0 @@
-2
diff -Nru scidavis-0.2.4/debian/rules scidavis-0.2.4/debian/rules
--- scidavis-0.2.4/debian/rules 2011-03-16 20:40:42.000000000 -0400
+++ scidavis-0.2.4/debian/rules 2012-02-04 15:26:26.000000000 -0500
@@ -1,7 +1,7 @@
#!/usr/bin/make -f
%:
- dh $@ --buildsystem=qmake
+ dh $@ --buildsystem=qmake --parallel --with python2
override_dh_auto_build:
docbook-to-man man/manpage.sgml > debian/scidavis.1
--- End Message ---
--- Begin Message ---
delete duplicate
--- End Message ---
