[Bug 930639] Re: Please merge scribus 1.4.0.dfsg+r17287-1 (main) from Debian sid (main)

2012-02-16 Thread Bernhard Reiter
I've noticed this bug report and merge request only after I did similar work to merge the (a bit more recent) 1.4.0.dfsg+r17300-1 version from Debian -- see https://bugs.launchpad.net/ubuntu/+source/scribus/+bug/932962 As my debdiff has now been merged, I'm setting this bug report to Invalid.

[Bug 930639] Re: Please merge scribus 1.4.0.dfsg+r17287-1 (main) from Debian sid (main)

2012-02-16 Thread Marcel Stimberg
Hi Bernhard, no worries, I'm glad it got merged either way! BTW: I was once told to actually *not* subscribe ubuntu-sponsors if I have already done a merge request (in the bazaar branch sense) and https://wiki.ubuntu.com/Bugs/HowToFix#Committing_the_fix only says If you can't find anyone to

[Bug 930639] Re: Please merge scribus 1.4.0.dfsg+r17287-1 (main) from Debian sid (main)

2012-02-11 Thread Launchpad Bug Tracker
** Branch linked: lp:~marcelstimberg/ubuntu/precise/scribus/merge-1.4 -from-debian -- You received this bug notification because you are a member of Ubuntu Bugs, which is subscribed to Ubuntu. https://bugs.launchpad.net/bugs/930639 Title: Please merge scribus 1.4.0.dfsg+r17287-1 (main) from

[Bug 930639] Re: Please merge scribus 1.4.0.dfsg+r17287-1 (main) from Debian sid (main)

2012-02-11 Thread Marcel Stimberg
Ok, I tried to do the merge myself (see the linked branch), AFAICT everything works fine (building with pbuilder, installing, running). But this is my first attempt at a merge, so I may well have done something wrong. I'm under the impression that using bazaar branches is the preferred way of