Please merge inkscape 0.91-3 from Debian experimental (main)

Ubuntu bugs fixed upstream:

* bug #170225 <relative image paths instead of absolute>
* bug #237863 <crash when toggling "Live preview" in the extension dialog>
* bug #816540 <inkscape crashed with signal 7 in sp_action_set_name()>
* bug #977003 <inkscape crashed with SIGSEGV in Avoid::VertInf::removeFromGraph()>
* bug #1042463 <crash loading 8 port switch clip art>
* bug #1172484 <inkscape crashed with SIGSEGV in sp_ui_menu_item_set_name()>
* bug #1204732 <inkscape crashed with SIGABRT in __gnu_cxx::__verbose_terminate_handler()>
* bug #1219264 <inkscape crashed with SIGSEGV in g_type_check_instance_cast()>
* bug #165780 <Pattern Gaps>
* bug #165865 <markers must take object's stroke color (SVG 1.2 feature)>
* bug #168708 <Embedded jpg exported to EPS/PDF as non-jpeg (JPEGs are stored /FlateDecode instead of /DCTDecode)>
* bug #171243 <implement clip-rule:evenodd>
* bug #426763 <Canceling PDF import dialog leads to error message>
* bug #436962 <<symbol> not rendered correctly in exported PDF>
* bug #488247 <Inkscape is slow starting>
* bug #590686 <"Affect:" toolbar label should be renamed/removed>
* bug #604131 <Pattern along Path errors out>
* bug #652943 <Aborted output extensions create an empty file>
* bug #667091 <Fonts initially indicated as 'not found on system'>
* bug #707890 <Text is exported to high-resolution bitmaps with strokes missing>
* bug #733010 <Resize page to selection: 'InfinityLine' start/end markers not included>
* bug #773288 <"border on top" and "border shadow" options are still active when "show border" is disabled>
* bug #800552 <function plotter fails silently if called without selection>
* bug #807861 <typo in ../src/widgets/toolbox.cpp:4685>
* bug #830663 <default window size is too small>
* bug #840625 <PDFs are imported with reflected embedded pictures>
* bug #908392 <Initial size of palette dialog on Ubuntu too small>
* bug #998276 <Keyboard shortcuts not appearing in the main menu under Unity>
* bug #1024690 <svg property "sodipodi:docname" is not updated when saving file as a new name>
* bug #1248174 <Update the Ubuntu colour palette to fit the spec>
* bug #43730 <inkscape 'export bitmap' dialog should indicate success and close after export>
* bug #168164 <font sizes specified in pixels instead of points>
* bug #171579 <Make inkscape remember dialogs window status>
* bug #638105 <Openclipart search dialog should indicate progress>
* bug #819671 <No visual indication for grid and snap being on/off>
* bug #1328217 <space bar should allow to easily move around the document without using scrollbars>
* bug #1121409 <Inkscape kills RAM when lot of objects are imported>

Alex Valavanis, why you compiled Inkscape in ppa:inkscape.dev/stable without libcdr ? I've just installed from https://launchpad.net/~inkscape.dev/+archive/ubuntu/stable and noticed, that Inkscape 0.91 doesn't open CorelDraw files until python-uniconvertor is installed.
Please fix packaging code at lp:~inkscape.dev/inkscape/debian-packaging-stable to add libcdr-dev build-deps according to bug #1104198 (https://launchpad.net/inkscape/+bug/1104198)
Ubuntu 14.04 has libcdr 0.0.15 , newer libcdr 0.1 is uploaded to Ubuntu 14.10 and 15.04.
If you need newer libcdr you can simply upload newer libcdr version to Ubuntu 14.04 or even Ubuntu 12.04 section at https://launchpad.net/~inkscape.dev/+archive/ubuntu/stable PPA

Alex Valavanis, I've noticed, that Inscape from Debian experimental already depends on libcdr-dev, see
http://anonscm.debian.org/cgit/collab-maint/inkscape.git/tree/debian?h=experimental

I think you should simply copy packaging code from Debian experimental to lp:~inkscape.dev/inkscape/debian-packaging-stable

