Bug#769157: unblock: libtheora/1.1.1+dfsg.1-6 (fix for RC bug #768685)

[Petter Reinholdtsen]

Package: release.debian.org
User: release.debian.org at packages.debian.org
Usertags: unblock
Severity: normal

Please unblock package libtheora to fix a build failure discovered after
the last upload and caused by the new libvorbis library.  An example
program failed to build without -lm in its link list.  The fix is
already included upstream.

This is the complete set of source code changes compared to the version
in testing:

diff --git a/debian/changelog b/debian/changelog
index 85b94d5..24bd928 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,11 @@
+libtheora (1.1.1+dfsg.1-6) unstable; urgency=low
+
+  [ Martin Steghöfer ]
+  * Add missing -lm to player-example.  Thanks to Simon
+    McVittie (Closes: #768685)
+
+ -- Petter Reinholdtsen <pere at debian.org>  Tue, 11 Nov 2014 14:46:22 +0100
+
 libtheora (1.1.1+dfsg.1-5) unstable; urgency=low
 
   * Switch to source format 3.0 (quilt).
diff --git a/debian/patches/0004-player-example-needs-lm-for-rint.patch b/debian/patches/0004-player-example-needs-lm-for-rint.patch
new file mode 100644
index 0000000..0ade731
--- /dev/null
+++ b/debian/patches/0004-player-example-needs-lm-for-rint.patch
@@ -0,0 +1,22 @@
+From: Simon McVittie <smcv at debian.org>
+Date: Mon, 10 Nov 2014 10:29:42 +0000
+Subject: player-example needs -lm for rint()
+
+Bug-Debian: https://bugs.debian.org/cgi-bin/bugreport.cgi?bug=768685
+---
+ examples/Makefile.am | 2 +-
+ 1 file changed, 1 insertion(+), 1 deletion(-)
+
+diff --git a/examples/Makefile.am b/examples/Makefile.am
+index fe66a21..289e219 100644
+--- a/examples/Makefile.am
++++ b/examples/Makefile.am
+@@ -22,7 +22,7 @@ dump_psnr_LDADD = $(GETOPT_OBJS) $(LDADDDEC) -lm
+ 
+ player_example_SOURCES = player_example.c
+ player_example_CFLAGS = $(SDL_CFLAGS) $(OGG_CFLAGS) $(VORBIS_CFLAGS)
+-player_example_LDADD = $(LDADDDEC) $(SDL_LIBS) $(VORBIS_LIBS) $(OSS_LIBS)
++player_example_LDADD = $(LDADDDEC) $(SDL_LIBS) $(VORBIS_LIBS) $(OSS_LIBS) -lm
+ 
+ encoder_example_SOURCES = encoder_example.c
+ EXTRA_encoder_example_SOURCES = getopt.c getopt1.c getopt.h
diff --git a/debian/patches/series b/debian/patches/series
index 801688e..49c0989 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 autotools
 dfsg
 build_on_gnu
+0004-player-example-needs-lm-for-rint.patch

unblock libtheora/1.1.1+dfsg.1-6

-- System Information:
Debian Release: 7.7
  APT prefers stable-updates
  APT policy: (500, 'stable-updates'), (500, 'stable')
Architecture: amd64 (x86_64)

Kernel: Linux 3.2.0-4-amd64 (SMP w/4 CPU cores)
Locale: LANG=en_US.UTF-8, LC_CTYPE=en_US.UTF-8 (charmap=UTF-8)
Shell: /bin/sh linked to /bin/dash