r15335 - in packages/trunk/zaz/debian: . patches

[Miriam Ruiz]

Author: miriam
Date: 2014-11-24 23:07:28 +0000 (Mon, 24 Nov 2014)
New Revision: 15335

Added:
   packages/trunk/zaz/debian/patches/libvorbis.patch
Modified:
   packages/trunk/zaz/debian/changelog
   packages/trunk/zaz/debian/control
   packages/trunk/zaz/debian/patches/series
Log:
Fix #768718. Prepare release



Modified: packages/trunk/zaz/debian/changelog
===================================================================
--- packages/trunk/zaz/debian/changelog	2014-11-24 22:50:58 UTC (rev 15334)
+++ packages/trunk/zaz/debian/changelog	2014-11-24 23:07:28 UTC (rev 15335)
@@ -1,3 +1,15 @@
+zaz (1.0.0~dfsg1-3) unstable; urgency=medium
+
+  [ Peter Pentchev ]
+  * Team upload.
+  * Link with libvorbis, not just libvorbisenc. Closes: #768718
+
+  [ Miriam Ruiz ]
+  * Upgraded Standards-Version from 3.9.4 to 3.9.6
+  * Added Peter Pentchev <roam at ringlet.net> to Uploaders.
+
+ -- Peter Pentchev <roam at ringlet.net>  Mon, 10 Nov 2014 12:04:13 +0200
+
 zaz (1.0.0~dfsg1-2) unstable; urgency=low
 
   [ Miriam Ruiz ]

Modified: packages/trunk/zaz/debian/control
===================================================================
--- packages/trunk/zaz/debian/control	2014-11-24 22:50:58 UTC (rev 15334)
+++ packages/trunk/zaz/debian/control	2014-11-24 23:07:28 UTC (rev 15335)
@@ -2,7 +2,7 @@
 Section: games
 Priority: optional
 Maintainer: Debian Games Team <pkg-games-devel at lists.alioth.debian.org>
-Uploaders: Miriam Ruiz <miriam at debian.org>
+Uploaders: Miriam Ruiz <miriam at debian.org>, Peter Pentchev <roam at ringlet.net>
 Build-Depends:
  autotools-dev,
  debhelper (>= 9),
@@ -17,7 +17,7 @@
  libxext-dev,
  pkg-config,
  ttf-freefont
-Standards-Version: 3.9.4
+Standards-Version: 3.9.6
 Homepage: http://phuzzboxmedia.com/games/open-sourced-zaz
 Vcs-Svn: svn://anonscm.debian.org/pkg-games/packages/trunk/zaz/
 Vcs-Browser: http://anonscm.debian.org/viewvc/pkg-games/packages/trunk/zaz/

Added: packages/trunk/zaz/debian/patches/libvorbis.patch
===================================================================
--- packages/trunk/zaz/debian/patches/libvorbis.patch	                        (rev 0)
+++ packages/trunk/zaz/debian/patches/libvorbis.patch	2014-11-24 23:07:28 UTC (rev 15335)
@@ -0,0 +1,29 @@
+Description: Link with libvorbis, too.
+ This is fallout from the fact that other libraries in Debian, such as
+ libvorbisfile, no longer include their own dependencies in the pkg-config
+ output.  Until now, zaz built just fine because -lvorbis was added by
+ other libraries; now it has to add it on its own.
+ .
+ This bug should really be fixed upstream by adding an explicit check for
+ libvorbis in configure.ac, something like
+ AC_CHECK_LIB([vorbis], [vorbis_bitrate_addblock])
+ I do intend to do that in a future upload, but IMHO this minimal patch
+ ought to be suitable for the Jessie freeze.
+Debian-Bug: https://bugs.debian.org/768718
+Author: Peter Pentchev <roam at ringlet.net>
+Forwarded: not-yet
+Last-Update: 2014-11-10
+
+Index: zaz-1.0.0/src/Makefile.in
+===================================================================
+--- zaz-1.0.0.orig/src/Makefile.in
++++ zaz-1.0.0/src/Makefile.in
+@@ -273,7 +273,7 @@ zaz_SOURCES = \
+ 	splash.cpp 
+ 
+ zaz_LDFLAGS = 
+-zaz_LDADD = $(ZAZ_LIBS) $(FTGL_LIBS) $(GL_LIBS) @LIBINTL@
++zaz_LDADD = $(ZAZ_LIBS) -lvorbis $(FTGL_LIBS) $(GL_LIBS) @LIBINTL@
+ all: all-am
+ 
+ .SUFFIXES:

Modified: packages/trunk/zaz/debian/patches/series
===================================================================
--- packages/trunk/zaz/debian/patches/series	2014-11-24 22:50:58 UTC (rev 15334)
+++ packages/trunk/zaz/debian/patches/series	2014-11-24 23:07:28 UTC (rev 15335)
@@ -2,3 +2,4 @@
 no_music_2.patch
 mismatched_delete.patch
 jumpy_keyboard.patch
+libvorbis.patch