← Back to branch summary

~ubuntu-branches/ubuntu/utopic/inkscape/utopic-proposed

« back to all changes in this revision

Viewing changes to src/libvpsc/block.cpp

  • Committer: Package Import Robot
  • Author(s): Mattia Rizzolo
  • Date: 2014-01-14 15:44:58 UTC
  • mfrom: (2.5.10 sid)
  • Revision ID: package-import@ubuntu.com-20140114154458-3283675h9vtv5ccc
Tags: 0.48.4-3ubuntu1
https://launchpad.net/bugs/1225013
https://launchpad.net/bugs/811634
* Merge from Debian unstable (LP: #1225013).  Remaining changes:
  - debian/control:
    + Set Ubuntu Developer as maintainer,
    + build-depend on dh-translation to handle Ubuntu translation,
    + build against liblcsm2 instead of liblcsm1,
    + demote pstoedit from Recommends to Suggests (because it's on universe),
    + add a ${python:Depends}.
  - debian/patches/0006_add_unity_quicklist_support.patch: add.
  - debian/patches/series: update.
  - debian/rules:
    + add dh_translation to handle Ubuntu translation,
    + add python2 to dh addon.
* Debian changes:
  - debian/control: make description more user-friendly (LP: #811634)

Show diffs side-by-side

added added

removed removed

Lines of Context:
src/libvpsc/block.cpp
72
72
                for (Cit j=cs->begin();j!=cs->end();++j) {
73
73
                        Constraint *c=*j;
74
74
                        c->timeStamp=blockTimeCtr;
75
 
                        if (c->left->block != this && in || c->right->block != this && !in) {
 
75
                        if ((c->left->block != this && in) || (c->right->block != this && !in)) {
76
76
                                h->insert(c);
77
77
                        }
78
78
                }