Ubuntu
empathy package

Merge lp://staging/~ris/ubuntu/maverick/empathy/fix-538963 into lp://staging/ubuntu/maverick/empathy

  1. Maverick (10.10)
  2. fix-538963
  3. Merge into maverick
Proposed by Robert Sajdok
Status: Needs review
Proposed branch: lp://staging/~ris/ubuntu/maverick/empathy/fix-538963
Merge into: lp://staging/ubuntu/maverick/empathy
Diff against target: 25 lines (+7/-0)
2 files modified
debian/changelog (+6/-0)
src/empathy-main-window.c (+1/-0)
To merge this branch: bzr merge lp://staging/~ris/ubuntu/maverick/empathy/fix-538963
Reviewer Review Type Date Requested Status
Artur Rona (community) Needs Fixing
Review via email: mp+50900@code.staging.launchpad.net
To post a comment you must log in.
Revision history for this message
Vish (vish) wrote :

Robert, it is great that you've already forwarded your patch to upstream bugzilla.
Let's wait for upstream comments.

Reply
Revision history for this message
Artur Rona (ari-tczew) wrote :

Thank you for your time and efforts making Ubuntu better! However, there are some issues:

1) New patches should be accepted upstream first.

2) You did the change on wrong branch. Please resubmit against lp:ubuntu/maverick-proposed/empathy

3) Please use patch system which exist already and it's quilt. You can check it by script 'what-patch' from package ubuntu-dev-tools. Please use DEP3 tags as well.
https://wiki.ubuntu.com/PackagingGuide/PatchSystems

4) Please use version (2.32.1-0ubuntu1.2) maverick-proposed;
https://wiki.ubuntu.com/StableReleaseUpdates

review: Needs Fixing
Reply
Revision history for this message
Artur Rona (ari-tczew) wrote :

I suggest to start fixing branch once upstream accepted your patch.

Reply
Revision history for this message
Robert Sajdok (ris) wrote :

> Thank you for your time and efforts making Ubuntu better! However, there are
> some issues:
>
> 1) New patches should be accepted upstream first.
I sent patch to upstream.
https://bugzilla.gnome.org/show_bug.cgi?id=583317#c13
Can I do something else?
>
> 2) You did the change on wrong branch. Please resubmit against lp:ubuntu
> /maverick-proposed/empathy
I do not understand. This patch is not only for mavercik. This patch is for maverick, natty, O, upstream.
I have thought that this process should look like this:
I made patch. I sent it to upstream. Patch is taken from the upstream to the ubuntu.
>
> 3) Please use patch system which exist already and it's quilt. You can check
> it by script 'what-patch' from package ubuntu-dev-tools. Please use DEP3 tags
> as well.
> https://wiki.ubuntu.com/PackagingGuide/PatchSystems
>
> 4) Please use version (2.32.1-0ubuntu1.2) maverick-proposed;
> https://wiki.ubuntu.com/StableReleaseUpdates

Reply
Revision history for this message
Artur Rona (ari-tczew) wrote :

Please read https://wiki.ubuntu.com/UbuntuDevelopment/CodeReviews#Forwarding%20Patches%20Upstream
You must just wait to get your patch accepted in upstream git. Patch is taken from upstream e.g. from git. Your patch is not yet in git.

BTW. If it's not yet fixed in natty as well, you have to first propose a merge against natty.

Reply

Unmerged revisions

124. By Robert Sajdok

src/empathy-main-window.c: fixed: "reducing the width of contact list disappears combobox" (LP: #538963)

123. By Didier Roche-Tolomelli

* debian/patches/91_git_fix_gtalk_for_new_accounts.patch:
  - from upstream: fix empathy to be compatible with gtalk new accounts

122. By Brian Curtis

New upstream release.
-(LP: #634892) Double contacts after adding new contact in group "Ungrouped" (Philip Withnall)
-Blacklist Haze's sip protocol (Guillaume Desmottes)
-Failed assertion in contact_widget_details_feature_prepared_cb() (Guillaume Desmottes)
-(LP: #638270) empathy-accounts assert failure: **glibc detected *** /usr/bin/empathy-accounts: free(): invalid pointer: 0x0809d5b6 *** (Guillaume Desmottes)
-File missing from POTFILES.in (Gabor Kelemen)
-Untranslatable strings (Gabor Kelemen)
-Typo in user guide: witn (Gabor Kelemen)

121. By Ken VanDine

* debian/patches/20_libindicate.patch
  - Don't use notify_notification_new_with_status_icon when the status
    icon isn't visible (LP: #603526)

120. By Didier Roche-Tolomelli

* New upstream release:
  This is the GNOME 2.32 release candidate. A bunch of meta-contacts related
  bugs have been fixed and the audio/video client has been improved to
  reduce the bandwith used by the video stream.
  We also use the stable API of the Conference, ServerTLSConnection and
  TLSCertificate interfaces so you should upgrade to telepathy-gabble 0.9.18
  if you want to use these features.
* debian/control:
  - bump libtelepathy-glib-dev build-dep
* debian/patches/91_git_unref_empathyindividualview_later.patch:
  - in upstream version

119. By Sebastien Bacher

Depends on telepathy-logger (lp: #623516), recommends libdconf0

118. By Didier Roche-Tolomelli

* debian/control:
  - readd libebook1.2-dev build-dep as built with --with_eds (default value)

117. By Didier Roche-Tolomelli

* New upstream release
* debian/control:
  - add libgcr-dev build-dep
* debian/patches/91_git_unref_empathyindividualview_later.patch:
  - additional fix from git requested by upstream

116. By Robert Ancell

* Merge with Debian experimental, remaining Ubuntu changes:
* debian/control:
  - Build-depend on dh-autoreconf, gnome-common
  - Drop geoclue/mapping build-depends (they are in Universe)
  - Add indicator build-depends
  - Add Vcz-Bzr link
  - Don't recommend libdconf0 - we do that at a higher level
  - Add Suggests on telepathy-idle
  - Bump telepathy-butterfly, telepathy-haze to recommends
  - Don't recommends the freedesktop sound theme we have an ubuntu one
* debian/rules:
  - Use autoreconf.mk
  - Enable libindicate
  - Disable map and location
  - Make sure favourite-contacts is disabled, it requires telepathy-logger
* debian/empathy.install:
  - Install message indicator configuration
* debian/indicators/empathy:
  - Message indicator configuration
* debian/patches/01_lpi.patch:
  - Add Launchpad integration
* debian/patches/02_notifications_focus.patch:
  - gsettings doesn't allow overwritting defaults yet to change the schemas
* debian/patches/10_use_notify_osd_icons.patch:
  - Use the notify-osd image for new messages
* debian/patches/11_empathy_accounts_category.patch:
  - Put empathy-accounts in correct category
* debian/patches/20_libindicate.patch:
  - Integrate into messaging menu
* debian/patches/21_login_indicators.patch:
  - Only display indicator for signon events if the preference is set
* debian/patches/31_really_raise_window.patch:
  - Force focus of the window when selected from the indicator
* debian/patches/34_start_raised_execpt_in_session.patch:
  - If not started with the session, we should always raise
* debian/patches/36_chat_window_default_size.patch:
  - Make the default chat window size larger
* debian/patches/37_facebook_default.patch:
  - Make facebook the default chat account type
* debian/patches/38_lp_569289.patch
  - Set freenode as default IRC network for new IRC accounts

115. By Robert Ancell

* New upstream release
* debian/control:
  - Bump build-depends on libtelepathy-glib-dev, libfolks-dev,
    libtelepathy-logger-dev

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