diff -u gst-plugins-farsight-0.12.1/debian/rules gst-plugins-farsight-0.12.1/debian/rules --- gst-plugins-farsight-0.12.1/debian/rules +++ gst-plugins-farsight-0.12.1/debian/rules @@ -11,3 +11,8 @@ +# Touch autotools files to prevent auto* from trying to regenerate them +post-patches:: apply-patches + touch -t 200705040024 configure.ac aclocal.m4 config.h.in Makefile.in + binary-post-install/gstreamer0.10-plugins-farsight:: + dh_gstscancodecs rm -rf debian/*/usr/lib/gstreamer-0.10/*.la diff -u gst-plugins-farsight-0.12.1/debian/changelog gst-plugins-farsight-0.12.1/debian/changelog --- gst-plugins-farsight-0.12.1/debian/changelog +++ gst-plugins-farsight-0.12.1/debian/changelog @@ -1,3 +1,17 @@ +gst-plugins-farsight (0.12.1-1ubuntu1) gutsy; urgency=low + + * Merge from debian unstable (LP #114444), remaining changes: + - B/D on gstreamer-tools + - Call dh_gstscancodecs, for automatic codec install + * debian/patches/99_autoconf_g729_conditional.patch + - Fix the build when --enable-g729 is not passed to configure; + The codec is undistributable. + * debian/rules: + - Touch autotools files to ensure the autoconf patch doesn't cause + autotools to try to regenerate. + + -- Christopher James Halse Rogers (RAOF) Thu, 28 Jun 2007 14:34:38 +1000 + gst-plugins-farsight (0.12.1-1) unstable; urgency=low [ Simon McVittie ] @@ -17,12 +31,42 @@ -- Simon McVittie Mon, 6 Nov 2006 17:21:49 -0800 +gst-plugins-farsight (0.10.2-1ubuntu2) feisty; urgency=low + + * debian/control: + - Build-Depends on gstreamer-tools (>= 0.10.11cvs20070110) + * debian/rules: + - call dh_gstscancodecs + + -- Sebastien Bacher Tue, 16 Jan 2007 17:17:26 +0100 + +gst-plugins-farsight (0.10.2-1ubuntu1) feisty; urgency=low + + * Resynchronized with Debian, remaining Ubuntu changes: + - debian/rules: + binary-post-install/gst-plugins-farsight:: -> + binary-post-install/gstreamer0.10-plugins-farsight:: + + -- Daniel Holbach Thu, 21 Dec 2006 13:43:01 +0100 + +gst-plugins-farsight (0.10.2-1) unstable; urgency=low + + * New upstream release. + + -- Dafydd Harries Sun, 8 Oct 2006 12:12:29 -0400 + gst-plugins-farsight (0.10.2-0ubuntu1) edgy; urgency=low * New Upstream Release. -- Riccardo Setti Tue, 19 Sep 2006 18:32:43 +0200 +gst-plugins-farsight (0.10.1-1) unstable; urgency=low + + * Add libjinglep2p-dev build dependency. + + -- Dafydd Harries Mon, 7 Aug 2006 16:44:35 +0100 + gst-plugins-farsight (0.10.1-0ubuntu1) edgy; urgency=low * New Upstream Release. diff -u gst-plugins-farsight-0.12.1/debian/control gst-plugins-farsight-0.12.1/debian/control --- gst-plugins-farsight-0.12.1/debian/control +++ gst-plugins-farsight-0.12.1/debian/control @@ -1,9 +1,10 @@ Source: gst-plugins-farsight Section: sound Priority: optional -Maintainer: Dafydd Harries +Maintainer: Ubuntu MOTU Developers +XSBC-Original-Maintainer: Dafydd Harries Uploaders: Riccardo Setti , Simon McVittie -Build-Depends: cdbs, debhelper (>= 5), libgstreamer-plugins-base0.10-dev (>= 0.10.3), libgstreamer0.10-dev (>= 0.10.3), libgsm1-dev, libjasper-dev | libjasper-1.701-dev, libjinglep2p0.3-dev +Build-Depends: cdbs, debhelper (>= 5), libgstreamer-plugins-base0.10-dev (>=0.10.3), libgstreamer0.10-dev (>= 0.10.3), gstreamer-tools (>=0.10.11cvs20070110), libgsm1-dev, libjasper-dev | libjasper-1.701-dev, libjinglep2p0.3-dev Standards-Version: 3.7.2 Package: gstreamer0.10-plugins-farsight only in patch2: unchanged: --- gst-plugins-farsight-0.12.1.orig/debian/patches/99_autoconf_g729_conditional.patch +++ gst-plugins-farsight-0.12.1/debian/patches/99_autoconf_g729_conditional.patch @@ -0,0 +1,31 @@ +diff -Nur gst-plugins-farsight-0.12.1/configure gst-plugins-farsight-0.12.1.new/configure +--- gst-plugins-farsight-0.12.1/configure 2007-05-04 00:24:35.000000000 +1000 ++++ gst-plugins-farsight-0.12.1.new/configure 2007-06-27 17:58:24.000000000 +1000 +@@ -24859,11 +24859,13 @@ + ENABLE_G729_FALSE= + fi + ++if test x$ENABLE_G729 = xyes; then + + cat >>confdefs.h <<\_ACEOF + #define ENABLE_G729 + _ACEOF + ++fi + + ac_config_files="$ac_config_files Makefile ext/Makefile ext/jrtp/Makefile ext/mimic/Makefile ext/gsm/Makefile ext/jpeg2000/Makefile ext/jasper/Makefile ext/ice/Makefile ext/gconf/Makefile gst/Makefile gst/rtppayloads/Makefile gst/rtpdtmf/Makefile gst/rtpmux/Makefile gst/rtpdemux/Makefile gst/rtpssrcdemux/Makefile gst/rtpjitterbuffer/Makefile gst/network-simulator/Makefile tests/Makefile m4/Makefile" + +diff -Nur gst-plugins-farsight-0.12.1/configure.ac gst-plugins-farsight-0.12.1.new/configure.ac +--- gst-plugins-farsight-0.12.1/configure.ac 2007-05-04 00:24:24.000000000 +1000 ++++ gst-plugins-farsight-0.12.1.new/configure.ac 2007-05-04 00:24:00.000000000 +1000 +@@ -336,7 +336,9 @@ + + AC_MSG_RESULT(Checking for --enable-g729... $g729) + AM_CONDITIONAL(ENABLE_G729, test "x$g729" != "xno") +-AC_DEFINE(ENABLE_G729, , [Compile the G729 payloader and depayloader]) ++if test x$ENABLE_G729 = xyes; then ++ AC_DEFINE(ENABLE_G729, , [Compile the G729 payloader and depayloader]) ++fi + + AC_OUTPUT(Makefile \ + ext/Makefile \