diff options
Diffstat (limited to 'debian')
| -rw-r--r-- | debian/README.Debian | 6 | ||||
| -rw-r--r-- | debian/changelog | 32 | ||||
| -rw-r--r-- | debian/control | 4 | ||||
| -rw-r--r-- | debian/copyright | 2 | ||||
| -rwxr-xr-x | debian/rules | 2 |
5 files changed, 23 insertions, 23 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 7386ffb78..c71e640f1 100644 --- a/debian/changelog +++ b/debian/changelog @@ -44,7 +44,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 +56,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 +96,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 +154,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 +314,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 +361,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 +378,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 +401,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 +421,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 36260d233..0a54b20b6 100644 --- a/debian/control +++ b/debian/control @@ -73,7 +73,7 @@ Conflicts: libxine1-all-plugins, libxine1-bin, libxine1-console, libxine1-ffmpeg 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 @@ -91,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/rules b/debian/rules index 47f4a73e7..85565e115 100755 --- a/debian/rules +++ b/debian/rules @@ -141,7 +141,7 @@ 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 |