Merge lp://qastaging/~l3on/ubuntu/precise/anjuta-extras/new-version-3.3.4 into lp://qastaging/ubuntu/precise/anjuta-extras

Proposed by Leo Iannacone
Status: Merged
Merged at revision: 10
Proposed branch: lp://qastaging/~l3on/ubuntu/precise/anjuta-extras/new-version-3.3.4
Merge into: lp://qastaging/ubuntu/precise/anjuta-extras
Diff against target: 37070 lines (+10885/-15628)
55 files modified
.pc/10_scratchbox_path.patch/plugins/scratchbox/anjuta-scratchbox.ui (+0/-214)
.pc/10_scratchbox_path.patch/plugins/scratchbox/plugin.c (+0/-569)
.pc/99_ltmain_as-needed.patch/ltmain.sh (+0/-8413)
.pc/applied-patches (+0/-2)
Makefile.am (+1/-1)
Makefile.in (+10/-2)
NEWS (+30/-0)
aclocal.m4 (+1344/-804)
config.guess (+120/-105)
config.sub (+101/-55)
configure (+2699/-1802)
configure.ac (+11/-2)
debian/changelog (+12/-0)
debian/control.in (+4/-3)
debian/patches/10_scratchbox_path.patch (+0/-22)
debian/patches/99_ltmain_as-needed.patch (+8/-4)
debian/patches/series (+0/-1)
gnome-doc-utils.make (+655/-0)
help/C/scintilla-plugin.page (+43/-0)
help/Makefile.am (+13/-0)
help/Makefile.in (+981/-0)
ltmain.sh (+2619/-1404)
plugins/Makefile.in (+9/-1)
plugins/sample1/Makefile.in (+9/-1)
plugins/sample1/anjuta-sample.plugin (+2/-0)
plugins/scintilla/Makefile.am (+13/-5)
plugins/scintilla/Makefile.in (+61/-38)
plugins/scintilla/aneditor.cxx (+132/-135)
plugins/scintilla/anjuta-editor-scintilla.gschema-part.xml (+0/-15)
plugins/scintilla/anjuta-editor-scintilla.ui (+52/-62)
plugins/scintilla/anjuta-editor.plugin (+4/-2)
plugins/scintilla/anjuta-scintilla.xml (+29/-0)
plugins/scintilla/org.gnome.anjuta.plugins.scintilla.gschema.xml.in (+151/-0)
plugins/scintilla/plugin.c (+152/-1)
plugins/scintilla/properties.h (+48/-7)
plugins/scintilla/properties/Makefile.in (+9/-1)
plugins/scintilla/scintilla/Makefile.am (+3/-1)
plugins/scintilla/scintilla/Makefile.in (+13/-3)
plugins/scintilla/scintilla/include/Makefile.in (+9/-1)
plugins/scintilla/style-editor.c (+235/-138)
plugins/scintilla/text_editor.c (+41/-2)
plugins/scintilla/text_editor.h (+16/-54)
plugins/scratchbox/Makefile.am (+9/-4)
plugins/scratchbox/Makefile.in (+19/-22)
plugins/scratchbox/anjuta-scratchbox.ui (+10/-30)
plugins/scratchbox/org.gnome.anjuta.plugins.scratchbox.gschema.xml.in (+17/-0)
plugins/scratchbox/plugin.c (+8/-8)
po/LINGUAS (+1/-0)
po/POTFILES.in (+2/-0)
po/cs.po (+88/-555)
po/eo.po (+165/-0)
po/ja.po (+463/-573)
po/sl.po (+455/-548)
scripts/Makefile.in (+9/-1)
scripts/build-schemas.mk (+0/-17)
To merge this branch: bzr merge lp://qastaging/~l3on/ubuntu/precise/anjuta-extras/new-version-3.3.4
Reviewer Review Type Date Requested Status
Martin Pitt Approve
Review via email: mp+89672@code.qastaging.launchpad.net

Description of the change

Ubuntu has Anjuta version 3.3.4, but it's incompatible with the
current anjuta-extras version (3.2).

We need a release upgrade to make them work again.

anjuta-extras 3.3.4 downloaded from:
http://ftp.acc.umu.se/pub/GNOME/sources/anjuta-extras/3.3/

To post a comment you must log in.
Revision history for this message
Martin Pitt (pitti) wrote :

Thanks!

review: Approve

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

to all changes: