[Pkg-telepathy-commits] ./packages/unstable/telepathy-salut r42: Fix conflict

[Sjoerd Simons]

------------------------------------------------------------
revno: 42
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: telepathy-salut
timestamp: Tue 2008-06-03 16:53:30 +0200
message:
  Fix conflict
modified:
  changelog
  control
    ------------------------------------------------------------
    revno: 40.1.1
    committer: Simon McVittie <smcv at debian.org>
    branch nick: telepathy-salut-unstable
    timestamp: Sun 2008-04-27 12:21:15 +0100
    message:
      Use my debian.org address in Uploaders
    modified:
      changelog
      control
    ------------------------------------------------------------
    revno: 40.1.2
    committer: Laurent Bigonville <bigon at bigon.be>
    branch nick: telepathy-salut
    timestamp: Sat 2008-05-24 21:00:34 +0200
    message:
      New upstream release
    modified:
      changelog
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-04-26 13:38:07 +0000
+++ b/changelog	2008-06-03 14:53:30 +0000
@@ -1,9 +1,16 @@
-telepathy-salut (0.3.1-2) UNRELEASED; urgency=low
-
+telepathy-salut (0.3.2-1) UNRELEASED; urgency=low
+
+  [ Simon McVittie ]
+  * Use my debian.org address in Uploaders
+
+  [ Laurent Bigonville ]
+  * New upstream release
+
+  [ Sjoerd Simons ]
   * debian/control: Remove build-depend on libavahi-glib-dev,
     libavahi-gobject-dev pulls it in.
 
- -- Sjoerd Simons <sjoerd at debian.org>  Sat, 26 Apr 2008 14:35:18 +0200
+ -- Laurent Bigonville <bigon at bigon.be>  Sat, 24 May 2008 20:55:34 +0200
 
 telepathy-salut (0.3.1-1) unstable; urgency=low
 

=== modified file 'control'
--- a/control	2008-04-26 13:38:07 +0000
+++ b/control	2008-06-03 14:53:30 +0000
@@ -1,7 +1,7 @@
 Source: telepathy-salut
 Standards-Version: 3.7.3
 Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth.debian.org>
-Uploaders: Sjoerd Simons <sjoerd at debian.org>, Laurent Bigonville <bigon at bigon.be>, Simon McVittie <smcv at ianadd.pseudorandom.co.uk>, Jonny Lamb <jonnylamb at jonnylamb.com>
+Uploaders: Sjoerd Simons <sjoerd at debian.org>, Laurent Bigonville <bigon at bigon.be>, Simon McVittie <smcv at debian.org>, Jonny Lamb <jonnylamb at jonnylamb.com>
 Section: net
 Priority: optional
 Build-Depends: cdbs, debhelper (>= 5), libdbus-glib-1-dev (>= 0.61), libxml2-dev, libavahi-gobject-dev, libtelepathy-glib-dev (>= 0.6.1), xsltproc, python