[Pkg-telepathy-commits] ./packages/unstable/telepathy-sofiasip r47: Merge

[Sjoerd Simons]

------------------------------------------------------------
revno: 47
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: telepathy-sofiasip
timestamp: Mon 2008-04-28 09:50:49 +0200
message:
  Merge
modified:
  changelog
  control
    ------------------------------------------------------------
    revno: 45.1.1
    committer: Simon McVittie <smcv at debian.org>
    branch nick: telepathy-sofiasip-unstable
    timestamp: Sun 2008-04-27 12:16:17 +0100
    message:
      Use my debian.org address in Uploaders
    modified:
      changelog
      control
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-04-26 09:04:42 +0000
+++ b/changelog	2008-04-28 07:50:49 +0000
@@ -1,11 +1,15 @@
 telepathy-sofiasip (0.5.7-1) UNRELEASED; urgency=low
 
+  [ Sjoerd Simons]
   * New upstream release
   * debian/patches/00_media_stream_error.patch
     + Added. Only close the media stream on error, not the whole session.
     Fixes sip calls not working without available video codecs when a video
     stream was requested (SF #1944820)
 
+  [ Simon McVittie]
+  * Use my debian.org address in Uploaders
+
  -- Sjoerd Simons <sjoerd at debian.org>  Sat, 26 Apr 2008 11:03:03 +0200
 
 telepathy-sofiasip (0.5.5-1) unstable; urgency=low

=== modified file 'control'
--- a/control	2008-03-08 17:02:52 +0000
+++ b/control	2008-04-27 11:16:17 +0000
@@ -3,7 +3,7 @@
 Priority: optional
 Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth.debian.org>
 Uploaders: Dafydd Harries <daf at debian.org>,
-           Simon McVittie <smcv at ianadd.pseudorandom.co.uk>,
+           Simon McVittie <smcv at debian.org>,
            Sjoerd Simons <sjoerd at debian.org>,
            Laurent Bigonville <bigon at bigon.be>,
            Loic Minier <lool at dooz.org>