Merge lp://staging/~matttbe/ubuntu/precise/pdfshuffler/0.5.99-svn64 into lp://staging/ubuntu/precise/pdfshuffler

Proposed by Matthieu Baerts
Status: Merged
Merge reported by: Stefano Rivera
Merged at revision: not available
Proposed branch: lp://staging/~matttbe/ubuntu/precise/pdfshuffler/0.5.99-svn64
Merge into: lp://staging/ubuntu/precise/pdfshuffler
Diff against target: 5610 lines (+3230/-2150)
20 files modified
.pc/applied-patches (+1/-1)
.pc/fix-shebang/pdfshuffler (+0/-1031)
.pc/install_and_look_for_UI_file_in_right_dirs.patch/pdfshuffler/pdfshuffler.py (+1057/-0)
.pc/install_and_look_for_UI_file_in_right_dirs.patch/setup.py (+66/-0)
TODO (+0/-2)
bin/pdfshuffler (+33/-0)
data/pdfshuffler.ui (+359/-0)
debian/changelog (+11/-0)
debian/patches/fix-shebang (+0/-12)
debian/patches/install_and_look_for_UI_file_in_right_dirs.patch (+31/-0)
debian/patches/series (+1/-1)
doc/pdfshuffler.1 (+2/-2)
pdfshuffler (+0/-1031)
pdfshuffler/cairorendering.py (+168/-0)
pdfshuffler/pdfshuffler.py (+1057/-0)
po/genpot.sh (+2/-1)
po/ja.po (+156/-0)
po/pdfshuffler.pot (+118/-60)
po/zh_CN.po (+156/-0)
setup.py (+12/-9)
To merge this branch: bzr merge lp://staging/~matttbe/ubuntu/precise/pdfshuffler/0.5.99-svn64
Reviewer Review Type Date Requested Status
Ubuntu Sponsors Pending
Review via email: mp+92648@code.staging.launchpad.net

Description of the change

Hello,

Is it possible to upload this new version because it fixes this annoying bug: PDFShuffler displays only black squares
 - http://sourceforge.net/tracker/?func=detail&aid=3293749&group_id=235357&atid=1095819
 - https://bugzilla.redhat.com/show_bug.cgi?id=705153

This version has been tested and it is available on this ppa:matttbe/ppa
This branch should be ready to be pushed on lp:ubuntu/pdfshuffler (except the "UNRELEASED" version in debian/changelog)

Please upload this package before the FF :)

Thank you for your help!

To post a comment you must log in.
Revision history for this message
Stefano Rivera (stefanor) wrote :

Eep, this breaks my bzr
bzr: ERROR: exceptions.AttributeError: 'DirStateRevisionTree' object has no attribute 'last_revision'

Revision history for this message
Matthieu Baerts (matttbe) wrote :

It's strange! I simply used 'bzr merge-upstream' with the tarball...
And if I want to give you a debdiff, I have this error: File /tmp/ThBQcppeQT/pdfshuffler-0.5.1/pdfshuffler is a regular file while file /tmp/rkd3EH77bx/pdfshuffler-0.5.99~svn64/pdfshuffler is a directory...

What can I do?

Revision history for this message
Matthieu Baerts (matttbe) wrote :

This is strange... These two commands work fine:
    bzr branch lp:~matttbe/ubuntu/precise/pdfshuffler/0.5.99-svn64
    bzr bd lp:~matttbe/ubuntu/precise/pdfshuffler/0.5.99-svn64
But not this one:
    bzr merge lp:~matttbe/ubuntu/precise/pdfshuffler/0.5.99-svn64

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

Yeah, it's LP: #923688. I worked around it...

Revision history for this message
Matthieu Baerts (matttbe) wrote :

Oh ok, it's a known bug!
Thank you for your help :)

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

Slightly modified the changelog and uploaded.

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
The diff is not available at this time. You can reload the page or download it.

Subscribers

People subscribed via source and target branches