[SCM] vdr-plugin-xineliboutput packaging repository branch, master, updated. debian/1.0.7+cvs20120130.2334-1-1-g9436857

etobi git at e-tobi.net
Fri Feb 3 21:35:43 UTC 2012


The following commit has been merged in the master branch:
commit 9436857a11d5db754e8d01d2e4d27b06fb2b869d
Author: etobi <git at e-tobi.net>
Date:   Fri Feb 3 22:15:57 2012 +0100

    Switching to libxine2

diff --git a/debian/changelog b/debian/changelog
index 71e1b4a..45276ee 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+vdr-plugin-xineliboutput (1.0.7+cvs20120130.2334-2) unstable; urgency=low
+
+  * Switching to libxine2
+
+ -- Tobias Grimm <etobi at debian.org>  Fri, 03 Feb 2012 22:11:52 +0100
+
 vdr-plugin-xineliboutput (1.0.7+cvs20120130.2334-1) unstable; urgency=low
 
   * New Upstream Snapshot (Closes: #657063, #656732)
diff --git a/debian/control b/debian/control
index 75f842e..3ac8d36 100644
--- a/debian/control
+++ b/debian/control
@@ -6,7 +6,7 @@ Uploaders: Tobias Grimm <etobi at debian.org>, Thomas Schmidt <tschmidt at debian.org>
 Build-Depends: debhelper (>= 7.0.50~), gettext, txt2man,
  vdr-dev (>= 1.7.23),
  x11proto-core-dev,
- libxine-dev (>= 1.1.12),
+ libxine2-dev,
  libxext-dev,
  libjpeg-dev,
  libx11-dev,
@@ -30,35 +30,35 @@ Description: VDR plugin for Xine based sofdevice frontends
 
 Package: libxineliboutput-fbfe
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, vdr-plugin-xineliboutput (= ${binary:Version}), libxine1-xvdr (= ${binary:Version}), libxine1-console
+Depends: ${shlibs:Depends}, ${misc:Depends}, vdr-plugin-xineliboutput (= ${binary:Version}), libxine2-xvdr (= ${binary:Version}), libxine2-console
 Description: Local framebuffer frontend for the xineliboutput plugin
  The xineliboutput vdr plugin requires this library to provide the built-in
  local frontend for framebuffer devices.
 
 Package: libxineliboutput-sxfe
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, vdr-plugin-xineliboutput (= ${binary:Version}), libxine1-xvdr (= ${binary:Version}), libxine1-x, dbus
+Depends: ${shlibs:Depends}, ${misc:Depends}, vdr-plugin-xineliboutput (= ${binary:Version}), libxine2-xvdr (= ${binary:Version}), libxine2-x, dbus
 Description: Local X-Server frontend for the xineliboutput plugin
  The xineliboutput vdr plugin requires this library to provide the built-in
  local frontend for X, Xv or XvMC window systems.
 
 Package: xineliboutput-fbfe
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxine1-xvdr (= ${binary:Version}), libxine1-console
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxine2-xvdr (= ${binary:Version}), libxine2-console
 Description: Remote Framebuffer frontend for vdr-plugin-xineliboutput
  This frambuffer remote frontend plays back streams provided by
  vdr-plugin-xineliboutput.
 
 Package: xineliboutput-sxfe
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, libxine1-xvdr (= ${binary:Version}), libxine1-x, dbus
+Depends: ${shlibs:Depends}, ${misc:Depends}, libxine2-xvdr (= ${binary:Version}), libxine2-x, dbus
 Description: Remote X-Server frontend for vdr-plugin-xineliboutput
  This X/Xv/XvMc remote frontend plays back streams provided by
  vdr-plugin-xineliboutput.
 
-Package: libxine1-xvdr
+Package: libxine2-xvdr
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}, ${xine:Depends}, libxine1-ffmpeg
+Depends: ${shlibs:Depends}, ${misc:Depends}, ${xine:Depends}, libxine2-ffmpeg
 Replaces: libxine-xvdr (<< 1.0.0~rc2-5)
 Provides: libxine-xvdr
 Conflicts: libxine-xvdr (<< 1.0.0~rc2-5)
diff --git a/debian/libxine1-xvdr.docs b/debian/libxine2-xvdr.docs
similarity index 100%
rename from debian/libxine1-xvdr.docs
rename to debian/libxine2-xvdr.docs
diff --git a/debian/libxine1-xvdr.install b/debian/libxine2-xvdr.install
similarity index 100%
rename from debian/libxine1-xvdr.install
rename to debian/libxine2-xvdr.install
diff --git a/debian/rules b/debian/rules
index 672202e..227c8a3 100755
--- a/debian/rules
+++ b/debian/rules
@@ -4,7 +4,7 @@
 #export DH_VERBOSE=1
 
 MAKE_OPTIONS = VDRDIR=/usr/include/vdr LIBDIR=/usr/lib LOCALEDIR=debian/tmp/usr/share/locale \
-               NOSIGNAL_IMAGE_FILE=/usr/share/libxine1-xvdr/nosignal.mpg
+               NOSIGNAL_IMAGE_FILE=/usr/share/libxine2-xvdr/nosignal.mpg
 
 %:
 	dh $@
@@ -23,8 +23,8 @@ override_dh_auto_clean:
 
 override_dh_gencontrol:
 	sh /usr/share/vdr-dev/dependencies.sh
-	dpkg -p libxine-dev | sed -re '/^Version:/! d; s/^Version: (([0-9]:)?([0-9]+\.){2}[0-9]+).*$$/xine:Depends=libxine1 (>= \1)/' \
-	>> debian/libxine1-xvdr.substvars
+	dpkg -p libxine2-dev | sed -re '/^Version:/! d; s/^Version: (([0-9]:)?([0-9]+\.){2}[0-9]+).*$$/xine:Depends=libxine2 (>= \1)/' \
+	>> debian/libxine2-xvdr.substvars
 	dh_gencontrol
 
 override_dh_auto_install:

-- 
vdr-plugin-xineliboutput packaging repository



More information about the pkg-vdr-dvb-changes mailing list