lp:~darkxst/empathy/3.12

Branch merges

Propose for merging

No branches dependent on this one.

Merged into lp:~ubuntu-desktop/empathy/ubuntu at revision 369

Sebastien Bacher: Approve on 2014-09-30

Diff: 2269 lines (+1582/-243)

23 files modified

debian/autoreconf (+2/-0)
debian/changelog (+50/-0)
debian/compat (+1/-1)
debian/control (+6/-6)
debian/empathy.install (+2/-0)
debian/patches/0001-Use-new-api-versioned-name-for-geocode-glib.patch (+0/-28)
debian/patches/0002-Update-to-new-GeocodeLocation-API-in-geocode-glib-0..patch (+0/-48)
debian/patches/0003-Add-missing-include.patch (+0/-24)
debian/patches/00_linker-fixes.patch (+20/-4)
debian/patches/10_use_notify_osd_icons.patch (+9/-9)
debian/patches/23_idomessagedialog_for_voip_and_ft.patch (+7/-11)
debian/patches/34_start_raised_execpt_in_session.patch (+6/-4)
debian/patches/38_default_to_facebook_for_im.patch (+4/-4)
debian/patches/39_default_to_freenode_for_irc.patch (+6/-6)
debian/patches/41_unity_launcher_progress.patch (+26/-26)
debian/patches/42_shell_running.patch (+10/-10)
debian/patches/Revert-geoclue-2.0.patch (+1422/-0)
debian/patches/include-empathy-keyring.h (+0/-14)
debian/patches/series (+1/-8)
debian/patches/ubuntu_launch_uoa_panel.patch (+6/-8)
debian/patches/ucc_panel_name.patch (+0/-22)
debian/rules (+2/-8)
debian/shlibs.local (+2/-2)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Bug #1339352: Update to 3.12

Wishlist

Fix Released

Link a bug report

Related blueprints

378. By Tim Lunn on 2014-09-30

* debian/control:
  - Revert geoclue-2.0 dep to geoclue for the above revert patch

377. By Tim Lunn on 2014-09-24

* debian/empathy.install:
  - Install appdata

376. By Tim Lunn on 2014-09-24

refresh disabled patches

375. By Tim Lunn on 2014-09-24

fix 42_shell_running.patch

374. By Tim Lunn on 2014-09-24

refresh patches

373. By Tim Lunn on 2014-09-24

re-enable 23_

372. By Jackson Doak on 2014-09-24

Add debian/autoreconf

371. By Jackson Doak on 2014-09-24

add patch

370. By Jackson Doak on 2014-09-24

Remove dupelicate entries in control

369. By Jackson Doak on 2014-09-24

* New upstream release. LP: #1339352
* debian/shlibs.local:
  - Updated for 3.12.6
* debian/control:
  - Bump build-dep on libfolks-dev (>= 0.9.5), libglib2.0-dev (>= 2.37.6),
    libgtk-3-dev (>= 3.9.4), libsignon-glib-dev (>= 1.8),
    libtelepathy-glib (>= 0.23.2)
  - Bump compat level to 9
* debian/empathy.install:
  - Install org.gnome.telepathy-account-widgets.gschema.xml
* debian/rules:
  - Removed obsolete --with-connectivity, --enable-gst-1.0=yes
* debian/patches:
  - 0001-Use-new-api-versioned-name-for-geocode-glib.patch,
    0002-Update-to-new-GeocodeLocation-API-in-geocode-glib-0..patch,
    0003-Add-missing-include.patch,
    include-empathy-keyring.h,
    ucc_panel_name.patch, dropped, are upstream
  - 23_idomessagedialog_for_voip_and_ft.patch,
    39_default_to_freenode_for_irc.patch,
    41_unity_launcher_progress.patch, refreshed
  - 23_idomessagedialog_for_voip_and_ft.patch, needs gtk+3 patch for
    ubuntu_menu_item_factory symbols
    38_default_to_facebook_for_im.patch,
    42_shell_running.patch,
    47_git_activate_with_platform_data.patch, disabled, rewrite needed
  - Add Revert-geoclue-2.0.patch, allows this to work without the new geoclue