r1530 - in /unstable/toolame/debian: changelog control patches/ patches/01-WAV-header-read-incorrectly-on-64-bit-platforms.patch patches/series rules

[fabian-guest at users.alioth.debian.org]

Author: fabian-guest
Date: Mon Nov  3 09:35:37 2008
New Revision: 1530

URL: http://svn.debian.org/wsvn/pkg-multimedia/?sc=1&rev=1530
Log:
   * debian/control:
    + Added myself back to uploaders... ;)
    + Added Build-Depends on quilt.
    + Bumped Standards-Version to 3.8.0.
   * debian/rules:
    + Included quilt for patch management.
  * debian/patches/01-WAV-header-read-incorrectly-on-64-bit-platforms.patch:
    + New patch to fix usage of "unsigned long" on 64-bit little-endian
      platforms (Closes: #504308). Thanks Christian Grigis <glove at grigri.org>!


Added:
    unstable/toolame/debian/patches/
    unstable/toolame/debian/patches/01-WAV-header-read-incorrectly-on-64-bit-platforms.patch
    unstable/toolame/debian/patches/series
Modified:
    unstable/toolame/debian/changelog
    unstable/toolame/debian/control
    unstable/toolame/debian/rules

Modified: unstable/toolame/debian/changelog
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/toolame/debian/changelog?rev=1530&op=diff
==============================================================================
--- unstable/toolame/debian/changelog (original)
+++ unstable/toolame/debian/changelog Mon Nov  3 09:35:37 2008
@@ -1,13 +1,18 @@
 toolame (02l-7) UNRELEASED; urgency=low
 
   * debian/control:
-    + Removed myself from Uploaders.
+    + Added Build-Depends on quilt.
+    + Bumped Standards-Version to 3.8.0.
     + Removed the "XS-" prefix from the Vcs-Svn and Vcs-Browser fields.
     + Added Homepage field and removed it from the package description.
   * debian/rules:
+    + Included quilt for patch management.
     + Fixed "debian-rules-ignores-make-clean-error".
+  * debian/patches/01-WAV-header-read-incorrectly-on-64-bit-platforms.patch:
+    + New patch to fix usage of "unsigned long" on 64-bit little-endian
+      platforms (Closes: #504308). Thanks Christian Grigis <glove at grigri.org>!
 
- -- Fabian Greffrath <fabian at debian-unofficial.org>  Thu, 04 Sep 2008 11:20:27 +0200
+ -- Fabian Greffrath <fabian at debian-unofficial.org>  Thu, 03 Nov 2008 10:31:30 +0200
 
 toolame (02l-6) unstable; urgency=low
 

Modified: unstable/toolame/debian/control
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/toolame/debian/control?rev=1530&op=diff
==============================================================================
--- unstable/toolame/debian/control (original)
+++ unstable/toolame/debian/control Mon Nov  3 09:35:37 2008
@@ -2,9 +2,9 @@
 Section: sound
 Priority: optional
 Maintainer: Debian multimedia packages maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
-Uploaders: Sam Hocevar (Debian packages) <sam+deb at zoy.org>
-Build-Depends: debhelper (>= 5)
-Standards-Version: 3.7.2
+Uploaders: Fabian Greffrath <fabian at debian-unofficial.org>, Sam Hocevar (Debian packages) <sam+deb at zoy.org>
+Build-Depends: debhelper (>= 5), quilt
+Standards-Version: 3.8.0
 Vcs-Svn: svn://svn.debian.org/pkg-multimedia/unstable/toolame
 Vcs-Browser: http://svn.debian.org/wsvn/pkg-multimedia/unstable/toolame/
 Homepage: http://toolame.sourceforge.net/

Added: unstable/toolame/debian/patches/01-WAV-header-read-incorrectly-on-64-bit-platforms.patch
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/toolame/debian/patches/01-WAV-header-read-incorrectly-on-64-bit-platforms.patch?rev=1530&op=file
==============================================================================
--- unstable/toolame/debian/patches/01-WAV-header-read-incorrectly-on-64-bit-platforms.patch (added)
+++ unstable/toolame/debian/patches/01-WAV-header-read-incorrectly-on-64-bit-platforms.patch Mon Nov  3 09:35:37 2008
@@ -1,0 +1,20 @@
+diff -Nru toolame-02l.orig/audio_read.c toolame-02l/audio_read.c
+--- toolame-02l.orig/audio_read.c	2008-11-02 19:01:25.000000000 +0100
++++ toolame-02l/audio_read.c	2008-11-02 19:09:57.000000000 +0100
+@@ -1,6 +1,7 @@
+ #include <stdio.h>
+ #include <stdlib.h>
+ #include <string.h>
++#include <stdint.h>
+ #include "common.h"
+ #include "encoder.h"
+ #include "options.h"
+@@ -329,7 +330,7 @@
+       }
+     }
+     if (NativeByteOrder == order_littleEndian) {
+-      samplerate = *(unsigned long *) (&wave_header_buffer[24]);
++      samplerate = *(uint32_t *) (&wave_header_buffer[24]);
+     } else {
+       samplerate = wave_header_buffer[27] +
+ 	(wave_header_buffer[26] << 8) +

Added: unstable/toolame/debian/patches/series
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/toolame/debian/patches/series?rev=1530&op=file
==============================================================================
--- unstable/toolame/debian/patches/series (added)
+++ unstable/toolame/debian/patches/series Mon Nov  3 09:35:37 2008
@@ -1,0 +1,1 @@
+01-WAV-header-read-incorrectly-on-64-bit-platforms.patch

Modified: unstable/toolame/debian/rules
URL: http://svn.debian.org/wsvn/pkg-multimedia/unstable/toolame/debian/rules?rev=1530&op=diff
==============================================================================
--- unstable/toolame/debian/rules (original)
+++ unstable/toolame/debian/rules Mon Nov  3 09:35:37 2008
@@ -2,6 +2,8 @@
 
 # Uncomment this to turn on verbose mode.
 #export DH_VERBOSE=1
+
+include /usr/share/quilt/quilt.make
 
 CFLAGS = -Wall -g
 
@@ -11,7 +13,7 @@
 	CFLAGS += -O2
 endif
 
-build: build-stamp
+build: $(QUILT_STAMPFN) build-stamp
 build-stamp:
 	dh_testdir
 
@@ -20,7 +22,7 @@
 
 	touch build-stamp
 
-clean:
+clean: unpatch
 	dh_testdir
 	dh_testroot
 	rm -f build-stamp