diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/README.Debian | 6 | ||||
| -rw-r--r-- | debian/changelog | 43 | ||||
| -rw-r--r-- | debian/control | 40 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rw-r--r-- | debian/dh_xine | 56 | ||||
| -rw-r--r-- | debian/dh_xine.1 | 21 | ||||
| -rw-r--r-- | debian/libxine1.install | 2 | ||||
| -rwxr-xr-x | debian/rules | 37 | ||||
| -rw-r--r-- | debian/watch | 2 |
9 files changed, 152 insertions, 57 deletions
diff --git a/debian/README.Debian b/debian/README.Debian index ba052459d..ad2c77537 100644 --- a/debian/README.Debian +++ b/debian/README.Debian @@ -1,7 +1,7 @@ The CSS plugin story... ======================= -xine does support playing unencrypted and encrypted dvd using the library +xine does support playing unencrypted and encrypted dvd using the library libdvdread/libdvdcss. Due to legal reasons, it is not possible for debian nor derivatives to ship a libdvdcss, which would be needed to play encrypted dvds. @@ -22,8 +22,8 @@ conceivable setup. (Systems that run a sound daemon usually do so because otherwise they would only have one sound channel. So in those cases the daemon should be used, unless explicitly configured otherwise.) -So, if you are experiencing instant crashes with the error message -'can't create mcop directory', please start xine (xine-ui or gxine) with parameter +So, if you are experiencing instant crashes with the error message +'can't create mcop directory', please start xine (xine-ui or gxine) with parameter "-A auto" diff --git a/debian/changelog b/debian/changelog index 91999074d..7dec249a7 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,13 +1,8 @@ -xine-lib (1.1.9~hg-0) unstable; urgency=low +xine-lib (1.1.18~hg-0) unstable; urgency=low - [ Darren Salt ] - * Hg snapshot. - - [ Reinhard Tartler ] - * remove gs from build-dependencies - * change the maintainer field to xine-devel@lists.sourceforge.net. + * Hg snapshot (dev build). Changelog is irrelevant :-) - -- Reinhard Tartler <siretart@tauware.de> Sun, 25 Nov 2007 23:45:52 +0100 + -- Darren Salt <linux@youmustbejoking.demon.co.uk> Fri, 04 Dec 2009 17:15:06 +0000 xine-lib (1.1.5~cvs-0) unstable; urgency=low @@ -44,7 +39,7 @@ xine-lib (1.1.2+dfsg-1) unstable; urgency=medium * apply patch from http://bugzilla.gnome.org/show_bug.cgi?id=344592 to fix title menu if there is no DVD menu. (Closes: #369319) * rename to XS-X-Vcs-Bzr field - + -- Reinhard Tartler <siretart@tauware.de> Thu, 26 Oct 2006 23:16:12 +0200 xine-lib (1.1.2-6) unstable; urgency=low @@ -56,7 +51,7 @@ xine-lib (1.1.2-6) unstable; urgency=low - [xine-lib @ 2006-07-12 21:08:46 by dsalt] Tidy up the formatting of tvtime method help texts to allow better wrapping by the front end. - + -- Reinhard Tartler <siretart@tauware.de> Fri, 22 Sep 2006 21:49:56 +0200 xine-lib (1.1.2-5) unstable; urgency=low @@ -96,13 +91,13 @@ xine-lib (1.1.2-5) unstable; urgency=low potato!) * Dropping Conflicts on sinek and xine-ui (<< 0.9.10) (all only woody) * cleaning m4/caca.m4, no longer used - * removing doc/faq/faq.html doc/faq/faq.txt doc/hackersguide/hackersguide.html + * removing doc/faq/faq.html doc/faq/faq.txt doc/hackersguide/hackersguide.html on clean, missed by build system * include some targets to build 'orig' tarballs from the current branch. This mainly for my convinience for bootstrapping cvs versions of xine and preparing tarballs for the 'main' section of ubuntu, which I carry here in - order to minimize divergence - + order to minimize divergence + -- Reinhard Tartler <siretart@tauware.de> Thu, 14 Sep 2006 21:27:27 +0200 xine-lib (1.1.2-4) unstable; urgency=low @@ -154,7 +149,7 @@ xine-lib (1.1.2-2) unstable; urgency=high + src/xine-utils/xine_mutex.c * Imported security fix for included copy of libmms from upstream CVS, (e.g. USN-315-1) - + -- Reinhard Tartler <siretart@tauware.de> Thu, 13 Jul 2006 21:51:46 +0200 xine-lib (1.1.2-1) unstable; urgency=low @@ -314,11 +309,11 @@ xine-lib (1.1.1-1) unstable; urgency=low * Acknowledge NMUs. - Backports and gcc 4.0 fixes dropped since they're already in this version. - Closes: #288189, #318838 + Closes: #288189, #318838 - slang transition: Closes: #315986 - aalib transition: Closes: #320317, #323276 - - flac transition: Closes: #325960 - - fix of dependency generation script debian/shlibdeps.sh: + - flac transition: Closes: #325960 + - fix of dependency generation script debian/shlibdeps.sh: Closes: #326935, #327203, #328168, #328184, #328265, #328454 - fix bashism in debian/rules: Closes: #337996 @@ -361,9 +356,9 @@ xine-lib (1.0.1-1.3) unstable; urgency=low * Non-maintainer upload. * Backport patch from 1.0.2 that fixes hard hang-ups when a plugin listed in - ~/.xine/catalog.cache becomes unloadable (closes: #328454). Plugins can + ~/.xine/catalog.cache becomes unloadable (closes: #328454). Plugins can become unloadable if DT_NEEDED libraries get uninstalled, which is - possible because the package lists many of these libraries in the + possible because the package lists many of these libraries in the Recommends or Suggests fields only. With this fix, amarok should not freeze with the XINE engine anymore (closes: #327203), and totem either (closes: #328265). @@ -378,7 +373,7 @@ xine-lib (1.0.1-1.3) unstable; urgency=low This means that now the package now suggests libgnomevfs2-0 (closes: #326935) and libflac7 (closes: #328168). Submitters may wish to reopen if - they want a discussion with the maintainer about the need of these being + they want a discussion with the maintainer about the need of these being strong Depends instead of Suggests. * xineplug_flac.so now links against libflac7 instead of libflac6, which @@ -401,19 +396,19 @@ xine-lib (1.0.1-1.1) unstable; urgency=medium * Multiple fixes for compatibility with gcc 4.0 strictness (closes: #288189, #318838) * This rebuild also gets rid of the dependency on libslang1 - (closes: #315986); it only trades it for libslang2 unfortunately, + (closes: #315986); it only trades it for libslang2 unfortunately, since libcaca is a static lib. * Build-Depend on libaa1-dev instead of the removed aalib1-dev (closes: #320317). * Build-Depend on libxinerama-dev instead of on xlibs-static-dev, which no longer provides this lib; it should be rolled back into - xlibs-dev as a dependency eventually, but build-depending on it + xlibs-dev as a dependency eventually, but build-depending on it directly is sensible anyway. * Disentangle xine from libraries it doesn't actually use directly, so that the dependency tree is less brittle and requires fewer rebuilds in the future (e.g., it currently has a dependency on libstdc++5 that it shouldn't need at all); this is doubly important since some - plugins aren't mentioned at all in the dependencies, and so can be + plugins aren't mentioned at all in the dependencies, and so can be left unusable by library changes: - relibtoolize the package to use the Debian version of libtool, with support for pruning indirect dependencies from the linker @@ -421,7 +416,7 @@ xine-lib (1.0.1-1.1) unstable; urgency=medium - as part of the above, add AM_MAINTAINER_MODE to configure.ac to avoid any need for autotools build-dependencies - hard-code -lmodplug, -lartsc, and -lgnomevfs-2, because pkg-config, - artsc-config, etc. spit out lib dependencies that are spurious on + artsc-config, etc. spit out lib dependencies that are spurious on GNU/* systems. -- Steve Langasek <vorlon@debian.org> Wed, 3 Aug 2005 04:21:06 -0700 diff --git a/debian/control b/debian/control index c4a127b4f..0a54b20b6 100644 --- a/debian/control +++ b/debian/control @@ -3,34 +3,36 @@ Section: libs Priority: optional Maintainer: xine Developers <xine-devel@lists.sourceforge.net> Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, - automake1.9, autoconf, libtool, + automake1.9, autoconf, libtool, cvs, libavcodec-dev (>= 0.cvs20070307-3) | libavcodeccvs-dev, + libavutil-dev (>= 0.cvs20070307-3) | libavutilcvs-dev, libavformat-dev (>= 0.cvs20070307-3) | libavformatcvs-dev, libpostproc-dev (>= 0.cvs20070307-3) | libpostproccvs-dev, - libxcb-xinerama0-dev | libxv-dev (<< 1:1.0.3), libxcb-xv0-dev | libxv-dev (<< 1:1.0.3), - libxcb-xvmc0-dev | libxv-dev (<< 1:1.0.3), libxcb-shm0-dev | libxv-dev (<< 1:1.0.3), + libxcb-xv0-dev | libxv-dev (<< 1:1.0.3), + libxcb-shm0-dev | libxv-dev (<< 1:1.0.3), libxcb-shape0-dev | libxv-dev (<< 1:1.0.3), - libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev, - libdirectfb-dev (>= 0.9.22), + libxinerama-dev, libxv-dev, libxvmc-dev, libxt-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], + libcam-dev [kfreebsd-i386 kfreebsd-amd64], libaa1-dev, libcaca-dev, libmodplug-dev, - libmagick9-dev, libpng12-dev, libfreetype6-dev, + libjack-dev, libpulse-dev, libartsc0-dev, + libmagick9-dev | libmagick-dev |libmagickwand-dev, + libpng12-dev, libfreetype6-dev, libogg-dev, libvorbis-dev, libtheora-dev, libesd0-dev, libgnomevfs2-dev, - zlib1g-dev, libartsc0-dev, - liblircclient-dev, libjack0.100.0-dev | libjack-dev, - libdirectfb-dev, libgtk2.0-dev, - libflac-dev, libpulse-dev, libsdl1.2-dev, libwavpack-dev, - libsmbclient-dev, libspeex-dev, libmng-dev, - libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), - w3m, transfig, sgmltools-lite -Build-Conflicts: libdvdnav-dev, libvcdinfo-dev + liblircclient-dev, + libdirectfb-dev (>= 0.9.22), libgtk2.0-dev, + libflac-dev, libsdl1.2-dev, libwavpack-dev, + libsmbclient-dev, libspeex-dev, libmng-dev, + libmad0-dev, libmpcdec-dev, libcdio-dev (>= 0.76-1), + zlib1g-dev, w3m, transfig, sgmltools-lite, + ghostscript | gs-gpl | gs Standards-Version: 3.7.2 Package: libxine-dev Architecture: any Section: libdevel -Depends: libxine1 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev +Depends: libxine1 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev, pkg-config Conflicts: xine-ui (<< 0.9.10), libxine2-dev Description: the xine video player library, development packages This contains development files (headers, documentation and the like) @@ -65,13 +67,13 @@ Description: the xine video player library, development packages Package: libxine1 Architecture: any Depends: ${shlibs:Depends} -Recommends: ${shlibs:Recommends}, libxine1-doc | libxine-doc -Suggests: ${shlibs:Suggests}, libartsc0 +Recommends: ${shlibs:Recommends} +Suggests: ${shlibs:Suggests}, libxine1-doc | libxine-doc Conflicts: libxine1-all-plugins, libxine1-bin, libxine1-console, libxine1-ffmpeg, libxine1-gnome, libxine1-misc-plugins, libxine1-plugins, libxine1-x Replaces: libxine1-all-plugins, libxine1-bin, libxine1-console, libxine1-ffmpeg, libxine1-gnome, libxine1-misc-plugins, libxine1-plugins, libxine1-x Provides: libxine1-all-plugins, libxine1-bin, libxine1-console, libxine1-ffmpeg, libxine1-gnome, libxine1-misc-plugins, libxine1-plugins, libxine1-x Description: the xine video/media player library, binary files - This is the xine media player library (libxine). + This is the xine media player library (libxine). . Libxine provides the complete infrastructure for a video/media player. It supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you @@ -89,7 +91,7 @@ Priority: extra Architecture: any Depends: libxine1 (= ${Source-Version}) Description: the xine video/media player library, debug data - This is the xine media player library (libxine). + This is the xine media player library (libxine). . Libxine provides the complete infrastructure for a video/media player. It supports MPEG 1/2 and some AVI and Quicktime videos out of the box, so you diff --git a/debian/copyright b/debian/copyright index 982ebc98c..f2cf85a8d 100644 --- a/debian/copyright +++ b/debian/copyright @@ -21,6 +21,6 @@ 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 St, Fifth Floor, Boston, MA 02110-1301 USA -On Debian systems, the full text of the GPL can be found in +On Debian systems, the full text of the GPL can be found in /usr/share/common-licenses/GPL diff --git a/debian/dh_xine b/debian/dh_xine new file mode 100644 index 000000000..e6129624e --- /dev/null +++ b/debian/dh_xine @@ -0,0 +1,56 @@ +#! /usr/bin/perl -w + +=head1 NAME + +dh_xine - calculates xine-lib dependencies + +=cut + +use strict; +use Debian::Debhelper::Dh_Lib; + +=head1 SYNOPSIS + +B<dh_xine> [S<I<debhelper options>>] + +=head1 DESCRIPTION + +dh_xine is a debhelper program that is responsible for generating the +${xine-x:Depends} and ${xine-console:Depends} substitutions and adding them +to substvars files. + +Each xine-lib front end is required to have one of these two substvars +listed in its Depends line in debian/control. Using package names directly +will, sooner or later, break. + +=head1 CONFORMS TO + +Debian policy, version 3.8.1 + +=cut + +init (); + +my $version; + +foreach my $package (@{$dh{DOPACKAGES}}) { + my $tmp = tmpdir ($package); + + delsubstvar($package, 'xine-x:Depends'); + addsubstvar ($package, 'xine-x:Depends', 'libxine1-x'); + + delsubstvar($package, 'xine-console:Depends'); + addsubstvar ($package, 'xine-console:Depends', 'libxine1-console'); +} + +=head1 SEE ALSO + +L<debhelper(7)> + +This program is not a part of debhelper. + +=head1 AUTHOR + +Darren Salt <linux@youmustbejoking.demon.co.uk> + +=cut diff --git a/debian/dh_xine.1 b/debian/dh_xine.1 new file mode 100644 index 000000000..5116d750a --- /dev/null +++ b/debian/dh_xine.1 @@ -0,0 +1,21 @@ +.TH DH_XINE 1 "2009-03-25" "The xine project" +.SH "NAME" +dh_xine - calculates xine\-lib dependencies +.SH "SYNOPSIS" +\fBdh_xine\fR [\fIdebhelper\ options\fR] +.SH "DESCRIPTION" +dh_xine is a debhelper program that is responsible for generating the +${xine\-x:Depends} and ${xine\-console:Depends} substitutions and adding them +to substvars files. +.PP +Each xine-lib front end is required to have one of these two substvars +listed in its Depends line in debian/control. Using package names directly +will, sooner or later, break. +.SH "CONFORMS TO" +Debian policy, version 3.8.1 +.SH "SEE ALSO" +\fIdebhelper\fR(7) +.PP +This program is not a part of debhelper. +.SH "AUTHOR" +Darren Salt <linux@youmustbejoking.demon.co.uk> diff --git a/debian/libxine1.install b/debian/libxine1.install index b4037aa21..ab8a5901f 100644 --- a/debian/libxine1.install +++ b/debian/libxine1.install @@ -1,3 +1,4 @@ +usr/bin/xine-list* usr/lib/libxine*.so.* usr/lib/xine/plugins/*/post/*.so usr/lib/xine/plugins/*/*.so @@ -6,3 +7,4 @@ usr/share/locale usr/share/xine usr/share/doc/libxine1/hackersguide/* usr/share/bug/libxine1/presubj +usr/share/man/man1/xine-list*.1 diff --git a/debian/rules b/debian/rules index 604954649..85565e115 100755 --- a/debian/rules +++ b/debian/rules @@ -34,6 +34,18 @@ ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) BUILD_TARGET := debug endif +ifneq (,$(findstring mips,$(DEB_HOST_GNU_TYPE))) + DEB_BUILD_CONFIG_OPTIONS += PTHREAD_LIBS="-lpthread" +endif + +# taken from the qemu package +# Support multiple makes at once +ifneq (,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +NJOBS := $(patsubst parallel=%,%,$(filter parallel=%,$(DEB_BUILD_OPTIONS))) +else +NJOBS := 1 +endif + # note also "noauto" to inhibit running of autogen.sh # the "optimize" flag disables compatibility hacks @@ -59,14 +71,19 @@ ifeq (,$(findstring optimize,$(DEB_BUILD_OPTIONS))) endif # --mandir - remove after etch released (autoconf >= 2.59c gets it right) -CONFIGURE_FLAGS := --prefix=/usr \ +CONFIGURE_FLAGS := \ + --build $(DEB_BUILD_GNU_TYPE) \ + --host $(DEB_HOST_GNU_TYPE) \ + --prefix=/usr \ --mandir=\$${prefix}/share/man \ --with-external-libmad \ --with-external-a52dec \ --with-external-libdts \ --with-external-ffmpeg \ + --with-external-libmpcdec \ --with-freetype \ --with-wavpack \ + --enable-ipv6 \ $(DEB_BUILD_CONFIG_OPTIONS) \ CFLAGS="$(CFLAGS)" @@ -85,9 +102,9 @@ endif touch configure-stamp build: configure-stamp build-stamp -build-stamp: +build-stamp: configure-stamp dh_testdir - $(MAKE) + $(MAKE) -j $(NJOBS) touch build-stamp update-config-sub-guess: @@ -100,11 +117,11 @@ clean: dh_testdir dh_testroot rm -f build-stamp configure-stamp po/*.gmo po/stamp-po - -$(MAKE) distclean - # remove more cruft leftover by autohell - rm -f doc/faq/faq.html doc/faq/faq.txt doc/hackersguide/hackersguide.html m4/caca.m4 - -test -f .noauto || find . -name Makefile.in -print | xargs -r rm - test -f .noauto || rm -rf compile config.guess configure depcomp install-sh ltmain.sh missing aclocal.m4 include/configure.h.in + if test -f .noauto; then \ + [ ! -f Makefile ] || $(MAKE) distclean; \ + else \ + [ ! -f Makefile ] || $(MAKE) maintainer-clean; \ + fi dh_clean install: build @@ -124,10 +141,12 @@ binary-arch: build install dh_testroot mkdir -p debian/tmp/usr/share/bug/libxine${major}/ cp debian/reportbug.presubj debian/tmp/usr/share/bug/libxine${major}/presubj -# ugly hack, documentation should never have been in /u/s/d/xine/... +# ugly hack, documentation should never have been in /u/s/d/xine/... mv debian/tmp/usr/share/doc/xine-lib debian/tmp/usr/share/doc/libxine${major} # build libxine${major} package by moving files from libxine-dev dh_install --autodest --sourcedir=debian/tmp --list-missing + install -m755 debian/dh_xine debian/libxine-dev/usr/bin + dh_installman -plibxine-dev debian/dh_xine.1 dh_installdocs dh_installchangelogs -k ChangeLog dh_link diff --git a/debian/watch b/debian/watch index c82dbbc10..d3a4d7702 100644 --- a/debian/watch +++ b/debian/watch @@ -1,4 +1,4 @@ version=3 -http://xinehq.de/index.php/releases \ +http://www.xine-project.org/releases \ (?:.*/)?xine/xine-lib-([\d\.]*).tar.gz \ debian uupdate |