diff options
| -rw-r--r-- | debian/changelog | 15 | ||||
| -rw-r--r-- | debian/compat | 1 | ||||
| -rw-r--r-- | debian/control | 7 | ||||
| -rw-r--r-- | debian/dirs | 2 | ||||
| -rw-r--r-- | debian/docs | 6 | ||||
| -rw-r--r-- | debian/libxine-dev.install | 16 | ||||
| -rw-r--r-- | debian/libxine1.install | 15 | ||||
| -rw-r--r-- | debian/overrides.libxine | 60 | ||||
| -rwxr-xr-x | debian/rules | 31 |
9 files changed, 58 insertions, 95 deletions
diff --git a/debian/changelog b/debian/changelog index 35023c931..f4b2ebf3a 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,4 +1,17 @@ -xine-lib (1-beta5-1) unstable; urgency=low +xine-lib (1-beta8-1) unstable; urgency=low + + * Add pmhahn as Uploaders. + * New upstream release. + * Standards-Version 3.5.9: + - debhelper 4 + - Use 'noopt' instead of 'debug' + - Remove overrides for plugin shared libraries. + * Provide non-developer documentation in library package. + * Build with dxr3 support (closes: #117170) + + -- Philipp Matthias Hahn <pmhahn@debian.org> Fri, 14 Mar 2003 10:03:16 +0100 + +xine-lib (1-beta6-1) unstable; urgency=low * new upstream release * updated artsc build dependancy diff --git a/debian/compat b/debian/compat new file mode 100644 index 000000000..b8626c4cf --- /dev/null +++ b/debian/compat @@ -0,0 +1 @@ +4 diff --git a/debian/control b/debian/control index b9038ec2c..824437790 100644 --- a/debian/control +++ b/debian/control @@ -2,14 +2,15 @@ Source: xine-lib Section: libs Priority: optional Maintainer: Siggi Langauf <siggi@debian.org> -Build-Depends: debhelper (>> 2.0.0), aalib1-dev (>= 1.4p5-2), xlibs-dev (>> 4.1), libesd0-dev, libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libasound2-dev, libflac-dev (>>1.1.0), libgnomevfs2-dev +Uploaders: Philipp Matthias Hahn <pmhahn@debian.org> +Build-Depends: debhelper (>= 4.0.0), aalib1-dev (>= 1.4p5-2), xlibs-dev (>> 4.1), libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev, libvorbis-dev, libasound2-dev, libflac-dev (>>1.1.0), libgnomevfs2-dev Build-Conflicts: libdvdnav-dev -Standards-Version: 3.2.1 +Standards-Version: 3.5.9 Package: libxine-dev Architecture: any Section: devel -Depends: libxine1 (= ${Source-Version}), libc6-dev, xlibs-dev, libz-dev, slang1-dev +Depends: libxine1 (= ${Source-Version}), libc6-dev, xlibs-dev, zlib1g-dev | libz-dev, slang1-dev Conflicts: xine-ui (<< 0.9.10) Description: the xine video player library, development packages This contains development files (headers, documentation and the like) diff --git a/debian/dirs b/debian/dirs deleted file mode 100644 index 44188162e..000000000 --- a/debian/dirs +++ /dev/null @@ -1,2 +0,0 @@ -usr/lib -usr/include diff --git a/debian/docs b/debian/docs deleted file mode 100644 index e06812a18..000000000 --- a/debian/docs +++ /dev/null @@ -1,6 +0,0 @@ -AUTHORS -README -TODO -doc/dataflow.dia - - diff --git a/debian/libxine-dev.install b/debian/libxine-dev.install new file mode 100644 index 000000000..7ea5f60db --- /dev/null +++ b/debian/libxine-dev.install @@ -0,0 +1,16 @@ +usr/bin/xine-config +usr/include +usr/lib/libxine.la +usr/lib/libxine*.so +usr/lib/pkgconfig/libxine.pc +usr/lib/xine/plugins/*/*.la +usr/lib/xine/plugins/*/post/*.la +usr/lib/xine/plugins/*/vidix/*.la +usr/share/aclocal/xine.m4 +usr/share/man/man1/xine-config.1 +usr/share/doc/xine/README.freebsd +usr/share/doc/xine/README.irix +usr/share/doc/xine/README.mrl +usr/share/doc/xine/README.plugins +usr/share/doc/xine/README.solaris +usr/share/doc/xine/dataflow.dia diff --git a/debian/libxine1.install b/debian/libxine1.install new file mode 100644 index 000000000..7daaab114 --- /dev/null +++ b/debian/libxine1.install @@ -0,0 +1,15 @@ +usr/lib/libxine*.so.* +usr/lib/xine/plugins/*/post/*.so +usr/lib/xine/plugins/*/*.so +usr/lib/xine/plugins/*/vidix/*.so +usr/share/doc/xine/faq +usr/share/doc/xine/README +usr/share/doc/xine/README.config_en +usr/share/doc/xine/README.dvb +usr/share/doc/xine/README.dxr3 +usr/share/doc/xine/README.dxr3_pl +usr/share/doc/xine/README.opengl +usr/share/doc/xine/README.syncfb +usr/share/doc/xine/README.tvmode +usr/share/locale +usr/share/xine diff --git a/debian/overrides.libxine b/debian/overrides.libxine deleted file mode 100644 index 0e955d096..000000000 --- a/debian/overrides.libxine +++ /dev/null @@ -1,60 +0,0 @@ -# in this case, -fPIC would _only_ degrade performance, as there's only one -# instance of any plugin in memory unless the user plays 2 foles at the same -# (which doesn't make any sense...) -libxine0: shlib-with-non-pic-code usr/lib/libxine-0.9.so.0.0.1 -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_ao_out_alsa05.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_ao_out_esd.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_ao_out_oss.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_decode_a52.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_decode_ff.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_decode_lpcm.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_decode_mad.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_decode_mpeg2.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_decode_spu.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_decode_w32dll.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_dmx_avi.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_dmx_mpeg.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_dmx_mpeg_audio.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_dmx_mpeg_block.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_dmx_mpeg_elem.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_dmx_mpeg_pes.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_dmx_mpeg_ts.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_inp_dvd.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_inp_file.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_inp_net.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_inp_rtp.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_inp_stdin_fifo.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_inp_vcd.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_vo_out_aa.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_vo_out_syncfb.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_vo_out_xshm.so -libxine0: shlib-with-non-pic-code usr/lib/xine/plugins/xineplug_vo_out_xv.so -# shlib-deps are definitely not required for plugins -libxine0: shlib-missing-in-control-file xineplug_dmx_mpeg_block.so usr/lib/xine/plugins/xineplug_dmx_mpeg_block.so -libxine0: shlib-missing-in-control-file xineplug_dmx_mpeg.so usr/lib/xine/plugins/xineplug_dmx_mpeg.so -libxine0: shlib-missing-in-control-file xineplug_dmx_mpeg_audio.so usr/lib/xine/plugins/xineplug_dmx_mpeg_audio.so -libxine0: shlib-missing-in-control-file xineplug_decode_ff.so usr/lib/xine/plugins/xineplug_decode_ff.so -libxine0: shlib-missing-in-control-file xineplug_inp_rtp.so usr/lib/xine/plugins/xineplug_inp_rtp.so -libxine0: shlib-missing-in-control-file xineplug_decode_w32dll.so usr/lib/xine/plugins/xineplug_decode_w32dll.so -libxine0: shlib-missing-in-control-file xineplug_decode_mad.so usr/lib/xine/plugins/xineplug_decode_mad.so -libxine0: shlib-missing-in-control-file xineplug_vo_out_aa.so usr/lib/xine/plugins/xineplug_vo_out_aa.so -libxine0: shlib-missing-in-control-file xineplug_ao_out_esd.so usr/lib/xine/plugins/xineplug_ao_out_esd.so -libxine0: shlib-missing-in-control-file xineplug_dmx_mpeg_pes.so usr/lib/xine/plugins/xineplug_dmx_mpeg_pes.so -libxine0: shlib-missing-in-control-file xineplug_decode_mpeg2.so usr/lib/xine/plugins/xineplug_decode_mpeg2.so -libxine0: shlib-missing-in-control-file xineplug_inp_dvd.so usr/lib/xine/plugins/xineplug_inp_dvd.so -libxine0: shlib-missing-in-control-file xineplug_vo_out_xshm.so usr/lib/xine/plugins/xineplug_vo_out_xshm.so -libxine0: shlib-missing-in-control-file xineplug_decode_lpcm.so usr/lib/xine/plugins/xineplug_decode_lpcm.so -libxine0: shlib-missing-in-control-file xineplug_vo_out_xv.so usr/lib/xine/plugins/xineplug_vo_out_xv.so -libxine0: shlib-missing-in-control-file xineplug_inp_net.so usr/lib/xine/plugins/xineplug_inp_net.so -libxine0: shlib-missing-in-control-file xineplug_dmx_avi.so usr/lib/xine/plugins/xineplug_dmx_avi.so -libxine0: shlib-missing-in-control-file xineplug_ao_out_alsa05.so usr/lib/xine/plugins/xineplug_ao_out_alsa05.so -libxine0: shlib-missing-in-control-file xineplug_dmx_mpeg_ts.so usr/lib/xine/plugins/xineplug_dmx_mpeg_ts.so -libxine0: shlib-missing-in-control-file xineplug_inp_stdin_fifo.so usr/lib/xine/plugins/xineplug_inp_stdin_fifo.so -libxine0: shlib-missing-in-control-file xineplug_decode_a52.so usr/lib/xine/plugins/xineplug_decode_a52.so -libxine0: shlib-missing-in-control-file xineplug_inp_vcd.so usr/lib/xine/plugins/xineplug_inp_vcd.so -libxine0: shlib-missing-in-control-file xineplug_decode_spu.so usr/lib/xine/plugins/xineplug_decode_spu.so -libxine0: shlib-missing-in-control-file xineplug_inp_file.so usr/lib/xine/plugins/xineplug_inp_file.so -libxine0: shlib-missing-in-control-file xineplug_vo_out_syncfb.so usr/lib/xine/plugins/xineplug_vo_out_syncfb.so -libxine0: shlib-missing-in-control-file xineplug_dmx_mpeg_elem.so usr/lib/xine/plugins/xineplug_dmx_mpeg_elem.so -libxine0: shlib-missing-in-control-file xineplug_ao_out_oss.so usr/lib/xine/plugins/xineplug_ao_out_oss.so - diff --git a/debian/rules b/debian/rules index c38a089a4..c7fb2f66a 100755 --- a/debian/rules +++ b/debian/rules @@ -6,9 +6,6 @@ # Uncomment this to turn on verbose mode. #export DH_VERBOSE=1 -# This is the debhelper compatability version to use. -export DH_COMPAT=2 - # assuming created lib in src/xine-engine/.libs/libxine.so.<version> version=`ls src/xine-engine/.libs/libxine*.so.* | \ awk '{if (match($$0,/[0-9]+\.[0-9]+\.[0-9]+$$/)) print substr($$0,RSTART)}'` @@ -20,15 +17,15 @@ major=`ls src/xine-engine/.libs/libxine*.so.* | \ DEB_HOST_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_HOST_GNU_TYPE) DEB_BUILD_GNU_TYPE ?= $(shell dpkg-architecture -qDEB_BUILD_GNU_TYPE) - -ifneq (,$(findstring debug,$(DEB_BUILD_OPTIONS))) - CFLAGS += -g +CFLAGS += -g +ifneq (,$(findstring noopt,$(DEB_BUILD_OPTIONS))) + CFLAGS += -O0 endif INSTALL_TARGET := install BUILD_TARGET := all ifeq (,$(findstring nostrip,$(DEB_BUILD_OPTIONS))) - INSTALL_TARGET := install-debug - BUILD_TARGET := debug + INSTALL_TARGET := install-debug + BUILD_TARGET := debug endif DEB_HOST_GNU_OPTION := @@ -82,11 +79,8 @@ install: build dh_clean -k dh_installdirs - $(MAKE) install prefix=$(CURDIR)/debian/libxine-dev/usr \ - LIBRARY_PATH=$(CURDIR)/debian/libxine-dev/usr/lib - mkdir -p $(CURDIR)/debian/libxine$(major)/usr/share/lintian/overrides - cp $(CURDIR)/debian/overrides.libxine \ - $(CURDIR)/debian/libxine$(major)/usr/share/lintian/overrides/libxine$(major) + $(MAKE) install DESTDIR=$(CURDIR)/debian/tmp \ + LIBRARY_PATH=$(CURDIR)/debian/tmp/usr/lib binary-indep: build install # We have nothing architecture-independant to do. @@ -98,17 +92,8 @@ binary-arch: build install # # build libxine${major} package by moving files from libxine-dev # - dh_movefiles --sourcedir=debian/libxine-dev -plibxine$(major) \ - usr/lib/libxine*.so.$(major) \ - usr/lib/libxine*.so.$(version) \ - $(shell cd debian/libxine-dev; find usr/lib/xine/plugins -name \*.so) \ - usr/share/xine \ - usr/share/locale - -# dh_installdebconf + dh_install --sourcedir=debian/tmp --list-missing dh_installdocs - dh_installexamples - dh_installmenu dh_installchangelogs -k ChangeLog dh_link dh_strip |