diff options
-rw-r--r-- | Makefile.am | 2 | ||||
-rw-r--r-- | debian/changelog | 3 | ||||
-rw-r--r-- | debian/control | 5 | ||||
-rw-r--r-- | debian/libxine2-dev.install (renamed from debian/libxine-dev.install) | 2 |
4 files changed, 7 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index f11356ffb..a49dcc579 100644 --- a/Makefile.am +++ b/Makefile.am @@ -12,7 +12,7 @@ SUBDIRS = doc m4 po misc include lib src win32 contrib DEBFILES = debian/README.Debian debian/changelog debian/control \ debian/copyright debian/rules debian/compat \ - debian/shlibdeps.sh debian/libxine-dev.install debian/libxine1.install + debian/shlibdeps.sh debian/libxine2-dev.install debian/libxine1.install EXTRA_DIST = config.rpath autogen.sh \ configure \ diff --git a/debian/changelog b/debian/changelog index 41315ec7a..4485f2706 100644 --- a/debian/changelog +++ b/debian/changelog @@ -2,8 +2,9 @@ xine-lib-1.2 (1.2.1~hg-0) experimental; urgency=low * Hg snapshot. * Adjust for libxine2. + * libxine-dev → libxine2-dev. - -- Darren Salt <linux@youmustbejoking.demon.co.uk> Wed, 18 Jan 2012 21:56:46 +0000 + -- Darren Salt <linux@youmustbejoking.demon.co.uk> Wed, 25 Jan 2012 00:53:33 +0000 xine-lib (1.1.21~hg-0) unstable; urgency=low diff --git a/debian/control b/debian/control index 13f1f48a7..044c9ef85 100644 --- a/debian/control +++ b/debian/control @@ -28,11 +28,12 @@ Build-Depends: debhelper (>= 5.0.1), binutils (>= 2.12.90.0.9), pkg-config, zlib1g-dev, w3m, xmlto, librsvg2-bin Standards-Version: 3.7.2 -Package: libxine-dev +Package: libxine2-dev Architecture: any Section: libdevel Depends: libxine2 (= ${Source-Version}), libc6-dev, zlib1g-dev | libz-dev, libslang2-dev | slang1-dev, libfreetype6-dev, pkg-config Conflicts: xine-ui (<< 0.9.10), libxine-dev +Replaces: libxine-dev (>= 1.1.90) Description: the xine video player library, development packages This contains development files (headers, documentation and the like) for the xine library (libxine). @@ -71,7 +72,7 @@ Recommends: ${shlibs:Recommends} Suggests: ${shlibs:Suggests}, libxine2-doc | libxine-doc Conflicts: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x Replaces: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x -Provides: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x +Provides: libxine2-all-plugins, libxine2-bin, libxine2-console, libxine2-ffmpeg, libxine2-gnome, libxine2-misc-plugins, libxine2-plugins, libxine2-x, libxine2-vdr Description: the xine video/media player library, binary files This is the xine media player library (libxine). . diff --git a/debian/libxine-dev.install b/debian/libxine2-dev.install index 10a9d7983..dc28bb2cf 100644 --- a/debian/libxine-dev.install +++ b/debian/libxine2-dev.install @@ -9,4 +9,4 @@ usr/lib/xine/plugins/*/vidix/*.la usr/share/aclocal/xine.m4 usr/share/man/man1/xine-config.1 ../dh_xine usr/bin -../xine.pm usr/share/perl5/Debian/Debhelper/Sequence/xine.pm +../xine.pm usr/share/perl5/Debian/Debhelper/Sequence |