Ubuntu
labyrinth package

Merge lp://staging/~takluyver/ubuntu/raring/labyrinth/0.6 into lp://staging/ubuntu/raring/labyrinth

  1. Raring (13.04)
  2. 0.6
  3. Merge into raring
Proposed by Thomas Kluyver
Status: Merged
Merged at revision: 13
Proposed branch: lp://staging/~takluyver/ubuntu/raring/labyrinth/0.6
Merge into: lp://staging/ubuntu/raring/labyrinth
Diff against target: 73838 lines (+12390/-58790)
98 files modified
.gitignore (+3/-0)
.tx/config (+8/-0)
ChangeLog (+495/-43)
INSTALL (+0/-236)
Makefile.am (+0/-10)
Makefile.in (+0/-689)
NEWS (+0/-40)
README (+0/-144)
README.rst (+113/-0)
Windows/WinSetup.bat (+0/-3)
Windows/defs.py (+1/-1)
Windows/winsetup.py (+20/-20)
acinclude.m4 (+0/-40)
aclocal.m4 (+0/-8283)
autogen.sh (+0/-42)
config.guess (+0/-1516)
config.h.in (+0/-76)
config.sub (+0/-1622)
configure (+0/-24243)
configure.ac (+0/-90)
data/Makefile.am (+0/-46)
data/Makefile.in (+0/-470)
data/labyrinth-ui.xml (+15/-9)
data/labyrinth.desktop (+10/-0)
data/labyrinth.desktop.in (+0/-11)
data/labyrinth.glade (+917/-521)
debian/changelog (+9/-0)
debian/compat (+1/-1)
debian/control (+14/-8)
debian/copyright (+54/-32)
debian/patches/fix-imports.patch (+0/-17)
debian/patches/missing-thought-fix.patch (+0/-13)
debian/patches/numeric_to_numpy.patch (+0/-15)
debian/patches/remove-encoding-field-from-desktop-file.patch (+0/-9)
debian/pycompat (+0/-1)
debian/rules (+15/-10)
debian/source/format (+1/-0)
debian/watch (+1/-2)
doc/Makefile.in (+0/-379)
help/C/labyrinth.xml (+449/-0)
help/C/legal.xml (+76/-0)
help/Makefile.am (+11/-0)
help/de/de.po (+327/-0)
install-sh (+0/-323)
install_data_files.sh (+18/-0)
intltool-extract.in (+0/-861)
intltool-merge.in (+0/-1451)
intltool-update.in (+0/-1164)
labyrinth (+93/-0)
labyrinth_lib/BaseThought.py (+307/-292)
labyrinth_lib/Browser.py (+311/-299)
labyrinth_lib/DrawingThought.py (+574/-584)
labyrinth_lib/ImageThought.py (+305/-295)
labyrinth_lib/Links.py (+252/-241)
labyrinth_lib/MMapArea.py (+1289/-1145)
labyrinth_lib/MainWindow.py (+737/-754)
labyrinth_lib/MapList.py (+189/-189)
labyrinth_lib/PeriodicSaveThread.py (+10/-11)
labyrinth_lib/ResourceThought.py (+142/-0)
labyrinth_lib/TextBufferMarkup.py (+280/-286)
labyrinth_lib/TextThought.py (+1146/-1363)
labyrinth_lib/TrayIcon.py (+40/-41)
labyrinth_lib/UndoManager.py (+211/-213)
labyrinth_lib/__init__.py (+1/-17)
labyrinth_lib/debug.py (+16/-0)
labyrinth_lib/prefs.py (+8/-8)
labyrinth_lib/utils.py (+137/-139)
ltmain.sh (+0/-6938)
m4/intltool.m4 (+0/-220)
m4/python.m4 (+0/-62)
missing (+0/-360)
mkinstalldirs (+0/-158)
po/ChangeLog (+21/-1)
po/LINGUAS (+2/-0)
po/Makefile (+48/-0)
po/Makefile.in.in (+0/-218)
po/ca.po (+202/-108)
po/cs.po (+205/-111)
po/de.po (+207/-138)
po/es.po (+347/-0)
po/eu.po (+202/-108)
po/fa.po (+201/-108)
po/fr.po (+217/-197)
po/it.po (+217/-149)
po/labyrinth.pot (+316/-0)
po/nl.po (+204/-111)
po/pl.po (+198/-110)
po/pt_BR.po (+228/-208)
po/pt_PT.po (+205/-111)
po/ru.po (+205/-111)
po/sv.po (+202/-108)
po/zh_CN.po (+337/-0)
py-compile (+0/-146)
setup.py (+20/-0)
src/Makefile.am (+0/-51)
src/Makefile.in (+0/-529)
src/defs.py.in (+0/-8)
src/labyrinth.py (+0/-103)
To merge this branch: bzr merge lp://staging/~takluyver/ubuntu/raring/labyrinth/0.6
Reviewer Review Type Date Requested Status
Andrew Starr-Bochicchio (community) Approve
Dmitry Shachnev Approve
Ubuntu branches Pending
Review via email: mp+132718@code.staging.launchpad.net

