Update of /cvsroot/xine/xine-lib/debian
In directory sc8-pr-cvs10.sourceforge.net:/tmp/cvs-serv4426/debian
Modified Files:
changelog control libxine1.install rules shlibdeps.sh watch
Log Message:
Resync (with minor comment fixups).
Index: changelog
===================================================================
RCS file: /cvsroot/xine/xine-lib/debian/changelog,v
retrieving revision 1.100
retrieving revision 1.101
diff -u -r1.100 -r1.101
--- changelog 10 Aug 2006 22:55:01 -0000 1.100
+++ changelog 12 Dec 2006 23:19:37 -0000 1.101
@@ -1,21 +1,130 @@
-xine-lib (1.1.2-3) UNRELEASED; urgency=low
+xine-lib (1.1.2+dfsg-2) unstable; urgency=medium
- -- Reinhard Tartler <[EMAIL PROTECTED]> Thu, 10 Aug 2006 23:47:58 +0100
+ * Bug fix: "CVE-2006-6172: xine-lib libreal Buffer Overflow
+ Vulnerabilities", thanks to Stefan Fritsch (Closes: #401740).
-xine-lib (1.1.2-2) unstable; urgency=low
+ -- Reinhard Tartler <[EMAIL PROTECTED]> Wed, 6 Dec 2006 22:15:11 +0100
+
+xine-lib (1.1.2+dfsg-1) unstable; urgency=medium
+
+ * Urgency medium for fixing release critical bug
+ * replace cetus.ttf with a new one based on FreeSans.ttf. Many thanks go
+ to Sune Vuorela for creating this! (Closes: #393677)
+ * 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 <[EMAIL PROTECTED]> Thu, 26 Oct 2006 23:16:12 +0200
+
+xine-lib (1.1.2-6) unstable; urgency=low
+
+ * change override for -dbg package to extra
+ * added X-Vcs-Bzr tag to the source package
+ * revert the following commit from upstream, because it causes FTBFS on
+ many arches:
+ - [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 <[EMAIL PROTECTED]> Fri, 22 Sep 2006 21:49:56 +0200
+
+xine-lib (1.1.2-5) unstable; urgency=low
+
+ * Urgency kept low despite RC bug. (only FTBFS bug, does not affect testing)
+ * fetched patches from 1.1.3 branch:
+ - [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.
+ - [xine-lib @ 2006-07-21 03:31:42 by dgp85]
+ Fix building with LOG enabled.
+ - [xine-lib @ 2006-07-21 04:47:17 by dgp85]
+ When trying to get the langinfo code, first of all, set the locale,
+ or you'll always get ANSI/ASCII.
+ - [xine-lib @ 2006-08-05 13:31:13 by hadess]
+ use the gdkpixbuf loader to handle JPEG stills in Quicktime movies, as
+ the ffmpeg MJPEG decoder isn't appropriate
+ - [xine-lib @ 2006-08-05 13:34:42 by hadess]
+ avoid crashing when the FLAC file is broken
+ - [xine-lib @ 2006-08-08 03:15:02 by miguelfreitas]
+ patch by Chris Brien
+ 1) Return the stream length correctly. This fixes a FIXME.
+ 2) Set the width and height metadata.
+ 3) Reset the demuxer status to DEMUX_OK on seek.
+ (in src/demuxers/demux_rawdv.c)
+ - [xine-lib @ 2006-08-08 03:34:15 by miguelfreitas]
+ video/x-ms-wma -> audio/x-ms-wma
+ (in src/demuxers/demux_asf.c)
+ Update API for libcaca 0.99. Patch by cjacker huang.
+ Update libcaca check to use the pkg-config file shipped with libcaca
+ 0.99, and change --disable-caca to --without-caca (to conform with
+ other external libraries).
+ Remove reference to removed caca.m4 (libcaca 0.99 will use
+ pkg-config).
+ Removed m4/caca.m4 (Closes: #386745)
+ * Dropped Replaces on xine-dvdnav (only in woody) and xine (only in
+ 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
+ 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
+
+ -- Reinhard Tartler <[EMAIL PROTECTED]> Thu, 14 Sep 2006 21:27:27 +0200
+
+xine-lib (1.1.2-4) unstable; urgency=low
+
+ * build against external liba52
+ * Bug fix: "libxine1: Please use the Debian ffmpeg version", thanks to
+ Josselin Mouette. Please note that the ffmpeg version used has WMV3
+ support. Unfortunately, this version of xine cannot use that support
+ yet. This is 1.1.3 stuff. (Closes: #367095).
+ * Bug fix: "libxine1: Please support m4b files", thanks to Johannes
+ Adams. Bugfix by copying src/demuxers/demux_qt.c from CVS
+ version. (Closes: #384435).
+ * Build against internal libvcdinfo for now and add libvcdinfo-dev to
+ build-conflicts. This is a workaround for Bug: #364837, using internal
+ libvcdinfo makes the segfault go away.
+ * install a note for reportbug users
+ * cleanup (actually remove) confusing and unnecessary documentation.
+ * fetch bug from upstream cvs to fix bug where incorrect aspect ratio was
+ being passed to post plugins up (src/post/planar/expand.c, rev 1.16)
+ * add build dependency on sgmltools-lite to build faq
+ * add build dependencies transfig and gs to correctly build the
+ hackersguide
+ * bump shlibs to this revision because of changes in libcaca output plugin
+
+ -- Reinhard Tartler <[EMAIL PROTECTED]> Sun, 27 Aug 2006 21:41:58 +0200
+
+xine-lib (1.1.2-3) unstable; urgency=low
+
+ * backport fix for cdda:/ MRL from upstream (Closes: #276728)
+ * add note from darren to xine(5) as well
+ * fix totem-xine crashing when started with no argument (closes: #370283)
+ (patch taken from upstream)
+
+ -- Reinhard Tartler <[EMAIL PROTECTED]> Sat, 12 Aug 2006 00:27:15 +0200
+
+xine-lib (1.1.2-2) unstable; urgency=high
+
+ Urgency high because of security related upload
* readd debian/watch file
* update debian/rules from CVS. more complete handling of noauto flag
to prevent running auto* tools.
* disable AC_C_ALWAYS_INLINE from configure.ac. Should fix FTBFS on a
- number of architectures.
+ number of architectures. (Closes: #378043)
* added patch from Darren Salt to fix build with -O0 on at least amd64
in src/libffmpeg/libavcodec/i386/Makefile.am
-
- [Darren Salt]
- * Updated the watch file - should work regardless of changes at Souceforge.
-
- -- Reinhard Tartler <[EMAIL PROTECTED]> Thu, 13 Jul 2006 11:18:10 +0200
+ * Imported further fixes from upstream CVS:
+ + src/input/input_dvb.c
+ + src/xine-utils/xine_mutex.c
+ * Imported security fix for included copy of libmms from upstream CVS,
+ (e.g. USN-315-1)
+
+ -- Reinhard Tartler <[EMAIL PROTECTED]> Thu, 13 Jul 2006 21:51:46 +0200
xine-lib (1.1.2-1) unstable; urgency=low
Index: control
===================================================================
RCS file: /cvsroot/xine/xine-lib/debian/control,v
retrieving revision 1.47
retrieving revision 1.48
diff -u -r1.47 -r1.48
--- control 10 Aug 2006 22:55:01 -0000 1.47
+++ control 12 Dec 2006 23:19:37 -0000 1.48
@@ -3,9 +3,10 @@
Priority: optional
Maintainer: Siggi Langauf <[EMAIL PROTECTED]>
Uploaders: Philipp Matthias Hahn <[EMAIL PROTECTED]>, Reinhard Tartler <[EMAIL
PROTECTED]>
-Build-Depends: debhelper (>= 4.0.4), binutils (>= 2.12.90.0.9), libaa1-dev |
aalib1-dev (>= 1.4p5-2), libcaca-dev, libxinerama-dev | xlibs-static-dev (<<
6.8.0), libxv-dev | xlibs-static-dev (<< 6.8.0), libesd0-dev, zlib1g-dev |
libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev, libogg-dev,
libvorbis-dev, libtheora-dev, libasound2-dev [!kfreebsd-i386 !kfreebsd-amd64
!hurd-i386], libflac-dev (>>1.1.0), libmodplug-dev, libgnomevfs2-dev,
libsmbclient-dev, libspeex-dev, libmng-dev, libpng12-dev | libpng-dev,
libfreetype6-dev, libsdl1.2-dev (>=1.1.5), libvcdinfo-dev, libmad0-dev,
libxvmc-dev | xlibs-dev (<< 6.8.0), w3m, automake1.9, autoconf, libtool,
libcdio-dev (>= 0.76-1)
-Build-Conflicts: libdvdnav-dev
+Build-Depends: debhelper (>= 4.0.4), binutils (>= 2.12.90.0.9), libaa1-dev |
aalib1-dev (>= 1.4p5-2), libcaca-dev (>= 0.99.beta4-1), libxinerama-dev |
xlibs-static-dev (<< 6.8.0), libxv-dev | xlibs-static-dev (<< 6.8.0),
libesd0-dev, zlib1g-dev | libz-dev, libartsc0-dev (>>1.1.0), liblircclient-dev,
libogg-dev, libvorbis-dev, libtheora-dev, libasound2-dev [!kfreebsd-i386
!kfreebsd-amd64 !hurd-i386], libflac-dev (>>1.1.0), libmodplug-dev,
libgnomevfs2-dev, libsmbclient-dev, libspeex-dev, libmng-dev, libpng12-dev |
libpng-dev, libfreetype6-dev, libsdl1.2-dev (>=1.1.5), libmad0-dev, libxvmc-dev
| xlibs-dev (<< 6.8.0), w3m, automake1.9, autoconf, libtool, libcdio-dev (>=
0.76-1), sgmltools-lite, libavformat-dev, libpostproc-dev, libavcodec-dev
+Build-Conflicts: libdvdnav-dev, libvcdinfo-dev
Standards-Version: 3.7.2
+XS-X-Vcs-Bzr: http://siretart.tauware.de/xine.repo/xine-lib.debian.1.1.2/
Package: libxine-dev
Architecture: any
@@ -32,8 +33,6 @@
Depends: ${shlibs:Depends}
Recommends: ${shlibs:Recommends}
Suggests: ${shlibs:Suggests}, libartsc0
-Conflicts: sinek(<<0.7), xine-ui (<< 0.9.10), xine
-Replaces: xine-dvdnav, xine
Description: the xine video/media player library, binary files
This is the xine media player library (libxine).
.
@@ -49,6 +48,7 @@
you can just start watching your VCDs ;-)
Package: libxine1-dbg
+Priority: extra
Architecture: any
Depends: libxine1 (= ${Source-Version})
Description: the xine video/media player library, debug data
Index: libxine1.install
===================================================================
RCS file: /cvsroot/xine/xine-lib/debian/libxine1.install,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- libxine1.install 28 Feb 2006 18:42:38 -0000 1.9
+++ libxine1.install 12 Dec 2006 23:19:37 -0000 1.10
@@ -7,3 +7,5 @@
usr/share/man/man5/xine.5
usr/share/doc/libxine1/faq/*
usr/share/doc/libxine1/README*
+usr/share/doc/libxine1/hackersguide/*
+usr/share/bug/libxine1/presubj
Index: rules
===================================================================
RCS file: /cvsroot/xine/xine-lib/debian/rules,v
retrieving revision 1.40
retrieving revision 1.41
diff -u -r1.40 -r1.41
--- rules 13 Jul 2006 09:24:21 -0000 1.40
+++ rules 12 Dec 2006 23:19:37 -0000 1.41
@@ -62,6 +62,10 @@
CONFIGURE_FLAGS := --prefix=/usr \
--mandir=\$${prefix}/share/man \
--with-external-libmad \
+ --with-external-ffmpeg \
+ --with-external-a52dec \
+ --with-external-libdts \
+ --disable-cacatest \
$(DEB_BUILD_CONFIG_OPTIONS) \
CFLAGS="$(CFLAGS)"
@@ -97,8 +101,9 @@
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 rm
- test -f .noauto || rm -rf compile config.guess configure depcomp
install-sh ltmain.sh missing
+ test -f .noauto || rm -rf compile config.guess configure depcomp
install-sh ltmain.sh missing aclocal.m4 config.h.in
dh_clean
install: build
@@ -116,10 +121,11 @@
binary-arch: build install
dh_testdir
dh_testroot
- #
- #ugly hack, documentation should never have been in /u/s/d/xine/...
+ 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/...
mv debian/tmp/usr/share/doc/xine
debian/tmp/usr/share/doc/libxine${major}
- # build libxine${major} package by moving files from libxine-dev
+# build libxine${major} package by moving files from libxine-dev
dh_install --autodest --sourcedir=debian/tmp --list-missing
dh_installdocs
dh_installchangelogs -k ChangeLog
@@ -127,7 +133,7 @@
dh_strip --dbg-package=libxine1
dh_compress
dh_fixperms
- dh_makeshlibs -V 'libxine1 (>= 1.1.1+cvs20060621-1)'
+ dh_makeshlibs -V 'libxine1 (>= 1.1.2-5)'
dh_installdeb
chmod +x debian/shlibdeps.sh
debian/shlibdeps.sh libxine${major}
@@ -137,3 +143,42 @@
binary: binary-indep binary-arch
.PHONY: build clean binary-indep binary-arch binary install configure
+
+# this target is used to strip out libffmpeg, libfaad & libmad
+# Canonical has concerns distributing them on the live/desktop cd
+strip-non-main-stuff: clean
+ rm -rf src/libffmpeg
+ rm -rf src/libfaad
+ rm -rf src/libmad
+ cat configure.ac \
+ | grep -v "^src/libffmpeg" \
+ | grep -v "^src/libfaad" \
+ | grep -v "^src/libmad" \
+ > configure.ac.bak
+ mv configure.ac.bak configure.ac
+ cat src/Makefile.am \
+ | grep -v "ffmpeg" \
+ | grep -v "libmad" \
+ | grep -v "faad" \
+ > src/Makefile.am.bak
+ mv src/Makefile.am.bak src/Makefile.am
+ @echo stripped things unsuitable for ubuntu/main
+ @echo make sure that the tree still builds
+
+# use this target on an ``unstripped'' xine-lib tarball
+# to generate an orig.tar.gz suitable for ubuntu-main:
+
+# be sure to increase the 'repacked' level in debian/changelog
+
+UPSTREAM_VERSION=$(shell dpkg-parsechangelog | grep ^Version | sed "s/Version:
//" | sed "s/-.$$//")
+get-orig-source:
+# this monstrum works for me, please double check it before using!
+ current_dir=$(shell basename $(PWD)) ; cd .. ; \
+ tar cz --exclude .bzr --exclude debian \
+ -f xine-lib_$(UPSTREAM_VERSION).orig.tar.gz \
+ $$current_dir
+
+get-ubuntu-orig-source: strip-non-main-stuff get-orig-source
+get-cvs-orig-source: get-cvs-orig-source
+
+.PHONY: strip-non-main-stuff get-ubuntu-orig-source get-cvs-orig-source
get-orig-source
Index: shlibdeps.sh
===================================================================
RCS file: /cvsroot/xine/xine-lib/debian/shlibdeps.sh,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- shlibdeps.sh 30 Oct 2005 22:06:55 -0000 1.10
+++ shlibdeps.sh 12 Dec 2006 23:19:37 -0000 1.11
@@ -14,7 +14,6 @@
$installdir/usr/lib/xine/plugins/$ver/xineplug_ao_out_arts.so
$installdir/usr/lib/xine/plugins/$ver/xineplug_ao_out_esd.so
$installdir/usr/lib/xine/plugins/$ver/xineplug_vo_out_aa.so
- $installdir/usr/lib/xine/plugins/$ver/xineplug_vo_out_syncfb.so
$installdir/usr/lib/xine/plugins/$ver/xineplug_vo_out_sdl.so
$installdir/usr/lib/xine/plugins/$ver/xineplug_flac.so
$installdir/usr/lib/xine/plugins/$ver/xineplug_inp_gnome_vfs.so
Index: watch
===================================================================
RCS file: /cvsroot/xine/xine-lib/debian/watch,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- watch 19 Jul 2006 20:16:58 -0000 1.2
+++ watch 12 Dec 2006 23:19:37 -0000 1.3
@@ -1,3 +1,4 @@
version=3
-opts="uversionmangle=s/\.(gz|bz2)$//" \
-http://qa.debian.org/watch/sf.php?project=xine
xine-lib-([\d\.]*)\.tar\.(gz|bz2) debian uupdate
+http://xinehq.de/index.php/releases \
+ (?:.*/)?xine/xine-lib-([\d\.]*).tar.gz \
+ debian uupdate
-------------------------------------------------------------------------
Take Surveys. Earn Cash. Influence the Future of IT
Join SourceForge.net's Techsay panel and you'll get the chance to share your
opinions on IT & business topics through brief surveys - and earn cash
http://www.techsay.com/default.php?page=join.php&p=sourceforge&CID=DEVDEV
_______________________________________________
Xine-cvslog mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/xine-cvslog
