Please merge qtiplot 0.9.8-1 (universe) from Debian unstable (main)

Bug #605027 reported by Alex Valavanis
28
This bug affects 2 people
Affects Status Importance Assigned to Milestone
qtiplot (Debian)
Invalid
Undecided
Unassigned
qtiplot (Ubuntu)
Fix Released
Wishlist
Unassigned

Bug Description

Binary package hint: qtiplot

Current version cannot be installed due to Qt Assistant changes in Qt 4.7 (bug #598826) so we need to add Build-Depends: libqtassistantclient-dev and Depends: qt-assistant-compat to debian/control. Now would be a good time to merge with the latest Debian version.

FFE application:
Lots of minor (and some major) bug fixes and feature improvements. The current version of qtiplot in maverick FTBFS, so we either must do this merge or at least patch the current version to use the packages listed above. There are some new features which have been in testing in Debian for a month. This bug has been active over a month (before FF) with user testing. The hold up was generating a clean patch, and there now is a clean debdiff. Debdiff and build log is below.

Upstream changelog:
What's new in QtiPlot 0.9.7.11:
· Easy import of data from Excel workbooks (.xls files) and from Open Document Format spreadsheets (.ods files).
· Lowess data smoothing (thanks to Jonas Bähr).
· QtiPlot now recognizes a lot of fundamental constants: the user can type pi, Pi, e, c, h, hbar, k, Na, g, etc... in a spin box and the constant is automatically calculated (see the user manual fore more details).
· Implemented an Origin-like image profile plot tool.
· Added two new zoom tools for horizontal and vertical zooming/panning.
· Added two format options for time scales: "M" (used to display minutes as: h*60 + m) and "S" (used to display the total number of seconds).
· Improved copy/paste of plot layers.
· Improved export to the SVG format.
· Modified the layer geometry dialog so that it operates on the layer canvas area, thus making the alignment of layers a lot easier.
· Added the possibility to customize x/y zero lines in an Origin-like manner: they have the same pen as the yLeft/xBottom axes.
· Fixed the behavior of data reader tools with respect to non numerical data.

What's new in QtiPlot 0.9.7.13:
· Now every aspect of a curve can be predefined by the user via the curves tab in the preferences dialog.
· It is also possibile to customize the default list of curve colors and symbols.
· With the newly added support for transparency in filled curves you can realize even more beautiful graphs.
· Added the possibility to link the X axes of all layers in a plot window.
· Implemented the possibility to hide first/last ticks and labels of a plot axis.
· Improved autoscaling when using log scales.
· Added the possibility to define a custom grid of plot layers from selected table columns.
· It is now easier than ever to create custom grids of layers using the improved Arrange layers dialog.
· Fixed exporting of legend symbols.

What's new in QtiPlot 0.9.7.14:
· This release highly improves the import of Origin project files: all versions starting with 6.0 are now fully supported.
· New analysis tools for 2D plot curves were added: a subtract straight line tool and a subtract reference data tool.
· A new extract worksheet data dialog was added allowing users to easily filter table values.
· Improved the ASCII import dialog: now it is possible to specify the type of data to be imported.
· Implemented automatic axes labeling for 2D plots.
· The import of Excel spreadsheets with date/time cells was improved.
· Improved the 2D plot dialog and the arrange layers dialog.
· Fixed a few minor bugs.

What's new in QtiPlot 0.9.8:
This release highly improves QtiPlot's interoperability with Microsoft Excel:
· Tables/matrices can now be exported as .xls files.
· The import of Excel spreadsheets was improved.
· On Windows, if Excel is installed on your computer, QtiPlot also imports the charts from your workbooks.

· The import of Origin project files was also highly improved.
· The look and feel of the fit wizard was improved.
· The import ASCII wizard was also improved: now the date/time format of data columns can be easily specified by the user during the import process.

Debian changelog entries follow:

 qtiplot (0.9.8-1) unstable; urgency=low

   * New upstream release
   * Bump standards version to 3.9.0
   * Change python version to 2.6

 -- Gudjon I. Gudjonsson <email address hidden> Sun, 25 Jul 2010 16:29:05 +0200 qtiplot (0.9.7.14-1) unstable; urgency=low

   * New upstream release
   * Build QTeXEngine into program
   * Bump liborigin2 dependency to >=1:06042009+svn1724
   * Bump muparser dependency to 1.32
 -- Gudjon I. Gudjonsson <email address hidden> Sun, 23 May 2010 10:17:19 +0200

qtiplot (0.9.7.13-1) UNRELEASED; urgency=low

   * New upstream release
   * Switch to dpkg-source 3.0 (quilt) format
   * Minor fix to patch 01_build_system.diff
   * Add qwtplot3d to build.conf
   * Bump standards version to 3.8.4
   * Fix spelling errors in description
   * Add misc depends in qtiplot-doc
   * Remove patch 02_docbook_stylesheet and
     04_add_includes.diff
   * Rename 03_fix_qti_wordlist.txt_path to
     02_fix_paths.diff
 -- Gudjon I. Gudjonsson <email address hidden> Wed, 28 Apr 2010 08:50:00 +0200

Tags: patch

Related branches

description: updated
Revision history for this message
Bhavani Shankar (bhavi) wrote :

hello alex

according to scott's comments there he has already worked on a new version incorporating ubuntu qt 4.7 change it can be synced through once he uploads btw my patch is attached there..

Your views please

regards

Bhavani Shankar (bhavi)
Changed in qtiplot (Ubuntu):
status: New → In Progress
assignee: nobody → Bhavani Shankar (bhavi)
Revision history for this message
Bhavani Shankar (bhavi) wrote : Re: Please merge with 0.9.7.14-1 from Debian unstable
Changed in qtiplot (Ubuntu):
status: In Progress → Confirmed
assignee: Bhavani Shankar (bhavi) → nobody
summary: - Please merge with 0.9.7.14-1 from Debian testing
+ Please merge with 0.9.7.14-1 from Debian unstable
Revision history for this message
Alex Valavanis (valavanisalex) wrote :

Your patch looks good to me. Thanks for your work on this :)

