Merge lp:~ari-tczew/ubuntu/natty/farsight2/lp-690736 into lp:ubuntu/natty/farsight2

[Artur Rona]

I added missing revisions in debian/changelog.

[Robert Ancell (robert-ancell)]

Hi Ari, can you repropose this as a merge on lp:~ubuntu-desktop/farsight/ubuntu?

review: Resubmit

[Artur Rona (ari-tczew)]

No, I can't. Reason: This branch is not mergeable into lp:~ubuntu-desktop/farsight/ubuntu.

review: Needs Information

=== modified file 'debian/changelog'
--- debian/changelog	2010-12-08 15:02:40 +0000
+++ debian/changelog	2010-12-15 17:31:16 +0000
@@ -1,3 +1,28 @@
+farsight2 (0.0.22-1ubuntu1) natty; urgency=low
+
+  * Merge from debian unstable.  Remaining changes: (LP: #690736)
+    - debian/control:
+      + Don't depend on gstreamer0.10-plugins-bad, codecs moved to -good.
+      + Bump dependendency on -good to 0.10.17-1ubuntu1 to have necessary
+        codecs supported.
+      + Add Vcs-Bzr link related to Ubuntu Desktop Team.
+
+ -- Artur Rona <[e-mail]>  Wed, 15 Dec 2010 17:52:00 +0100
+
+farsight2 (0.0.22-1) unstable; urgency=low
+
+  * New upstream release
+    - Adjust build-dependencies
+    - Drop d/p/0001-rtpconference-The-ptime-maxptime-in-caps-are-actuall.patch
+      Applied upstream
+  * debian/control:
+    - Move python-farsight to priority optional instead of extra
+    - Bump Standards-Version to 3.9.1
+  * Bump debhelper version to 7
+  * Switch to dpkg-source 3.0 (quilt) format
+
+ -- Laurent Bigonville <[e-mail]>  Fri, 12 Nov 2010 12:59:05 +0100
+
 farsight2 (0.0.22-0ubuntu2) natty; urgency=low
 
   * Rebuild with python 2.7 as the python default.
@@ -16,6 +41,14 @@
 
  -- Robert Ancell <[e-mail]>  Mon, 29 Nov 2010 09:38:34 +1100
 
+farsight2 (0.0.21-2) unstable; urgency=low
+
+  * d/p/0001-rtpconference-The-ptime-maxptime-in-caps-are-actuall.patch
+    + Added. Fixes interoperability with various SIP phones that only work when
+    ptime is properly used.
+
+ -- Sjoerd Simons <[e-mail]>  Mon, 18 Oct 2010 14:31:06 +0100
+
 farsight2 (0.0.21-1ubuntu1) maverick; urgency=low
 
   * Merge with Debian unstable, remaining Ubuntu changes:
@@ -35,6 +68,16 @@
 
  -- Sjoerd Simons <[e-mail]>  Wed, 28 Jul 2010 16:34:02 +0200
 
+farsight2 (0.0.20-2ubuntu1) maverick; urgency=low
+
+  * Resync on Debian
+  * debian/control: 
+    - don't depend on gstreamer0.10-plugins-bad, codecs moved to -good
+    - bump dependendency on -good to 0.10.17-1ubuntu1 to have necessary
+      codecs supported
+
+ -- Sebastien Bacher <[e-mail]>  Tue, 22 Jun 2010 22:48:58 +0200
+
 farsight2 (0.0.20-2) unstable; urgency=medium
 
   * added d/p/0001-rtpdiscocodecs-Remove-a-bad-cast-when-listing-codecs.patch

=== modified file 'debian/compat'
--- debian/compat	2008-03-11 17:38:22 +0000
+++ debian/compat	2010-12-15 17:31:16 +0000
@@ -1,1 +1,1 @@
-5
+7

=== modified file 'debian/control'
--- debian/control	2010-11-29 09:38:34 +0000
+++ debian/control	2010-12-15 17:31:16 +0000
@@ -2,19 +2,19 @@
 Priority: optional
 Section: libs
 Maintainer: Ubuntu Developers <[e-mail]>
-XSBC-Original-Maintainer:  Debian Telepathy maintainers <[e-mail]>
+XSBC-Original-Maintainer: Debian Telepathy maintainers <[e-mail]>
 Uploaders: Dafydd Harries <[e-mail]>,
            Simon McVittie <[e-mail]>,
            Sjoerd Simons <[e-mail]>,
            Laurent Bigonville <[e-mail]>,
            Jonny Lamb <[e-mail]>
-Build-Depends: debhelper (>= 5.0.0),
+Build-Depends: debhelper (>= 7),
                cdbs,
                libglib2.0-dev (>= 2.16),
                libgstreamer0.10-dev (>= 0.10.26),
                libgstreamer-plugins-base0.10-dev (>= 0.10.26),
                python-central (>= 0.5),
-               python-gtk2-dev,
+               python-gobject-dev (>= 2.16),
                python-gst0.10-dev,
                libnice-dev (>= 0.0.9),
                libgupnp-igd-1.0-dev
@@ -81,7 +81,6 @@
 Package: python-farsight
 Section: python
 XB-Python-Version: ${python:Versions}
-Priority: extra
 Architecture: any
 Depends: ${shlibs:Depends}, ${misc:Depends}, ${python:Depends}, python-gst0.10
 Description: Audio/Video communications framework: Python bindings