--- libdvdnav-4.1.3.orig/debian/rules +++ libdvdnav-4.1.3/debian/rules @@ -0,0 +1,35 @@ +#!/usr/bin/make -f + +%: + dh ${@} --with quilt + +override_dh_auto_clean: + [ ! -f config.mak ] || $(MAKE) distclean + + rm -rf doc/html doc/latex + rm -f config.guess config.sub + +override_dh_auto_configure: + cp -f /usr/share/misc/config.guess config.guess + cp -f /usr/share/misc/config.sub config.sub + + ./configure2 $(CROSS) --prefix=/usr --disable-opts --disable-strip --with-dvdread=/usr/include/dvdread CFLAGS="$(CFLAGS)" LDFLAGS="-Wl,-z,defs" + +override_dh_auto_build: + dh_auto_build + + cd doc && doxygen doxy.conf + +override_dh_auto_install: + dh_auto_install + + install -D -m 0644 m4/dvdnav.m4 debian/libdvdnav-dev/usr/share/aclocal/dvdnav.m4 + + install -D -m 0755 debian/local/libdvdnav4.script debian/libdvdnav4/usr/share/bug/libdvdnav4/script + install -D -m 0755 debian/local/libdvdnav-dev.script debian/libdvdnav-dev/usr/share/bug/libdvdnav-dev/script + +override_dh_install: + dh_install --fail-missing + +override_dh_strip: + dh_strip --dbg-package=libdvdnav-dbg --- libdvdnav-4.1.3.orig/debian/README.source +++ libdvdnav-4.1.3/debian/README.source @@ -0,0 +1,37 @@ +Package Repositories +-------------------- + +Backports for the current stable debian distribution as well as snapshots of +unreleased versions may be available in repositories listed on the maintainers +homepage. The current URL of the maintainer homepage can be seen in +debian/copyright. + + +Source Access +------------- + +You can obtain the sources of this package with: + + $ apt-get source ${PACKAGE} + +whereas '${PACKAGE}' has to be replaced with the actual name of the package. + +This package is maintained with the Git version control system. The current git +source tree can be obtained with: + + $ git clone ${GIT_URI} + +whereas '${GIT_URI}' has to be replaced with the actual URI for the Git +repository. The current Git URI can be seen in debian/control in the extracted +package sources. + +More information about Git can be found in the git-core package. + +This package may use the Quilt patch system to manage all modifications to the +upstream source. Changes, if any, are stored in the source package as diffs in +debian/diff and are applied during the build. Current modifications can be +applied to the source tree with: + + $ quilt push -a + +More information about Quilt can be found in the quilt package. --- libdvdnav-4.1.3.orig/debian/compat +++ libdvdnav-4.1.3/debian/compat @@ -0,0 +1 @@ +7 --- libdvdnav-4.1.3.orig/debian/libdvdnav-dev.docs +++ libdvdnav-4.1.3/debian/libdvdnav-dev.docs @@ -0,0 +1,6 @@ +AUTHORS +DEVELOPMENT-POLICY.txt +TODO +doc/dvd_structures +doc/html +doc/library_layout --- libdvdnav-4.1.3.orig/debian/control +++ libdvdnav-4.1.3/debian/control @@ -0,0 +1,51 @@ +Source: libdvdnav +Section: libs +Priority: optional +Maintainer: Daniel Baumann +Uploaders: Daniel Baumann +Build-Depends: + debhelper (>= 7.0.50~), autotools-dev, doxygen, libdvdread-dev (>= 4.1.3), + quilt (>= 0.46-7) +Standards-Version: 3.8.3 +Vcs-Browser: http://git.debian-maintainers.org/?p=daniel/libdvdnav.git +Vcs-Git: git://git.debian-maintainers.org/git/daniel/libdvdnav.git + +Package: libdvdnav4 +Section: libs +Architecture: any +Depends: ${misc:Depends}, ${shlibs:Depends} +Suggests: libdvdcss2 +Description: DVD navigation library + libdvdnav is a DVD navigation library, which provides an interface to the + advanced features of DVDs, like menus and naviation. It contains the VM and + other parts useful for writing DVD players. It's based on Ogle, but was + modified to be used by xine and mplayer. + +Package: libdvdnav-dbg +Section: debug +Priority: extra +Architecture: any +Depends: + ${misc:Depends}, libdvdnav4 (= ${binary:Version}), + libdvdnav-dev (= ${binary:Version}) +Description: DVD navigation library (debug) + libdvdnav is a DVD navigation library, which provides an interface to the + advanced features of DVDs, like menus and naviation. It contains the VM and + other parts useful for writing DVD players. It's based on Ogle, but was + modified to be used by xine and mplayer. + . + This package contains the debugging symbols. + +Package: libdvdnav-dev +Section: libdevel +Architecture: any +Depends: + ${misc:Depends}, libdvdnav4 (= ${binary:Version}), libdvdread-dev, pkg-config +Suggests: libdvdcss-dev +Description: DVD navigation library (development) + libdvdnav is a DVD navigation library, which provides an interface to the + advanced features of DVDs, like menus and naviation. It contains the VM and + other parts useful for writing DVD players. It's based on Ogle, but was + modified to be used by xine and mplayer. + . + This package contains the development files. --- libdvdnav-4.1.3.orig/debian/libdvdnav4.examples +++ libdvdnav-4.1.3/debian/libdvdnav4.examples @@ -0,0 +1 @@ +src/FELLOWSHIP.map --- libdvdnav-4.1.3.orig/debian/libdvdnav4.docs +++ libdvdnav-4.1.3/debian/libdvdnav4.docs @@ -0,0 +1,3 @@ +AUTHORS +README +src/README.MAP --- libdvdnav-4.1.3.orig/debian/changelog +++ libdvdnav-4.1.3/debian/changelog @@ -0,0 +1,207 @@ +libdvdnav (4.1.3-6) unstable; urgency=low + + * Correcting wrong vcs-browser field. + * Adding patch from Sergey N. Yatskevich to + fix a deadlock wrt/ gstreamer (Closes: #509179). + + -- Daniel Baumann Mon, 09 Nov 2009 20:39:05 +0100 + +libdvdnav (4.1.3-5) unstable; urgency=low + + * Updating maintainer field. + * Updating vcs fields. + * Removing shlibs file. + * Updating versioned build-depends on debhelper. + * Wrapping build-depends. + * Updating package to standards version 3.8.3. + * Adding README.source. + * Renaming directory for storing local debian additions to more + generic name. + * Wrapping depends. + * Adding maintainer homepage in copyright. + * Bumping versioned build-depends on quilt. + * Sorting depends. + + -- Daniel Baumann Sun, 04 Oct 2009 12:04:02 +0200 + +libdvdnav (4.1.3-4) unstable; urgency=low + + * Updating section of the debug package. + * Updating package to standards version 3.8.2. + * Adding misc depends. + * Minimizing rules file. + * Using correct rfc-2822 date formats in changelog. + + -- Daniel Baumann Sun, 02 Aug 2009 12:52:13 +0200 + +libdvdnav (4.1.3-3) unstable; urgency=low + + * Uploading to unstable. + + -- Daniel Baumann Sun, 15 Feb 2009 18:16:00 +0100 + +libdvdnav (4.1.3-2) experimental; urgency=low + + * Using patch-stamp rather than patch in rules file. + * Replacing obsolete dh_clean -k with dh_prep. + * Correcting name of manpages sub-directory. + * Using quilt rather than dpatch. + * Checking for libdvdread4 in bug script. + * Updating year in copyright file. + * Updating shlibs file. + * Updating rules to current state of the art. + * Updating rules to install moved changelog (Closes: #512884). + + -- Daniel Baumann Sun, 25 Jan 2009 01:32:00 +0100 + +libdvdnav (4.1.3-1) experimental; urgency=low + + * Adding bug scripts for libdvdnav4 and libdvdnav-dev. + * Adding suggests to libdvdcss2. + * Updating vcs fields in control file. + * Merging upstream version 4.1.3. + * Removing 01-version.dpatch, not required anymore. + * Removing 03-byte-swapping.dpatch, not needed anymore because libdvdread is + in its own package now. + * Removing 04-cxx.dpatch, went usptream. + * Updating rules to new upstream. + * Including pkgconfig files. + * Correcting permissions of /usr/share/bug/libdvdnav-dev/script. + * Updating debhelper docs file to new upstream. + * Updating cross compiling handling in rules. + * Build depending on libdvdread 4.1.3. + + -- Daniel Baumann Tue, 09 Sep 2008 08:13:00 +0200 + +libdvdnav (4.1.2-3) unstable; urgency=medium + + * Correcting c++ error in dvdnav.h (Closes: #480066). + * Updating to standards 3.8.0. + * Adding depends on libdvdread-dev to libdvdnav-dev (Closes: #480065). + + -- Daniel Baumann Wed, 16 Jul 2008 09:54:00 +0200 + +libdvdnav (4.1.2-2) unstable; urgency=low + + * Adding debug package. + + -- Daniel Baumann Mon, 28 Apr 2008 15:21:00 +0200 + +libdvdnav (4.1.2-1) unstable; urgency=low + + * Taking over libdvdnav maintenance from Philipp Matthias Hahn, with thanks + for his past contributions. + * Redoing debian packaging from scratch. + * Merging upstream version 4.1.2. + + -- Daniel Baumann Mon, 28 Apr 2008 09:40:00 +0200 + +libdvdnav (0.1.10-0.2) unstable; urgency=low + + * Porter NMU. + * Add byte swapping support for glibc based OS (closes: #272498). + + -- Aurelien Jarno Sun, 11 Mar 2007 19:55:08 +0100 + +libdvdnav (0.1.10-0.1) unstable; urgency=low + + * Non-maintainer upload to prevent vlc from segfaulting in amd64 and ppc. + * New upstream release. + - Fixes the code so that it does not segfault (Closes: #303541). + + -- Margarita Manterola Mon, 14 Aug 2006 19:53:55 -0300 + +libdvdnav (0.1.9-3) unstable; urgency=low + + * Update config.{sub,guess},ltmain.sh (closes: #249189) + * Switch package to use AM_MAINTAINER_MODE. + * Standard-Version: 3.6.1.1 + - No changes. + + -- Philipp Matthias Hahn Thu, 17 Jun 2004 20:33:49 +0200 + +libdvdnav (0.1.9-2) unstable; urgency=low + + * Add automake1.7 to Build-Depends, so configure finds aclocal and installs + dvdnav.m4 (closes: #195204). + + -- Philipp Matthias Hahn Thu, 29 May 2003 16:49:39 +0200 + +libdvdnav (0.1.9-1) unstable; urgency=low + + * New upstream release. (0.1.7 was not released) + - Drop dependencies on external libdvdread. + * Bump so version number because of incompatible changes. + * Get rid of debian/libdvdnav1.* files. + * Standard-Version: 3.5.10 + - No changes. + + -- Philipp Matthias Hahn Wed, 21 May 2003 10:04:01 +0200 + +libdvdnav (0.1.7-1) unstable; urgency=low + + * New upstream version (closes: #188071). + * Update debian/* + - Change email to pmhahn@d.o. + - Depend on libdvdread3 + - Change section to libdevel. + * Standard-Version: 3.5.9 + - Support DEB_BUILD_OPTIONS noopt instead of debug. + - Always build with -g. + - Build depend on debhelper (>= 4.1.1). + + -- Philipp Matthias Hahn Fri, 11 Apr 2003 21:41:58 +0200 + +libdvdnav (0.1.3-1) unstable; urgency=low + + * New upstream version. + + -- Philipp Matthias Hahn Fri, 02 Aug 2002 15:30:12 +0200 + +libdvdnav (0.1.2-1) unstable; urgency=low + + * New upstream version. + + -- Philipp Matthias Hahn Sat, 13 Jul 2002 10:17:39 +0200 + +libdvdnav (0.1.1-1) unstable; urgency=low + + * New upstream version. (closes: #148495) + * Include TODO + + -- Philipp Matthias Hahn Sat, 01 Jun 2002 17:47:59 +0200 + +libdvdnav (0.1.0-2) unstable; urgency=low + + * Add manual page dvdnav-config.1 + * Add bug-presubj on Daniel's request + * Get dvdnav.c:1.17 from CVS to fix angle support + * Merge patch from Jamie Wilkinson (#146699) + * Rerun automake to fix dependencies + * Ack NMU from siggi + * Fix include in examples/menus.c + + -- Philipp Matthias Hahn Thu, 23 May 2002 09:41:15 +0200 + +libdvdnav (0.1.0-1.1) unstable; urgency=low + + * Prepared for first 'real' release. + * Bug fixes + * Changes to allow apps to 'roll-their-own' dvdnav_get_next_block functions. + * NMU in order to get xine-dvdnav running again + - changed package name to libdvdnav0 + (see patch from Jamie Wilkinson for a better solution) + + -- Siggi Langauf Mon, 20 May 2002 15:57:40 +0200 + +libdvdnav (0.0.1-1) unstable; urgency=low + + * Repackaged using dh-make. + + -- Philipp Matthias Hahn Sun, 07 Apr 2002 16:29:35 +0200 + +libdvdnav (0.0.1) unstable; urgency=low + + * Initial release. + + -- rjw57 Tue, 12 Mar 2002 19:41:13 +0000 --- libdvdnav-4.1.3.orig/debian/libdvdnav4.install +++ libdvdnav-4.1.3/debian/libdvdnav4.install @@ -0,0 +1 @@ +/usr/lib/*.so.* --- libdvdnav-4.1.3.orig/debian/copyright +++ libdvdnav-4.1.3/debian/copyright @@ -0,0 +1,42 @@ +Upstream-Homepage: http://www.mplayerhq.hu/MPlayer/releases/dvdnav/ +Maintainer-Homepage: http://daniel.debian-maintainers.org/ + +Files: * +Copyright: (C) 2002 libdvdnav project +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. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. + +Files: debian/* +Copyright: (C) 2008-2009 Daniel Baumann +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. + . + This program is distributed in the hope that it will be useful, + but WITHOUT ANY WARRANTY; without even the implied warranty of + MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + GNU General Public License for more details. + . + You should have received a copy of the GNU General Public License + along with this program; if not, write to the Free Software + Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + . + On Debian systems, the complete text of the GNU General Public License + can be found in /usr/share/common-licenses/GPL-2 file. --- libdvdnav-4.1.3.orig/debian/libdvdnav-dev.manpages +++ libdvdnav-4.1.3/debian/libdvdnav-dev.manpages @@ -0,0 +1 @@ +debian/manpages/* --- libdvdnav-4.1.3.orig/debian/libdvdnav-dev.install +++ libdvdnav-4.1.3/debian/libdvdnav-dev.install @@ -0,0 +1,5 @@ +/usr/bin +/usr/include +/usr/lib/*.a +/usr/lib/*.so +/usr/lib/pkgconfig --- libdvdnav-4.1.3.orig/debian/libdvdnav-dev.examples +++ libdvdnav-4.1.3/debian/libdvdnav-dev.examples @@ -0,0 +1 @@ +examples/* --- libdvdnav-4.1.3.orig/debian/patches/01-inttypes.patch +++ libdvdnav-4.1.3/debian/patches/01-inttypes.patch @@ -0,0 +1,15 @@ +Author: Dominik Mierzejewski +Description: Fixing missing include. + +diff -Naurp libdvdnav.orig/src/dvd_types.h libdvdnav/src/dvd_types.h +--- libdvdnav.orig/src/dvd_types.h 2007-04-21 11:08:56.000000000 +0000 ++++ libdvdnav/src/dvd_types.h 2008-04-28 06:55:36.000000000 +0000 +@@ -29,6 +29,8 @@ + #ifndef DVD_H_INCLUDED + #define DVD_H_INCLUDED + ++#include ++ + /* + * DVD Menu ID + * (see dvdnav_menu_call()) --- libdvdnav-4.1.3.orig/debian/patches/02-deadlock.patch +++ libdvdnav-4.1.3/debian/patches/02-deadlock.patch @@ -0,0 +1,24 @@ +Author: Sergey N. Yatskevich +Description: + dvdnav_reset lock internal mutex and call dvdnav_clear that try to lock the + same mutex too. Because this mutex is not recursive mutex libdvdnav is + deadlocked (Closes: #509179). + +diff -Naurp libdvdnav.orig/src/dvdnav.c libdvdnav/src/dvdnav.c +--- libdvdnav.orig/src/dvdnav.c 2009-10-02 14:14:44.000000000 +0200 ++++ libdvdnav/src/dvdnav.c 2009-11-09 20:34:17.000000000 +0100 +@@ -180,12 +180,13 @@ dvdnav_status_t dvdnav_reset(dvdnav_t *t + pthread_mutex_unlock(&this->vm_lock); + return DVDNAV_STATUS_ERR; + } ++ pthread_mutex_unlock(&this->vm_lock); ++ + #ifdef LOG_DEBUG + fprintf(MSG_OUT, "libdvdnav: clearing dvdnav\n"); + #endif + result = dvdnav_clear(this); + +- pthread_mutex_unlock(&this->vm_lock); + return result; + } + --- libdvdnav-4.1.3.orig/debian/patches/series +++ libdvdnav-4.1.3/debian/patches/series @@ -0,0 +1,2 @@ +01-inttypes.patch +02-deadlock.patch --- libdvdnav-4.1.3.orig/debian/local/libdvdnav4.script +++ libdvdnav-4.1.3/debian/local/libdvdnav4.script @@ -0,0 +1,3 @@ +#!/bin/sh + +dpkg -l libdvdread4 libdvdnav4 libdvdcss2 --- libdvdnav-4.1.3.orig/debian/local/libdvdnav-dev.script +++ libdvdnav-4.1.3/debian/local/libdvdnav-dev.script @@ -0,0 +1,3 @@ +#!/bin/sh + +dpkg -l libdvdread-dev libdvdnav-dev libdvdcss-dev --- libdvdnav-4.1.3.orig/debian/manpages/dvdnav-config.1 +++ libdvdnav-4.1.3/debian/manpages/dvdnav-config.1 @@ -0,0 +1,47 @@ +.TH DVDNAV 1 "16 May 2002" Version 0.1.0 +.SH NAME +dvdnav-config - script to get information about the installed version of libdvdnav +.SH SYNOPSIS +.B dvdnav-config [\-\-prefix\fI[=DIR]\fP] [\-\-exec\-prefix\fI[=DIR]\fP] [\-\-version] [\-\-libs] [\-\-cflags] +.SH DESCRIPTION +.PP +\fIdvdnav-config\fP is a tool that is used to configure to determine +the compiler and linker flags that should be used to compile +and link programs that use \fIlibdvdnav\fP. It is also used internally +to the .m4 macros for GNU autoconf that are included with \fIlibdvdnav\fP. +. +.SH OPTIONS +\fIdvdnav-config\fP accepts the following options: +.TP 8 +.B \-\-version +Print the currently installed version of \fIlibdvdnav\fP on the standard output. +.TP 8 +.B \-\-libs +Print the linker flags that are necessary to link a \fIlibdvdnav\fP program. +.TP 8 +.B \-\-cflags +Print the compiler flags that are necessary to compile a \fIlibdvdnav\fP program. +.TP 8 +.B \-\-prefix=PREFIX +If specified, use PREFIX instead of the installation prefix that \fIlibdvdnav\fP +was built with when computing the output for the \-\-cflags and +\-\-libs options. This option is also used for the exec prefix +if \-\-exec\-prefix was not specified. This option must be specified +before any \-\-libs or \-\-cflags options. +.TP 8 +.B \-\-exec\-prefix=PREFIX +If specified, use PREFIX instead of the installation exec prefix that +\fIlibdvdnav\fP was built with when computing the output for the \-\-cflags +and \-\-libs options. This option must be specified before any +\-\-libs or \-\-cflags options. +.SH COPYRIGHT +Copyright \(co 1998 Owen Taylor + +Permission to use, copy, modify, and distribute this software and its +documentation for any purpose and without fee is hereby granted, +provided that the above copyright notice appear in all copies and that +both that copyright notice and this permission notice appear in +supporting documentation. + +This manual page was adapted by Philipp Matthias Hahn , +for the Debian GNU/Linux system (but may be used by others).