Thanks,
Mantas

Hi Mantas, I replied to your point about libcdr in bug #1104198.

Note that this present report is about the Ubuntu official package of Inkscape (not our PPA). This one IS derived from Debian, so we will automatically inherit the libcdr dependency from there.

0.91-1 is now in Debian experimental, so we should prepare a merged package for Ubuntu Vivid.

Actually, it'll probably be cleaner to hold on for a short time until the Debian maintainer has released the package in the Unstable branch because it seems as if a few of the packaging files have diverged between unstable and experimental.

I don't think we really want to carry that diff in Ubuntu :)

> ctually, it'll probably be cleaner to hold on for a short time until the Debian maintainer has released the package in the Unstable branch...

Are you sure that the Debian maintainer is planning to do this? Since Debian is in freeze, it's often easier to not upload something to unstable that will not go into the release. I presume that this new release doesn't meet the jessie freeze policy.

I'd also presume that the Debian maintainer plans to upload the experimental version to unstable eventually, so I think the divergence will disappear. Unless you know otherwise?

Ah I didn't realise the freeze for Jessie was in effect... no, I doubt that Inkscape will meet the exception policy!

I guess we should push ahead with a merge from experimental then, but it might be a bit fiddly. Would it be reasonable to do something like:

bzr branch lp:debian/inkscape debian-inkscape
cd debian-inkscape

# First merge debian/experimental -> debian/unstable

bzr merge debian-experimental
bzr commit

# Now merge debian/unstable -> ubuntu
cd ..
bzr branch lp:ubuntu/inkscape ubuntu-inkscape
cd ubuntu-inkscape
bzr merge debian-inkscape
bzr commit

Is this a sensible approach, or will it cause headaches?

Why not just merge into Ubuntu directly from experimental? Presumably
experimental is intended to land in unstable eventually, so surely it
should have everything we want?

I had a quick go at a direct merge last night, and there were a few conflicts to sort out... I guess I wasn't sure whether the priority is to minimise the delta between the new package and (a) the current Ubuntu package (b) Debian unstable or (c) Debian experimental.

I'll have another look at it later, and try to pick the best bits of each, and make the eventual merge as painless as possible!

In general, we want to miminize the delta between Debian and Ubuntu. As
this would be merging from experimental, this means that you want to
apply (the current Ubuntu delta against what it is based on) to (the
current packaging in Debian experimental). Unless there's something
specific about Inkscape or desktop that I don't know about, I see no
reason why you have to look at what is in Debian unstable today, since
you'd be merging from experimental, not unstable.

I'm not that familiar with desktop packages, so I'd like a +1 from an
Ubuntu developer who is before sponsoring/reviewing this change - in
particular that merging from experimental is OK in this case. I'm an
Inkscape fan though, and would love to have the latest in Vivid.
Especially the measuring tool :)

attaching a first version of the patch:

still lacking of the control fixes

I'm working with the Debian maintainer at the moment to get the changes from unstable into experimental. There is a small issue with running autoreconf on the package at the moment (see bug #1418943).

Solutions are to either

(a) don't reconfigure the package (drop --with autoreconf from debian/rules, or use -- with autotools-dev instead)
(b) try using the upstream patch, and run our ./autogen.sh script
(c) have a nice cold beer and wait for us to sort it out in Debian/upstream.

debdiff with the unstable fixes not merged in experimental.

there is an upcoming -3 experimental upload delta debdiff-v2 and debdiff-v3.

The attachment "debdiff-v3" seems to be a debdiff. The ubuntu-sponsors team has been subscribed to the bug report so that they can review and hopefully sponsor the debdiff. If the attachment isn't a patch, please remove the "patch" flag from the attachment, remove the "patch" tag, and if you are member of the ~ubuntu-sponsors, unsubscribe the team.

[This is an automated message performed by a Launchpad user owned by ~brian-murray, for any issue please contact him.]

Ops @Alex, were you already working on it?

So feel free to take my debdiff or throw it out :)

I'm not directly working on it yet in Ubuntu... I'm trying to sort out the upstream -> Debian issues first. In the meantime, I'm happy to see an Ubuntu version released!

