[Pkg-telepathy-commits] ./packages/unstable/telepathy-stream-engine r48: Fix conflict

Sjoerd Simons sjoerd at luon.net
Tue Jun 3 14:50:06 UTC 2008


------------------------------------------------------------
revno: 48
committer: Sjoerd Simons <sjoerd at luon.net>
branch nick: telepathy-stream-engine
timestamp: Tue 2008-06-03 16:50:06 +0200
message:
  Fix conflict
modified:
  changelog
  control
    ------------------------------------------------------------
    revno: 46.1.1
    committer: Simon McVittie <smcv at debian.org>
    branch nick: telepathy-stream-engine-unstable
    timestamp: Sun 2008-04-27 12:06:38 +0100
    message:
      Use my debian.org address in Uploaders
    modified:
      changelog
      control
    ------------------------------------------------------------
    revno: 46.1.2
    committer: Sjoerd Simons <sjoerd at luon.net>
    branch nick: telepathy-stream-engine
    timestamp: Tue 2008-04-29 11:01:33 +0200
    message:
      Up build-depend on telepathy-glib-dev
    modified:
      changelog
      control
-------------- next part --------------
=== modified file 'changelog'
--- a/changelog	2008-04-12 22:16:18 +0000
+++ b/changelog	2008-06-03 14:50:06 +0000
@@ -1,3 +1,14 @@
+telepathy-stream-engine (0.5.2-2) UNRELEASED; urgency=low
+
+  [ Simon McVittie ]
+  * Use my debian.org address in Uploaders
+
+  [ Sjoerd Simons ]
+  * debian/control: Bump telepathy-glib-dev build-depends to >= 0.7.6 to match
+    configure
+
+ -- Sjoerd Simons <sjoerd at debian.org>  Tue, 29 Apr 2008 11:00:33 +0200
+
 telepathy-stream-engine (0.5.2-1) unstable; urgency=low
 
   * New upstream release

=== modified file 'control'
--- a/control	2008-04-12 19:49:51 +0000
+++ b/control	2008-04-29 09:01:33 +0000
@@ -2,9 +2,9 @@
 Priority: optional
 Section: net
 Maintainer: Debian Telepathy maintainers <pkg-telepathy-maintainers at lists.alioth.debian.org>
-Uploaders: Dafydd Harries <daf at debian.org>, Riccardo Setti <giskard at debian.org>, Simon McVittie <smcv at ianadd.pseudorandom.co.uk>, Sjoerd Simons <sjoerd at debian.org>, Laurent Bigonville <bigon at bigon.be>
+Uploaders: Dafydd Harries <daf at debian.org>, Riccardo Setti <giskard at debian.org>, Simon McVittie <smcv at debian.org>, Sjoerd Simons <sjoerd at debian.org>, Laurent Bigonville <bigon at bigon.be>
 Standards-Version: 3.7.3
-Build-Depends: debhelper (>= 5), cdbs, libtelepathy-glib-dev (>= 0.7.1), libfarsight0.1-dev (>= 0.1.27), libgstreamer-plugins-base0.10-dev, libx11-dev, zlib1g-dev, xsltproc, python
+Build-Depends: debhelper (>= 5), cdbs, libtelepathy-glib-dev (>= 0.7.6), libfarsight0.1-dev (>= 0.1.27), libgstreamer-plugins-base0.10-dev, libx11-dev, zlib1g-dev, xsltproc, python
 XS-Vcs-Bzr: http://bzr.debian.org/pkg-telepathy/packages/unstable/telepathy-stream-engine/
 
 Package: telepathy-stream-engine



More information about the Pkg-telepathy-commits mailing list