[SCM] rotter packaging branch, master, updated. debian/0.8-1

freee at users.alioth.debian.org freee at users.alioth.debian.org
Fri Dec 4 07:51:32 UTC 2009


The following commit has been merged in the master branch:
commit 5a3567580bea44e0abf7d0efc05363dcf2929f1f
Author: Free Ekanayaka <free at 64studio.com>
Date:   Fri Dec 4 08:42:22 2009 +0100

    Add use_ogg.diff patch

diff --git a/debian/control b/debian/control
index d6f181f..c6cecbb 100644
--- a/debian/control
+++ b/debian/control
@@ -5,6 +5,7 @@ Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alio
 Uploaders: Free Ekanayaka <freee at debian.org>,
  Alessio Treglia <quadrispro at ubuntu.com>
 Build-Depends: debhelper (>= 7.0.50),
+ quilt,
  autotools-dev,
  libjack-dev,
  libsndfile-dev,
diff --git a/debian/patches/series b/debian/patches/series
new file mode 100644
index 0000000..8d9ac19
--- /dev/null
+++ b/debian/patches/series
@@ -0,0 +1 @@
+use_ogg.diff
diff --git a/debian/patches/use_ogg.diff b/debian/patches/use_ogg.diff
new file mode 100644
index 0000000..f181880
--- /dev/null
+++ b/debian/patches/use_ogg.diff
@@ -0,0 +1,19 @@
+Description: Use .ogg instead of .oga as extension for Vorbis file.
+ For some reason libsndfile uses .oga as default extension for Vorbis
+ files and Audacity has problems opening it.
+Author: Free Ekanayaka <freee at debian.org>
+
+diff --git a/src/sndfile.c b/src/sndfile.c
+index e19f256..2aa158c 100644
+--- a/src/sndfile.c
++++ b/src/sndfile.c
+@@ -230,6 +230,9 @@ encoder_funcs_t* init_sndfile( const char* fmt_str, int channels, int bitrate )
+ 	
+ 	
+ 	// Fill in the encoder callback functions
++        if (strcmp(format_info.extension, "oga") == 0) {
++          format_info.extension = "ogg";
++        }
+ 	funcs->file_suffix = format_info.extension;
+ 	funcs->open = open_sndfile;
+ 	funcs->close = close_sndfile;
diff --git a/debian/rules b/debian/rules
index 4592722..4ba3dfd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 %:
-	dh $@
+	dh --with quilt $@
 
 override_dh_auto_clean:
 	-mv -f config.guess.orig config.guess

-- 
rotter packaging



More information about the pkg-multimedia-commits mailing list