Revision history for this message
Fabrice Coutadeur (fabricesp) wrote :

Hi,

Could you please at least report the python2.5 -> python 2.6 stuff? Next stable release of Debian will be delivered with python2.6 by default so this should be fixed there also.

Also, why a depends on qt-assistant-compat? I don't see any reference to that in any place (but I may be wrong).

Thanks,
Fabrice

Changed in qtiplot (Ubuntu):
status: Confirmed → Incomplete
Revision history for this message
Bhavani Shankar (bhavi) wrote :

Hi fabrice,

as stated in bug no 598826 scott has prepared a new upload and once he uploads in debian with all ubuntu changes it can be synced

and qt-assistant compat is a new package in debian/ubuntu which fixes FTB with qt 4.7 in maverick

PS: https://edge.launchpad.net/ubuntu/maverick/i386/qt-assistant-compat

So please put this on hold and sponsor bug no 598826

regards

Revision history for this message
Fabrice Coutadeur (fabricesp) wrote :

Ok.

But I'd really like to understand why a depends on qt-assistant-compat is necessary, as libqtassistantclient4 is pushed to the depends line as generation time.

Thanks,
Fabrice

Revision history for this message
Bhavani Shankar (bhavi) wrote :

yeah fabrice

Its due to qt-assistant-compat being a seperate source package and libqtassistantclient-dev is a build time dependency, But to make the package install with qt 4.7 it is required I think(Please correct me if I m wrong)

/me takes info from package description:

Package: libqtassistantclient4
Section: libs
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: libqt4-assistant (<< 4:4.7.0~)
Replaces: libqt4-assistant (<< 4:4.7.0~)
Description: Qt Assistant client library (runtime)
 Qt is a cross-platform C++ application framework. Qt's primary feature
 is its rich set of widgets that provide standard GUI functionality.
 .
 This package contains the files necessary to run applications using the
 deprecated QAssistantClient class, which is used together with the legacy
 Assistant Document Profile (.adp) version of Qt Assistant.
 .
 This library is obsolete. It is provided to keep old source code working. It is
 strongly advised against using it in new code. New code should use the Qt Help
 Framework introduced in Qt 4.4 and/or the version of Qt Assistant based on it
 (also introduced in Qt 4.4) instead.

which means newer versions should use:

Package: qt-assistant-compat
Architecture: any
Depends: ${shlibs:Depends}, ${misc:Depends}
Breaks: qt4-dev-tools (<< 4:4.7.0~)
Replaces: qt4-dev-tools (<< 4:4.7.0~)
Description: Qt Assistant compatibility binary (legacy)
 Qt is a cross-platform C++ application framework. Qt's primary feature
 is its rich set of widgets that provide standard GUI functionality.
 .
 This package contains the Qt Assistant compatibility version, based on
 Assistant Document Profile (.adp) files, and the associated QtAssistantClient
 library, for compatibility with applications providing help in that format.
 .
 New applications should use the new version of Qt Assistant introduced in Qt
 4.4, based on the Qt Help Framework also introduced in Qt 4.4, instead.

Regards

Revision history for this message
Bhavani Shankar (bhavi) wrote :

Just an update:

the ubuntu change has been reported here:

http://bugs.debian.org/cgi-bin/bugreport.cgi?bug=560852

Regards

Changed in qtiplot (Debian):
status: Unknown → New
Revision history for this message
Alex Valavanis (valavanisalex) wrote :

Actually, I think Recommends: qt-assistant-compat should be OK. Basically, libqtassistantclient allows a Qt program to launch an external help viewer. qt-assistant-compat actually provides the external help viewer executable.

If qt-assistant-compat is not installed, then qtiplot will be able to run but no help viewer will be available.

Revision history for this message
Scott Howard (showard314) wrote : Re: [Bug 605027] Re: Please merge with 0.9.7.14-1 from Debian unstable

Thanks for the work, also to be clear: we won't be able to sync with
Debian once the python versioning is fixed because Debian still uses
qt 4.6 (for now) and the libqtassistant package is in experimental,
not unstable. Until debian uses 4.7 Ubuntu will need to maintain that
diff. I've also informed upstream about it, so hopefully they will
switch to the new framework so we won't need the compatibility layer.

Benjamin Drung (bdrung)
Changed in qtiplot (Ubuntu):
importance: Undecided → Wishlist
Changed in qtiplot (Debian):
status: New → Fix Released
Revision history for this message
Alex Valavanis (valavanisalex) wrote : Re: Please merge with 0.9.7.14-1 from Debian unstable

New bug #608360 was created to deal with the FTBFS issue

Changed in qtiplot (Debian):
importance: Unknown → Undecided
status: Fix Released → New
status: New → Invalid
Changed in qtiplot (Ubuntu):
status: Incomplete → New
summary: - Please merge with 0.9.7.14-1 from Debian unstable
+ Please merge qtiplot (universe) with 0.9.7.14-1 from Debian unstable
+ (main)
Revision history for this message
Alex Valavanis (valavanisalex) wrote : Re: Please merge qtiplot (universe) with 0.9.7.14-1 from Debian unstable (main)

debdiffs attached, which fix the previous FTBFS problems, and bring in latest Debian changes.

Revision history for this message
Alex Valavanis (valavanisalex) wrote :
Revision history for this message
Fabrice Coutadeur (fabricesp) wrote :

Hi,

Please update your merge to lastest debian version (0.9.8-1). Marking as incomplete meanwhile.

Thanks,
Fabrice

Changed in qtiplot (Ubuntu):
status: New → Incomplete
Revision history for this message
Alex Valavanis (valavanisalex) wrote : Re: Please merge qtiplot (universe) with 0.9.8-1 from Debian unstable (main)
summary: - Please merge qtiplot (universe) with 0.9.7.14-1 from Debian unstable
- (main)
+ Please merge qtiplot (universe) with 0.9.8-1 from Debian unstable (main)
Revision history for this message
Alex Valavanis (valavanisalex) wrote :
Changed in qtiplot (Ubuntu):
status: Incomplete → Confirmed
Revision history for this message
Stefano Rivera (stefanor) wrote :

Sorry, this still needs work:
* The bzr branch doesn't merge cleanly into the current UDD branch.
* The debdiff (debian -> ubuntu) looks fishy and isn't a proper debdiff. Why is there a file modified directly (not via a patch)?

Changed in qtiplot (Ubuntu):
assignee: nobody → Alex Valavanis (valavanisalex)
status: Confirmed → Incomplete
Revision history for this message
Alex Valavanis (valavanisalex) wrote :

Ah, I think I see the problem. lp:ubuntu/maverick/qtiplot was committed with no patches applied, whereas lp:debian/sid/qtiplot was committed with all patches applied.

I guess I should unapply the patches from the sid branch before attempting the merge

Revision history for this message
Stefano Rivera (stefanor) wrote :

bzr merge-package should do the right thing (or use the MOM method), but yes you need to be aware of the patches when working. I'm marking the branch as WIP for now