One note about your latest debdiff (v3)...

The alpha LDFLAGS issue in debian/rules shouldn't be a problem for us in Ubuntu, so that part of the debdiff can also probably be dropped. In fact, it has apparently already been fixed in binutils so there's no need to keep the alpha stuff at all.

Remember that feature freeze is next week. If you need sponsorship, it really needs to be submitted now, in order to make Vivid.

Now... as in right now? I think LocutusOfBorg's debdiff looks fine, although I haven't tried a build. If you're able to take a look at it, that would be great.

In the meantime, I'll continue working with the Debian maintainer to get 0.91-3 into experimental. We can re-merge with that if it arrives in time.

> Now... as in right now?

No hard deadline apart from feature freeze next week, but the sponsorship queue is usually very busy at this time, so providing a week minimum is advisable.

I have an interest in this bug though and would be happy to review and sponsor, but I also have a big pile of work outstanding to land before feature freeze! I'm also less familiar with desktop packages and so would just like to check with a desktop developer that there isn't anything I should know first.

OK, 0.91-3 is landing in Debian experimental as we speak. That will simplify the debdiff further by merging all the necessary changes from Unstable.

This bug was fixed in the package inkscape - 0.91-3ubuntu1

---------------
inkscape (0.91-3ubuntu1) vivid; urgency=medium

  * Merge from Debian unstable (LP: #1416651). Remaining changes:
    - debian/control:
      + build-depend on dh-translation to handle Ubuntu translation,
      + demote pstoedit from Recommends to Suggests (because it's in
        universe),
    - debian/rules:
      + add dh_translation to handle Ubuntu translation
  * debian/patches/0006_add_unity_quicklist_support.patch: dropped, accepted
    upstream.

inkscape (0.91-3) experimental; urgency=medium

  * Cherry-pick commit from unstable suite
    - debian/control: build-dependencies updated [b4f5c6f]
      - librevenge-dev added
      - libwpd-dev (>= 0.9.0) dropped
      - libwpg-dev (>= 0.2.0) bumped to libwpg-dev (>= 0.3.0)

inkscape (0.91-2) experimental; urgency=medium

  * debian/rules: override_dh_auto_test dropped (Closes: #776857)

inkscape (0.91-1) experimental; urgency=medium

  * New upstream release

inkscape (0.91~pre4-1) experimental; urgency=medium

  * New upstream pre-release

inkscape (0.91~pre3-1) experimental; urgency=medium

  * New upstream pre-release
  * debian/control: Uploader e-mail address updated
  * debian/control: S-V bump 3.9.5 => 3.9.6 (no changes needed)

inkscape (0.91~pre2-1) experimental; urgency=medium

  * New upstream pre-release

inkscape (0.91~pre1-1) experimental; urgency=medium

  * New upstream pre-release
    - debian/control: poppler versioning dropped
    - debian/patches/: patchset updated
      - 0002-Fix_FTBFS_on_poppler-0.26.patch dropped (applied upstream)
  * debian/control: libcdr-dev and libvisio-dev b-deps added (Closes: #751090)

inkscape (0.91~pre0-1) experimental; urgency=medium

  * New upstream pre-release
    - debian/control: python-lxml b-dep added
    - debian/rules: dh_auto_test overridden for test purpose
    - debian/patches/: patchset refreshed against v0.91~pre0
      - 0001-Fix_Datamatrix_UI_issue.patch dropped (applied upstream)
      - 0002-Drop_PS_and_PDF_support_in_MimeType.patch => #0001
      - 0003-Fix_LP_-911146.patch dropped (applied upstream)
      - 0004-Fix_FTBFS_on_gcc-4.8.patch dropped (applied upstream)
      - 0005-Fix_FreeType_include.patch dropped (applied upstream)
      - 0006-Fix_FTBFS_on_poppler-0.26.patch updated and => #0002
  * debian/control: b-dep bump to use poppler (>= 0.26)
 -- Gianfranco Costamagna <email address hidden> Thu, 19 Feb 2015 10:59:23 +0100