Description of the change

Updates the package to the new upstream release 0.6.

The Debian packaging is based on what I use for the daily recipe build:
https://code.launchpad.net/~takluyver/+recipe/labyrinth-daily

To post a comment you must log in.
Revision history for this message
Dmitry Shachnev (mitya57) wrote :

Thanks for your work! I'm not able to upload the package, but I've noticed two small issues with it:

- you should run "update-maintainer" to get the Maintainer and XSBC-Original-Maintainer fields properly set;
- please target raring instead of precise.

review: Needs Fixing
lp://staging/~takluyver/ubuntu/raring/labyrinth/0.6 updated
14. By Thomas Kluyver

Fixes to packaging as suggested by Dmitry Shachnev

Revision history for this message
Thomas Kluyver (takluyver) wrote :

Thanks Dmitry, I knew I'd miss something. I've followed both of your suggestions.

Revision history for this message
Thomas Kluyver (takluyver) wrote :

By the way, do I need to do anything to reset the status so someone looks at this again? Thanks.

Revision history for this message
Dmitry Shachnev (mitya57) wrote :

OK, here's my "community" Approve. :)

review: Approve
Revision history for this message
Thomas Kluyver (takluyver) wrote :

Thanks, Dmitry.

Revision history for this message
Sebastien Bacher (seb128) wrote :

Thank you for your work, could you give us a link to the 0.6 .tar.gz though? The only file I found is a zip on https://github.com/labyrinth-team/labyrinth/zipball/0.6 but that's not something compatible with the packaging there

lp://staging/~takluyver/ubuntu/raring/labyrinth/0.6 updated
15. By Thomas Kluyver

Correction to watch file

Revision history for this message
Thomas Kluyver (takluyver) wrote :

This should work: https://github.com/labyrinth-team/labyrinth/archive/0.6.tar.gz

I've updated the watch file to use the same pattern.

Revision history for this message
Sebastien Bacher (seb128) wrote :

https://github.com/labyrinth-team/labyrinth/archive/0.6.tar.gz is 165k a has no src subdir, the current ubuntu version has a src directory and takes 541k... are you sure the new tarball is fine? I don't understand enough of that software to judge of that so I will let the sponsoring to somebody who does

Revision history for this message
Thomas Kluyver (takluyver) wrote :

Yes, that's right. I renamed the src/ directory to labyrinth_lib/ so it could easily be used as a Python package. The shape of the codebase has changed quite a bit, because I dropped the autotools build system. But the actual content - code and data - is largely the same.

I'm already packaging the new codebase in a PPA with recipe builds. If you want to test it out: https://code.launchpad.net/~takluyver/+archive/labyrinth-dev

Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Hi Thomas,

Not to be pedantic, but... It would be nice (and make the merge much easier to review) if you could document the changes you've made to the packaging in debian/changelog.

review: Abstain
lp://staging/~takluyver/ubuntu/raring/labyrinth/0.6 updated
16. By Thomas Kluyver

Add note to changelog about new packaging

Revision history for this message
Thomas Kluyver (takluyver) wrote :

Hi Andrew,

Honestly, I discarded the existing packaging from Ubuntu - I'm not familiar with CDBS or python-central, and my understanding is that they're superseded by debhelper and dh_python2. The new packaging is a pretty straightforward use of those systems. I've added a note to the changelog about that, but it's probably easiest to review the new packaging by itself, rather than looking at the diff.

Revision history for this message
Andrew Starr-Bochicchio (andrewsomething) wrote :

Fair enough. Getting the package updated is more important than having a verbose changelog. Thanks for the note you added. Test building now. If everything goes fine, I'll upload.

Thanks!

review: Approve
Revision history for this message
Thomas Kluyver (takluyver) wrote :

Thanks, Andrew.
On Nov 11, 2012 3:31 AM, "Andrew Starr-Bochicchio" <email address hidden>
wrote:

> Review: Approve
>
> Fair enough. Getting the package updated is more important than having a
> verbose changelog. Thanks for the note you added. Test building now. If
> everything goes fine, I'll upload.
>
> Thanks!
> --
>
> https://code.launchpad.net/~takluyver/ubuntu/raring/labyrinth/0.6/+merge/132718
> You are the owner of lp:~takluyver/ubuntu/raring/labyrinth/0.6.
>

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