Revision history for this message
Alex Valavanis (valavanisalex) wrote :

OK, I have looked into this again today. Sorry for taking so much time - I am quite new to this!

The only ubuntu change in qtiplot_0.9.7.10+r1453-1ubuntu2 is updating the python version in 01_build_system.diff and this has since been included in the debian package. It's therefore a pretty easy patch.

I think the easiest solution here is to use the MoM method - it seems a lot cleaner. I'll add a debdiff shortly.

summary: - Please merge qtiplot (universe) with 0.9.8-1 from Debian unstable (main)
+ Please merge qtiplot 0.9.8-1 (universe) from Debian unstable (main)
Changed in qtiplot (Ubuntu):
status: Incomplete → In Progress
Revision history for this message
Stefano Rivera (stefanor) wrote :

> OK, I have looked into this again today. Sorry for taking so much time - I am quite new to this!

Fantastic :) Please pop into the #ubuntu-motu channel if you need any help.

Revision history for this message
Stefano Rivera (stefanor) wrote :

Please re-subscribe ubuntu-sponsors when ready.

tags: added: patch
Revision history for this message
Scott Howard (showard314) wrote :

Hi - I'd like to check up on this merge, how is it going? We're after FF now, so you will need an exception. Also, this package currently FTBFS in maverick (without qt assistant compatabillity dependencies) so a merge or an upload to fix the FTBFS is needed

Revision history for this message
Alex Valavanis (valavanisalex) wrote :

Hi Scott,

I have been having some trouble with the merge as described previously. Basically, I'm not sure how to deal with two issues: firstly, the Debian source has the patches applied whereas the current Ubuntu source does not. I'm pretty new to packaging, so I'm not sure what the best solution is. Secondly, dpkg-source seems to be creating a patch called debian*.diff which undoes some of the changes in the other patches in the series. I don't know why this is happening or how to avoid it.

Unassigning myself for now! I'm currently on vacation, so I won't be able to work on this for a couple of weeks. Any help would be appreciated. Sorry for all the confusion!

Changed in qtiplot (Ubuntu):
assignee: Alex Valavanis (valavanisalex) → nobody
status: In Progress → Confirmed
Revision history for this message
Scott Howard (showard314) wrote :

Debdiff against 0.9.8.-1 in debian testing.

description: updated
Revision history for this message
Scott Howard (showard314) wrote :

Build log on AMD64 pbuilder

Revision history for this message
Scott Howard (showard314) wrote :

Comments 26 and 27 are the "clean" debdiff and build.

Revision history for this message
Scott Kitterman (kitterman) wrote :

Ack. Approved. Go ahead.

Revision history for this message
Launchpad Janitor (janitor) wrote :

This bug was fixed in the package qtiplot - 0.9.8-1ubuntu1

---------------
qtiplot (0.9.8-1ubuntu1) maverick; urgency=low

  * Merge from debian unstable(LP: #605027). Remaining changes:
    - Build-Depends on libqtassistantclient-dev
      Recommends qt-assistant-compat to fix a FTBFS since qtassistant
      is removed in qt > 4.6 (LP: #598826)

qtiplot (0.9.8-1) unstable; urgency=low

  * New upstream release
  * Bump standards version to 3.9.0
  * Change python version to 2.6

qtiplot (0.9.7.14-1) unstable; urgency=low

  * New upstream release
  * Build QTeXEngine into program
  * Bump liborigin2 dependency to >=1:06042009+svn1724
  * Bump muparser dependency to 1.32

qtiplot (0.9.7.13-1) UNRELEASED; urgency=low

  * New upstream release
  * Switch to dpkg-source 3.0 (quilt) format
  * Minor fix to patch 01_build_system.diff
  * Add qwtplot3d to build.conf
  * Bump standards version to 3.8.4
  * Fix spelling errors in description
  * Add misc depends in qtiplot-doc
  * Remove patch 02_docbook_stylesheet and
    04_add_includes.diff
  * Rename 03_fix_qti_wordlist.txt_path to
    02_fix_paths.diff
 -- Scott Howard <email address hidden> Tue, 24 Aug 2010 18:09:11 -0400

Changed in qtiplot (Ubuntu):
status: Confirmed → Fix Released
To post a comment you must log in.
This report contains Public information  
Everyone can see this information.

Duplicates of this bug

Other bug subscribers

Remote bug watches

Bug watches keep track of this bug in other bug trackers.