Merge lp://staging/~ubuntu-branches/ubuntu/maverick/empathy/maverick-201208312044 into lp://staging/ubuntu/maverick/empathy
| Status: | Rejected |
|---|---|
| Rejected by: | James Westby |
| Proposed branch: | lp://staging/~ubuntu-branches/ubuntu/maverick/empathy/maverick-201208312044 |
| Merge into: | lp://staging/ubuntu/maverick/empathy |
| Diff against target: | 0 lines |
| To merge this branch: | bzr merge lp://staging/~ubuntu-branches/ubuntu/maverick/empathy/maverick-201208312044 |
| Related bugs: |
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Ubuntu Development Team | Pending | ||
|
Review via email:
|
|||
Description of the change
The package importer has detected a possible inconsistency between the package history in the archive and the history in bzr. As the archive is authoritative the importer has made lp:ubuntu/maverick/empathy reflect what is in the archive and the old bzr branch has been pushed to lp:~ubuntu-branches/ubuntu/maverick/empathy/maverick-201208312044. This merge proposal was created so that an Ubuntu developer can review the situations and perform a merge/upload if necessary. There are three typical cases where this can happen.
1. Where someone pushes a change to bzr and someone else uploads the package without that change. This is the reason that this check is done by the importer. If this appears to be the case then a merge/upload should be done if the changes that were in bzr are still desirable.
2. The importer incorrectly detected the above situation when someone made a change in bzr and then uploaded it.
3. The importer incorrectly detected the above situation when someone just uploaded a package and didn't touch bzr.
If this case doesn't appear to be the first situation then set the status of the merge proposal to "Rejected" and help avoid the problem in future by filing a bug at https:/
(this is an automatically generated message)
Unmerged revisions
- 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_empathyin dividualview_ 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_empathyin dividualview_ 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_notification s_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 - 114. By Robert Ancell
-
* New upstream release
* debian/control:
- Add build-depends on libfolks-dev, libfolks-telepathy- dev
- Bump build-depends on libtelepathy-farsight- dev
- Use standards-version 3.9.1
