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

[Miriam Ruiz]

Author: miriam
Date: 2011-11-16 03:19:01 +0000 (Wed, 16 Nov 2011)
New Revision: 12811

Modified:
   packages/trunk/zaz/debian/changelog
   packages/trunk/zaz/debian/patches/no_music.patch
Log:
Prepare package for upload



Modified: packages/trunk/zaz/debian/changelog
===================================================================
--- packages/trunk/zaz/debian/changelog	2011-11-16 02:57:33 UTC (rev 12810)
+++ packages/trunk/zaz/debian/changelog	2011-11-16 03:19:01 UTC (rev 12811)
@@ -1,4 +1,4 @@
-zaz (1.0.0~dfsg1-1) UNRELEASED; urgency=low
+zaz (1.0.0~dfsg1-1) unstable; urgency=low
 
   * New Upstream Release
   * Upgraded Standards-Version from 3.8.3 to 3.9.2

Modified: packages/trunk/zaz/debian/patches/no_music.patch
===================================================================
--- packages/trunk/zaz/debian/patches/no_music.patch	2011-11-16 02:57:33 UTC (rev 12810)
+++ packages/trunk/zaz/debian/patches/no_music.patch	2011-11-16 03:19:01 UTC (rev 12811)
@@ -69,7 +69,7 @@
      }
  
      if (ov_open_callbacks(inphile, &vf, NULL, 0, OV_CALLBACKS_NOCLOSE) < 0)
-@@ -45,6 +51,15 @@
+@@ -45,6 +51,16 @@
      length = ov_pcm_total(&vf, -1) * channels;
  
      loaded = true;
@@ -78,6 +78,7 @@
 +
 +error:
 +        vi=NULL;
++        inphile = NULL;
 +        channels = 0;
 +        length = 0;
 +        loaded = false;
@@ -85,3 +86,15 @@
  }
  
  StreamingOggSample::~StreamingOggSample()
+@@ -66,6 +82,11 @@
+ 
+ Sint16 * StreamingOggSample::getSampleData(uint requested_length, uint &returned_length)
+ {
++    if (!loaded)
++    {
++        returned_length = 0;
++        return NULL;
++    }
+     if (bufflen != requested_length)
+     {
+         if (buff)