diff -Nru veusz-1.20.1/debian/bzr-builder.manifest veusz-1.20.1/debian/bzr-builder.manifest --- veusz-1.20.1/debian/bzr-builder.manifest 2014-06-11 22:44:16.000000000 +0000 +++ veusz-1.20.1/debian/bzr-builder.manifest 2014-06-30 06:52:33.000000000 +0000 @@ -1,3 +1,3 @@ -# bzr-builder format 0.3 deb-version {debupstream}-0~2016~201406112244 -lp:veusz revid:git-v1:bb629d5af86d3f23d3ca232e3fb6ba8c10f88479 +# bzr-builder format 0.3 deb-version {debupstream}-0~2017~201406300652 +lp:veusz revid:git-v1:323fce17fb20f4b76c3eae4c77d56e5e6f5f9dd0 nest-part packaging lp:~jeremysanders/veusz/deb-packaging debian debian revid:jeremy@jeremysanders.net-20140212180342-iemho6epdjznups8 diff -Nru veusz-1.20.1/debian/changelog veusz-1.20.1/debian/changelog --- veusz-1.20.1/debian/changelog 2014-06-11 22:44:16.000000000 +0000 +++ veusz-1.20.1/debian/changelog 2014-06-30 06:52:33.000000000 +0000 @@ -1,8 +1,8 @@ -veusz (1.20.1-0~2016~201406112244~ubuntu13.10.1) saucy; urgency=low +veusz (1.20.1-0~2017~201406300652~ubuntu13.10.1) saucy; urgency=low * Auto build. - -- Jeremy Sanders Wed, 11 Jun 2014 22:44:16 +0000 + -- Jeremy Sanders Mon, 30 Jun 2014 06:52:33 +0000 veusz (1.20.1-0) UNRELEASED; urgency=low diff -Nru veusz-1.20.1/README veusz-1.20.1/README --- veusz-1.20.1/README 2014-06-11 22:44:11.000000000 +0000 +++ veusz-1.20.1/README 2014-06-30 06:52:30.000000000 +0000 @@ -17,6 +17,7 @@ Bug fixes * Fix missing labels if colorbar out of plot + * Preserve tags when reloading datasets Features of package: Plotting features: diff -Nru veusz-1.20.1/veusz/dataimport/base.py veusz-1.20.1/veusz/dataimport/base.py --- veusz-1.20.1/veusz/dataimport/base.py 2014-06-11 22:44:11.000000000 +0000 +++ veusz-1.20.1/veusz/dataimport/base.py 2014-06-30 06:52:30.000000000 +0000 @@ -150,15 +150,23 @@ return f def _deleteLinkedDatasets(self, document): - """Delete linked datasets from document linking to self.""" + """Delete linked datasets from document linking to self. + Returns tags for deleted datasets. + """ + tags = {} for name, ds in list(document.data.items()): if ds.linked == self: + tags[name] = document.data[name].tags document.deleteData(name) + return tags - def _moveReadDatasets(self, tempdoc, document): + def _moveReadDatasets(self, tempdoc, document, tags): """Move datasets from tempdoc to document if they do not exist - in the destination.""" + in the destination. + + tags is a dict of tags for each dataset + """ read = [] for name, ds in list(tempdoc.data.items()): @@ -171,6 +179,9 @@ outname = self.params.renames[name] ds.linked = self + if name in tags: + ds.tags = tags[name] + document.setData(outname, ds) return read @@ -196,9 +207,9 @@ return ([], errors) # delete datasets which are linked and imported here - self._deleteLinkedDatasets(document) + tags = self._deleteLinkedDatasets(document) # move datasets into document - read = self._moveReadDatasets(tempdoc, document) + read = self._moveReadDatasets(tempdoc, document, tags) # return errors (if any) errors = op.outinvalids