diff -Nru libplayer-1.0.0/debian/changelog libplayer-1.0.0/debian/changelog --- libplayer-1.0.0/debian/changelog 2010-01-04 15:54:00.000000000 +0100 +++ libplayer-1.0.0/debian/changelog 2010-02-15 19:57:24.000000000 +0100 @@ -1,3 +1,15 @@ +libplayer (1.0.0-2ubuntu1) lucid; urgency=low + + * Package already in ubuntu (LP: #503251) + * Replace libplayer1-bin package by libplayer-bin (LP: #522256) + * Use DEP-5 for the copyright file + * Add DEP-3 comments to the patch files + * Update to Standards-Version 3.8.4 + * Reorg Build-Depends and Depends + * Suggests doc-base on libplayer-doc + + -- Alexis Saettler Mon, 08 Feb 2010 20:32:29 +0100 + libplayer (1.0.0-2) unstable; urgency=low * Add dev packages referenced by pkgconfig to libplayer-dev depends diff -Nru libplayer-1.0.0/debian/control libplayer-1.0.0/debian/control --- libplayer-1.0.0/debian/control 2010-01-04 15:47:06.000000000 +0100 +++ libplayer-1.0.0/debian/control 2010-02-15 19:03:05.000000000 +0100 @@ -1,19 +1,28 @@ Source: libplayer -Priority: extra -Maintainer: Davide Cavalca -Build-Depends: debhelper (>= 7.0.50), pkg-config, libx11-dev, libxine-dev -Build-Depends-Indep: doxygen -Standards-Version: 3.8.3 Section: libs +Priority: extra +Maintainer: Ubuntu Developers +Uploaders: Alexis Saettler +XSBC-Original-Maintainer: Davide Cavalca +Standards-Version: 3.8.4 Homepage: http://libplayer.geexbox.org/ Vcs-Hg: http://hg.geexbox.org/libplayer Vcs-Browser: http://hg.geexbox.org/libplayer/summary +Build-Depends-Indep: doxygen +Build-Depends: debhelper (>= 7.0.50), + pkg-config, + libx11-dev, + libxine-dev Package: libplayer-dev Section: libdevel Architecture: any -Depends: libplayer1 (= ${binary:Version}), libxine-dev, libx11-dev, ${misc:Depends} -Suggests: libplayer1-dbg (= ${binary:Version}), libplayer-doc (= ${binary:Version}) +Depends: libplayer1 (= ${binary:Version}), + libxine-dev, + libx11-dev, + ${misc:Depends} +Suggests: libplayer1-dbg (= ${binary:Version}), + libplayer-doc (= ${binary:Version}) Description: a multimedia A/V abstraction layer API -- development files libplayer provides a generic A/V API that relies on various multimedia player for Linux systems. It currently supports MPlayer and xine. Its @@ -23,10 +32,13 @@ This package contains headers and libraries for developing software that makes use of libplayer. -Package: libplayer1-bin +Package: libplayer-bin Section: misc Architecture: any -Depends: libplayer1 (= ${binary:Version}), ${shlibs:Depends}, ${misc:Depends} +Depends: libplayer1 (= ${binary:Version}), + ${shlibs:Depends}, + ${misc:Depends} +Replaces: libplayer1-bin Description: test utilities for libplayer libplayer provides a generic A/V API that relies on various multimedia player for Linux systems. It currently supports MPlayer and xine. Its @@ -38,8 +50,11 @@ Package: libplayer1 Architecture: any Recommends: mplayer -Depends: ${shlibs:Depends}, ${misc:Depends}, libxine1-x | libxine2-x -Suggests: libplayer1-bin (= ${binary:Version}), libxine2-vdr +Depends: libxine1-x | libxine2-x, + ${shlibs:Depends}, + ${misc:Depends} +Suggests: libplayer-bin (= ${binary:Version}), + libxine2-vdr Description: a multimedia A/V abstraction layer API libplayer provides a generic A/V API that relies on various multimedia player for Linux systems. It currently supports MPlayer and xine. Its @@ -49,7 +64,8 @@ Package: libplayer1-dbg Architecture: any Section: debug -Depends: libplayer1 (= ${binary:Version}), ${misc:Depends} +Depends: libplayer1 (= ${binary:Version}), + ${misc:Depends} Description: debugging symbols for libplayer1 libplayer provides a generic A/V API that relies on various multimedia player for Linux systems. It currently supports MPlayer and xine. Its @@ -62,7 +78,8 @@ Architecture: all Section: doc Depends: ${misc:Depends} -Suggests: libplayer-dev +Suggests: doc-base, + libplayer-dev Description: developer documentation for libplayer libplayer provides a generic A/V API that relies on various multimedia player for Linux systems. It currently supports MPlayer and xine. Its diff -Nru libplayer-1.0.0/debian/copyright libplayer-1.0.0/debian/copyright --- libplayer-1.0.0/debian/copyright 2009-12-09 16:52:55.000000000 +0100 +++ libplayer-1.0.0/debian/copyright 2010-02-15 07:16:17.000000000 +0100 @@ -1,40 +1,32 @@ -This work was packaged for Debian by: - - Davide Cavalca on Tue, 08 Dec 2009 13:48:04 +0100 - -It was downloaded from http://libplayer.geexbox.org - -Upstream Author(s): - - Benjamin Zores - Mathieu Schroeter - -Copyright: - - Copyright (C) 2009 Benjamin Zores, Mathieu Schroeter - -License: - - This package is free software; you can redistribute it and/or - modify it under the terms of the GNU Lesser General Public - License as published by the Free Software Foundation; either - version 2.1 of the License, or (at your option) any later version. - - This package 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 - Lesser General Public License for more details. - - You should have received a copy of the GNU Lesser General Public - License along with this package; if not, write to the Free Software - Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA - -On Debian systems, the complete text of the GNU Lesser General -Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. - -The Debian packaging is: - - Copyright (C) 2009 Davide Cavalca - -and is licensed under the LGPL version 2.1 or later, -see `/usr/share/common-licenses/LGPL-2.1'. +Format-Specification: http://svn.debian.org/wsvn/dep/web/deps/dep5.mdwn?op=file&rev=135 +Name: libplayer +Source: http://libplayer.geexbox.org +Maintainer: Benjamin Zores + Mathieu Schroeter + +Copyright: 2009, Benjamin Zores + 2009, Mathieu Schroeter +License: LGPL-2.1+ + +Files: debian/* +Copyright: 2009-2010, Davide Cavalca + 2010, Alexis Saettler +License: LGPL-2.1+ + +License: LGPL-2.1+ + This package is free software; you can redistribute it and/or + modify it under the terms of the GNU Lesser General Public + License as published by the Free Software Foundation; either + version 2.1 of the License, or (at your option) any later version. + . + This package 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 + Lesser General Public License for more details. + . + You should have received a copy of the GNU Lesser General Public + License along with this package; if not, write to the Free Software + Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA + . + On Debian systems, the complete text of the GNU Lesser General + Public License can be found in `/usr/share/common-licenses/LGPL-2.1'. diff -Nru libplayer-1.0.0/debian/libplayer1-bin.dirs libplayer-1.0.0/debian/libplayer1-bin.dirs --- libplayer-1.0.0/debian/libplayer1-bin.dirs 2009-12-08 15:16:47.000000000 +0100 +++ libplayer-1.0.0/debian/libplayer1-bin.dirs 1970-01-01 01:00:00.000000000 +0100 @@ -1 +0,0 @@ -usr/bin diff -Nru libplayer-1.0.0/debian/libplayer1-bin.install libplayer-1.0.0/debian/libplayer1-bin.install --- libplayer-1.0.0/debian/libplayer1-bin.install 2009-12-10 11:25:02.000000000 +0100 +++ libplayer-1.0.0/debian/libplayer1-bin.install 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -usr/bin/libplayer-test -usr/bin/libplayer-regtest -usr/bin/libplayer-testvdr diff -Nru libplayer-1.0.0/debian/libplayer1-bin.manpages libplayer-1.0.0/debian/libplayer1-bin.manpages --- libplayer-1.0.0/debian/libplayer1-bin.manpages 2009-12-10 11:45:39.000000000 +0100 +++ libplayer-1.0.0/debian/libplayer1-bin.manpages 1970-01-01 01:00:00.000000000 +0100 @@ -1,3 +0,0 @@ -debian/libplayer-test.1 -debian/libplayer-regtest.1 -debian/libplayer-testvdr.1 diff -Nru libplayer-1.0.0/debian/libplayer-bin.dirs libplayer-1.0.0/debian/libplayer-bin.dirs --- libplayer-1.0.0/debian/libplayer-bin.dirs 1970-01-01 01:00:00.000000000 +0100 +++ libplayer-1.0.0/debian/libplayer-bin.dirs 2009-12-08 15:16:47.000000000 +0100 @@ -0,0 +1 @@ +usr/bin diff -Nru libplayer-1.0.0/debian/libplayer-bin.install libplayer-1.0.0/debian/libplayer-bin.install --- libplayer-1.0.0/debian/libplayer-bin.install 1970-01-01 01:00:00.000000000 +0100 +++ libplayer-1.0.0/debian/libplayer-bin.install 2009-12-10 11:25:02.000000000 +0100 @@ -0,0 +1,3 @@ +usr/bin/libplayer-test +usr/bin/libplayer-regtest +usr/bin/libplayer-testvdr diff -Nru libplayer-1.0.0/debian/libplayer-bin.manpages libplayer-1.0.0/debian/libplayer-bin.manpages --- libplayer-1.0.0/debian/libplayer-bin.manpages 1970-01-01 01:00:00.000000000 +0100 +++ libplayer-1.0.0/debian/libplayer-bin.manpages 2009-12-10 11:45:39.000000000 +0100 @@ -0,0 +1,3 @@ +debian/libplayer-test.1 +debian/libplayer-regtest.1 +debian/libplayer-testvdr.1 diff -Nru libplayer-1.0.0/debian/patches/backport-trunk-build-system-fixes.patch libplayer-1.0.0/debian/patches/backport-trunk-build-system-fixes.patch --- libplayer-1.0.0/debian/patches/backport-trunk-build-system-fixes.patch 2009-12-10 11:58:12.000000000 +0100 +++ libplayer-1.0.0/debian/patches/backport-trunk-build-system-fixes.patch 2010-02-15 19:23:08.000000000 +0100 @@ -1,11 +1,12 @@ -Backport the following changesets from upstream trunk: -* r1234: fix deps with shared/static libs -* r1235: like previous commit but for libplayer-* apps -* r1238: fix Makefile to be able to override CFLAGS and LDFLAGS +Description: Backport the following changesets from upstream trunk: + * r1234: fix deps with shared/static libs + * r1235: like previous commit but for libplayer-* apps + * r1238: fix Makefile to be able to override CFLAGS and LDFLAGS +Author: Mathieu Schroeter +Acked-by: Davide Cavalca +Forwarded: yes +Origin: upstream, see http://hg.geexbox.org/libplayer -Source: http://hg.geexbox.org/libplayer -Upstream author: Mathieu Schroeter -Patch author: Davide Cavalca Index: libplayer-1.0.0/Makefile =================================================================== --- libplayer-1.0.0.orig/Makefile 2009-12-10 11:55:43.000000000 +0100 diff -Nru libplayer-1.0.0/debian/rules libplayer-1.0.0/debian/rules --- libplayer-1.0.0/debian/rules 2009-12-09 16:54:51.000000000 +0100 +++ libplayer-1.0.0/debian/rules 2010-02-15 07:25:34.000000000 +0100 @@ -6,7 +6,13 @@ CFLAGS += -fPIC -CONFIGURE_OPTS = --prefix=/usr --disable-strip --enable-doc --enable-mplayer --enable-xine --disable-gstreamer --disable-vlc +CONFIGURE_OPTS += --prefix=/usr +CONFIGURE_OPTS += --disable-strip +CONFIGURE_OPTS += --enable-doc +CONFIGURE_OPTS += --enable-mplayer +CONFIGURE_OPTS += --enable-xine +CONFIGURE_OPTS += --disable-gstreamer +CONFIGURE_OPTS += --disable-vlc ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) CONFIGURE_OPTS += --disable-optimize