diff -Nru liboggplay-0.2.1~git20091227/debian/changelog liboggplay-0.2.1~git20091227/debian/changelog --- liboggplay-0.2.1~git20091227/debian/changelog 2017-11-03 09:38:33.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/changelog 2017-11-01 13:48:45.000000000 +0000 @@ -1,3 +1,30 @@ +liboggplay (0.2.1~git20091227-4) unstable; urgency=medium + + * Marked liboggplay1 with Multi-Arch: same + * Marked liboggplay1-dev with Multi-Arch: same + * Declare compliance with Debian Policy 4.1.1 + + [ Lucas Kanashiro ] + * debian/control: change Priority to optional, extra was deprecated in Debian + Policy 4.0.1 + * debian control: remove unnecessary Testsuite field, it is automatically + added by dpkg + + -- Rodrigo Siqueira Wed, 01 Nov 2017 10:48:45 -0300 + +liboggplay (0.2.1~git20091227-3) unstable; urgency=medium + + * New maintainer (Closes: #791527) + * Updated copyright to accomplish the machine-readable requirements + * Upgraded to debhelper 9 + * Update liboggplay1-dev.install and liboggplay1.install to attend Debian + Policy 4.0.0 + * Added source/format and upgraded to quilt 3.0 + * Bumped Standards-Version to 4.0.0 + * Added package tests with autopkgtests tool + + -- Rodrigo Siqueira Fri, 25 Aug 2017 18:16:34 +0000 + liboggplay (0.2.1~git20091227-2) unstable; urgency=medium * QA upload. diff -Nru liboggplay-0.2.1~git20091227/debian/compat liboggplay-0.2.1~git20091227/debian/compat --- liboggplay-0.2.1~git20091227/debian/compat 2017-11-03 09:38:33.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/compat 2017-11-01 13:48:45.000000000 +0000 @@ -1 +1 @@ -7 +9 diff -Nru liboggplay-0.2.1~git20091227/debian/control liboggplay-0.2.1~git20091227/debian/control --- liboggplay-0.2.1~git20091227/debian/control 2017-11-03 09:38:33.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/control 2017-11-01 13:48:45.000000000 +0000 @@ -1,15 +1,24 @@ Source: liboggplay -Priority: extra -Maintainer: Debian QA Group -Build-Depends: debhelper (>= 7.0.50~), quilt (>= 0.46-7~), dh-autoreconf, pkg-config, liboggz-dev, libfishsound-dev, libtheora-dev, libkate-dev, libsndfile-dev -Standards-Version: 3.8.3 +Priority: optional +Maintainer: Rodrigo Siqueira +Build-Depends: debhelper (>= 9), + quilt, + dh-autoreconf, + pkg-config, + liboggz-dev, + libfishsound-dev, + libtheora-dev, + libkate-dev, + libsndfile-dev +Standards-Version: 4.1.1 Section: libs Package: liboggplay1 Architecture: any +Multi-Arch: same Depends: ${shlibs:Depends}, ${misc:Depends} -Description: A library for playing OGG multimedia - A library designed to allow drop-in playback of Xiph.Org media in an +Description: Library for playing OGG multimedia + liboggplay was designed to allow drop-in playback of Xiph.Org media in an application. liboggplay handles demuxing and decoding, generates timestamps for raw data, maintains synchronisation across multiple streams, and provides a lock-free buffer implementation for easy multithreading. @@ -17,29 +26,15 @@ Package: liboggplay1-dev Section: libdevel Architecture: any -Depends: liboggplay1 (= ${binary:Version}), ${misc:Depends} +Multi-Arch: same +Depends: liboggplay1 (= ${binary:Version}), ${misc:Depends}, liboggz-dev Provides: liboggplay-dev Conflicts: liboggplay-dev -Description: A library for playing OGG multimedia (development files) - A library designed to allow drop-in playback of Xiph.Org media in an +Description: Library for playing OGG multimedia (development files) + liboggplay was designed to allow drop-in playback of Xiph.Org media in an application. liboggplay handles demuxing and decoding, generates timestamps for raw data, maintains synchronisation across multiple streams, and provides a lock-free buffer implementation for easy multithreading. . This package contains the header files and static libraries required for developing applications that use liboggplay. - - -Package: liboggplay1-dbg -Section: debug -Architecture: any -Depends: liboggplay1 (= ${binary:Version}), ${misc:Depends} -Description: A library for playing OGG multimedia (debugging symbols) - A library designed to allow drop-in playback of Xiph.Org media in an - application. liboggplay handles demuxing and decoding, generates timestamps for - raw data, maintains synchronisation across multiple streams, and provides a - lock-free buffer implementation for easy multithreading. - . - This package contains debugging symbols useful for tracing bugs in the - liboggplay1 package. - diff -Nru liboggplay-0.2.1~git20091227/debian/copyright liboggplay-0.2.1~git20091227/debian/copyright --- liboggplay-0.2.1~git20091227/debian/copyright 2017-11-03 09:38:33.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/copyright 2017-11-01 13:48:45.000000000 +0000 @@ -1,81 +1,85 @@ -This package was debianized by John Ferlito on -Sat, 16 Feb 2008 22:04:01 +1100. - -It was downloaded from http://annodex.net/software/liboggplay/download/ - -Upstream Authors: - - Shane Stephens (shans) - - Design, general implementation - - Conrad Parker (kfish) - - Design, bug fixes - - Marcin Lubonski - - Port to windows - - Michael Martin (tahn) - - Port to Max OS X - - Jan Gerber (j^) - Ralph Giles - - Bug fixes - - Silvia Pfeiffer (ginger) - - First release, minor bug fixes - - John Ferlito (johnf) - - Bug fixes, Debian packaging - - Viktor Gal (wiking) - - Bug fixes - +Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/ +Upstream-Name: liboggplay +Upstream-Contact: Viktor Gal +Source: https://git.xiph.org/liboggplay.git + +Files: * +Copyright: 2003, CSIRO Australia +License: csiro + +Files: src/liboggplay/cpu.c +Copyright: 2002-2007, The Xiph.Org Foundation and contributors +License: BSD-3-clause +Files: debian/* Copyright: - - Copyright © 2003 CSIRO Australia - -License: - - Copyright © 2003 CSIRO Australia - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions - are met: - - - Redistributions of source code must retain the above copyright + 2009 John Ferlito + 2017 Rodrigo Siqueira +License: GPL-2 + +License: csiro + Copyright © 2003 CSIRO Australia + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + . + - Redistributions of source code must retain the above copyright + notice, this list of conditions and the following disclaimer. + . + - Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the + documentation and/or other materials provided with the distribution. + . + - Neither the name of the CSIRO nor the names of its + contributors may be used to endorse or promote products derived from + this software without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS + ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT + LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A + PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR + CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, + EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, + PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR + PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF + LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING + NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS + SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. + +License: BSD-3-clause + Copyright (c) The Regents of the University of California. + All rights reserved. + . + Redistribution and use in source and binary forms, with or without + modification, are permitted provided that the following conditions + are met: + 1. Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. - - - Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the + 2. Redistributions in binary form must reproduce the above copyright + notice, this list of conditions and the following disclaimer in the documentation and/or other materials provided with the distribution. - - - Neither the name of the CSIRO nor the names of its - contributors may be used to endorse or promote products derived from - this software without specific prior written permission. - - THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS - ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT - LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A - PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE ORGANISATION OR - CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, - EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, - PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR - PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF - LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING - NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS - SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. - -cpu.c: - - THIS FILE IS PART OF THE OggTheora SOFTWARE CODEC SOURCE CODE. - USE, DISTRIBUTION AND REPRODUCTION OF THIS LIBRARY SOURCE IS - GOVERNED BY A BSD-STYLE SOURCE LICENSE, - see `/usr/share/common-licenses/BSD'. - - THE Theora SOURCE CODE IS COPYRIGHT © 2002-2007 - by the Xiph.Org Foundation and contributors http://www.xiph.org/ - - -The Debian packaging is © 2009, John Ferlito and -is licensed under the GPL, see `/usr/share/common-licenses/GPL-2'. + 3. Neither the name of the University nor the names of its contributors + may be used to endorse or promote products derived from this software + without specific prior written permission. + . + THIS SOFTWARE IS PROVIDED BY THE REGENTS AND CONTRIBUTORS ``AS IS'' AND + ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + ARE DISCLAIMED. IN NO EVENT SHALL THE REGENTS OR CONTRIBUTORS BE LIABLE + FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + SUCH DAMAGE. + +License: GPL-2 + This program is free software; you can redistribute it and/or modify it under + the terms of the GNU General Public License as published by the Free Software + Foundation; either version 2 of the License, or (at your option) any later + version. + . + On Debian systems, the full text of the GNU General Public License + version 2 can be found in the file `/usr/share/common-licenses/GPL-2'. diff -Nru liboggplay-0.2.1~git20091227/debian/liboggplay1-dbg.install liboggplay-0.2.1~git20091227/debian/liboggplay1-dbg.install --- liboggplay-0.2.1~git20091227/debian/liboggplay1-dbg.install 1970-01-01 00:00:00.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/liboggplay1-dbg.install 2017-11-01 13:48:45.000000000 +0000 @@ -0,0 +1 @@ +usr/lib/*/lib*.so diff -Nru liboggplay-0.2.1~git20091227/debian/liboggplay1-dev.install liboggplay-0.2.1~git20091227/debian/liboggplay1-dev.install --- liboggplay-0.2.1~git20091227/debian/liboggplay1-dev.install 2017-11-03 09:38:33.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/liboggplay1-dev.install 2017-11-01 13:48:45.000000000 +0000 @@ -1,4 +1,4 @@ usr/include/* -usr/lib/lib*.a -usr/lib/lib*.so -usr/lib/pkgconfig/* +usr/lib/*/lib*.a +usr/lib/*/lib*.so +usr/lib/*/pkgconfig/* diff -Nru liboggplay-0.2.1~git20091227/debian/liboggplay1.install liboggplay-0.2.1~git20091227/debian/liboggplay1.install --- liboggplay-0.2.1~git20091227/debian/liboggplay1.install 2017-11-03 09:38:33.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/liboggplay1.install 2017-11-01 13:48:45.000000000 +0000 @@ -1 +1 @@ -usr/lib/lib*.so.* +usr/lib/*/lib*.so.* diff -Nru liboggplay-0.2.1~git20091227/debian/patches/CVE-2009-3378 liboggplay-0.2.1~git20091227/debian/patches/CVE-2009-3378 --- liboggplay-0.2.1~git20091227/debian/patches/CVE-2009-3378 2017-11-03 09:38:33.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/patches/CVE-2009-3378 2017-11-01 13:48:45.000000000 +0000 @@ -1,5 +1,8 @@ -# Patch for CVE-2009-3378 while waiting for upstream to apply -# Patch from https://bugzilla.mozilla.org/show_bug.cgi?id=500311 +Description: Fixed crash while loading video clip + - Original comment: Patch for CVE-2009-3378 while waiting for upstream to apply +Author: John Francesco Ferlito +Bug: https://bugzilla.mozilla.org/show_bug.cgi?id=500311 + --- a/src/liboggplay/oggplay.c +++ b/src/liboggplay/oggplay.c @@ -169,6 +169,7 @@ diff -Nru liboggplay-0.2.1~git20091227/debian/patches/CVE-2009-3388 liboggplay-0.2.1~git20091227/debian/patches/CVE-2009-3388 --- liboggplay-0.2.1~git20091227/debian/patches/CVE-2009-3388 2017-11-03 09:38:33.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/patches/CVE-2009-3388 2017-11-01 13:48:45.000000000 +0000 @@ -1,3 +1,7 @@ +Description: Fix calculation of CMML record size +Author: Matthew Gregan +Bug: http://hg.mozilla.org/releases/mozilla-1.9.1/rev/14dd26404792 + --- a/src/liboggplay/oggplay_data.c +++ b/src/liboggplay/oggplay_data.c @@ -358,12 +358,9 @@ oggplay_data_handle_cmml_data(OggPlayDec diff -Nru liboggplay-0.2.1~git20091227/debian/patches/macro-directory liboggplay-0.2.1~git20091227/debian/patches/macro-directory --- liboggplay-0.2.1~git20091227/debian/patches/macro-directory 2017-11-03 09:38:33.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/patches/macro-directory 2017-11-01 13:48:45.000000000 +0000 @@ -1,3 +1,6 @@ +Description: Adapt to dh-autoreconf +Author: Manuel A. Fernandez Montecelo + --- a/configure.ac +++ b/configure.ac @@ -12,6 +12,8 @@ diff -Nru liboggplay-0.2.1~git20091227/debian/rules liboggplay-0.2.1~git20091227/debian/rules --- liboggplay-0.2.1~git20091227/debian/rules 2017-11-03 09:38:33.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/rules 2017-11-01 13:48:45.000000000 +0000 @@ -1,9 +1,7 @@ #!/usr/bin/make -f -export LDFLAGS+=-lm +export DEB_LDFLAGS_MAINT_APPEND = -lm +export DEB_BUILD_MAINT_OPTIONS = hardening=+all %: - dh --with quilt,autoreconf $@ - -override_dh_strip: - dh_strip --dbg-package=liboggplay1-dbg + dh $@ --with quilt,autoreconf diff -Nru liboggplay-0.2.1~git20091227/debian/source/format liboggplay-0.2.1~git20091227/debian/source/format --- liboggplay-0.2.1~git20091227/debian/source/format 1970-01-01 00:00:00.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/source/format 2017-11-01 13:48:45.000000000 +0000 @@ -0,0 +1 @@ +3.0 (quilt) diff -Nru liboggplay-0.2.1~git20091227/debian/tests/0001-run-against-library liboggplay-0.2.1~git20091227/debian/tests/0001-run-against-library --- liboggplay-0.2.1~git20091227/debian/tests/0001-run-against-library 1970-01-01 00:00:00.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/tests/0001-run-against-library 2017-11-01 13:48:45.000000000 +0000 @@ -0,0 +1,51 @@ +#!/bin/sh +set -eu + +WORKDIR=$(mktemp -d) +trap "rm -rf $WORKDIR" 0 INT QUIT ABRT PIPE TERM +cd $WORKDIR + +cat < get-stream-info.c +#include +#include +#include + +int main (int argc, char * argv[]) +{ + OggPlay * player = 0; + OggPlayReader * reader = 0; + int i = 0; + + if (argc < 2) + { + printf ("please provide a filename\n"); + exit (1); + } + + reader = oggplay_file_reader_new(argv[1]); + + player = oggplay_open_with_reader(reader); + + if (player == NULL) + { + printf ("could not initialise oggplay with this file\n"); + exit (1); + } + + for (i = 0; i < oggplay_get_num_tracks (player); i++) + { + printf("Track %d is of type %s\n", i, + oggplay_get_track_typename (player, i)); + } + + return 0; +} +EOF + +gcc -Wall get-stream-info.c -o get-stream-info -loggplay + +[ -x get-stream-info ] +export TERM=linux +./get-stream-info /usr/share/sounds/freedesktop/stereo/complete.oga +echo "run: OK" + diff -Nru liboggplay-0.2.1~git20091227/debian/tests/control liboggplay-0.2.1~git20091227/debian/tests/control --- liboggplay-0.2.1~git20091227/debian/tests/control 1970-01-01 00:00:00.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/tests/control 2017-11-01 13:48:45.000000000 +0000 @@ -0,0 +1,2 @@ +Tests: 0001-run-against-library +Depends: @, liboggplay1-dev, gcc, sound-theme-freedesktop diff -Nru liboggplay-0.2.1~git20091227/debian/watch liboggplay-0.2.1~git20091227/debian/watch --- liboggplay-0.2.1~git20091227/debian/watch 2017-11-03 09:38:33.000000000 +0000 +++ liboggplay-0.2.1~git20091227/debian/watch 2017-11-01 13:48:45.000000000 +0000 @@ -1,2 +1,2 @@ -version=2 -http://annodex.net/software/liboggplay/download/ liboggplay-([\d\.]+)\.tar\.gz debian uupdate +version=4 +opts="mode=git" git://git.xiph.org/liboggplay.git refs/tags/v([\d\.]+)