tags 624752 + patch
tags 624752 + pending
tags 646190 + patch
tags 646190 + pending
tags 655776 + patch
tags 655776 + pending
tags 658644 + patch
tags 658644 + pending
thanks
Hello again,
I only really care about those bugs (especially the RC ones)
so I've stripped it down to just handle bugs.
I've prepared an NMU for scidavis (versioned as 0.2.4-3.1) and
uploaded it to DELAYED/10. 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-07 12:15:31.000000000 -0500
@@ -1,3 +1,14 @@
+scidavis (0.2.4-3.1) unstable; urgency=low
+
+ * Non-maintainer upload. (Closes: #658644)
+ * 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)
+
+ -- Scott Howard <show...@debian.org> Tue, 07 Feb 2012 12:14:34 -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-07 12:17:00.000000000 -0500
@@ -13,6 +13,7 @@
Package: scidavis
Architecture: any
Depends: ${shlibs:Depends}, ${misc: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 <show...@debian.org>
+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/lib64.diff
scidavis-0.2.4/debian/patches/lib64.diff
--- scidavis-0.2.4/debian/patches/lib64.diff 1969-12-31 19:00:00.000000000
-0500
+++ scidavis-0.2.4/debian/patches/lib64.diff 2012-02-06 00:53:53.000000000
-0500
@@ -0,0 +1,16 @@
+Description: Install plugins in /usr/lib instead of /usr/lib64
+Author: Scott Howard <show...@debian.org>
+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-06 00:51:07.000000000
-0500
@@ -1,2 +1,4 @@
sourcefiles_pri.diff
scidavis_pro.diff
+lib64.diff
+graph_const.diff
--
To UNSUBSCRIBE, email to debian-bugs-rc-requ...@lists.debian.org
with a subject of "unsubscribe". Trouble? Contact listmas...@lists.debian.org
