Bug#623595: Acknowledgement (xine-lib: FTBFS: libxine1-misc-plugins missing files (debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_pvr.so), aborting)

2011-04-21 Thread Loic Dachary
Hi,

Here is a patch that fixes this bug by removing pvr from the list of installed 
plugins,
because it won't compile anymore since videodev.h has been obsoleted.

http://www.mail-archive.com/linux-media@vger.kernel.org/msg27519.html

The patch also fixes all pending lintian warnings. It is formatted as a NMU and 
I would be happy to
upload it myself if you don't have time to apply it.

Thanks for your work on xine : I have been using your package for years, almost 
on a daily basis ;-)
diff -Nru xine-lib-1.1.19/debian/changelog xine-lib-1.1.19/debian/changelog
--- xine-lib-1.1.19/debian/changelog	2011-01-23 17:50:35.0 +0100
+++ xine-lib-1.1.19/debian/changelog	2011-04-21 17:49:29.0 +0200
@@ -1,3 +1,11 @@
+xine-lib (1.1.19-3.1) unstable; urgency=low
+
+  * NMU.
+  * fix lintian warnings
+  * remove xineplug_inp_pvr.so from libxine1-misc-plugins.install (Closes: #623595).
+
+ -- Loic Dachary l...@dachary.org  Thu, 21 Apr 2011 17:49:29 +0200
+
 xine-lib (1.1.19-3) unstable; urgency=low
 
   * add missing #includeX11/extensions/XvMClib.h to avoid FTBFS,
diff -Nru xine-lib-1.1.19/debian/control xine-lib-1.1.19/debian/control
--- xine-lib-1.1.19/debian/control	2011-01-23 17:18:48.0 +0100
+++ xine-lib-1.1.19/debian/control	2011-04-21 12:52:29.0 +0200
@@ -29,10 +29,11 @@
 Vcs-Browser: http://hg.debian.org/hg/xine-lib/pkg/xine-lib-deb
 XS-DM-Upload-Allowed: yes
 Homepage: http://www.xine-project.org/
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 
 Package: libxine1-doc
 Architecture: all
+Depends: ${misc:Depends}
 Section: doc
 Replaces: libxine1 ( 1.1.7-1)
 Provides: libxine-doc
@@ -50,7 +51,7 @@
 
 Package: libxine1
 Architecture: any
-Depends: libxine1-plugins (= ${source:Version}) | libxine1-misc-plugins (= ${binary:Version}),
+Depends: ${misc:Depends}, ${misc:Depends}, libxine1-plugins (= ${source:Version}) | libxine1-misc-plugins (= ${binary:Version}),
 	libxine1-x (= ${binary:Version}), libxine1-console (= ${binary:Version})
 Recommends: libxine1-ffmpeg
 Suggests: gxine | xine-ui, libxine1-doc | libxine-doc
@@ -70,7 +71,7 @@
 
 Package: libxine1-bin
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
 Suggests: ${shlibs:Suggests}
 Conflicts: libxine1 ( 1.1.8-4)
@@ -84,7 +85,7 @@
 Section: libdevel
 Conflicts: libxine2-dev
 Replaces: libxine2-dev
-Depends: libxine1-bin (= ${binary:Version}), libc6-dev, zlib1g-dev,
+Depends: ${misc:Depends}, libxine1-bin (= ${binary:Version}), libc6-dev, zlib1g-dev,
 	 libslang2-dev, libfreetype6-dev, pkg-config
 Description: the xine video player library, development packages
  This contains development files (headers, documentation and the like)
@@ -101,7 +102,7 @@
 Package: libxine1-ffmpeg
 Architecture: any
 Section: video
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libxine-extracodecs ( 1.1.3-1)
 Conflicts: libxine-extracodecs ( 1.1.3-1)
 Description: MPEG-related plugins for libxine1
@@ -116,7 +117,7 @@
 Package: libxine1-gnome
 Architecture: any
 Section: video
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: GNOME-related plugins for libxine1
  This package contains plugins for the xine video/media player engine,
  which are commonly used in the GNOME desktop environment. In detail
@@ -127,7 +128,7 @@
 Package: libxine1-console
 Architecture: any
 Priority: extra
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libxine1 ( 1.1.8-2)
 Conflicts: libxine1 ( 1.1.8-2)
 Description: libaa/libcaca/framebuffer/directfb related plugins for libxine1
@@ -140,7 +141,7 @@
 
 Package: libxine1-x
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libxine1 ( 1.1.8-2)
 Conflicts: libxine1 ( 1.1.8-2)
 Description: X desktop video output plugins for libxine1
@@ -154,7 +155,7 @@
 Package: libxine1-misc-plugins
 Architecture: any
 Section: video
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libxine1 ( 1.1.8-2)
 Conflicts: libxine1 ( 1.1.8-2)
 Description: Input, audio output and post plugins for libxine1
@@ -169,7 +170,7 @@
 Section: debug
 Priority: extra
 Recommends: libxine1-ffmpeg, libxine1-gnome, libxine1-console
-Depends: libxine1-bin (= ${binary:Version})
+Depends: ${misc:Depends}, libxine1-bin (= ${binary:Version})
 Description: debug symbols for libxine1
  This is the xine media player library (libxine).
  .
@@ -183,7 +184,7 @@
 Package: libxine1-plugins
 Architecture: all
 Priority: extra
-Depends: libxine1-ffmpeg (= ${source:Version}), libxine1-misc-plugins (= ${source:Version})
+Depends: ${misc:Depends}, libxine1-ffmpeg (= ${source:Version}), libxine1-misc-plugins (= ${source:Version})
 Suggests: libxine1-gnome (= ${source:Version})
 Description: the xine video/media player library, meta package
  This is the xine media player library (libxine).
@@ -202,7 +203,7 

Bug#623595: Info received (Bug#623595: Acknowledgement (xine-lib: FTBFS: libxine1-misc-plugins missing files (debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_pvr.so), aborting))

2011-04-21 Thread Loic Dachary
Hi,

For your convenience, here are two distinct patches applied against changeset:  
 425:b79db0132a80 of
http://hg.debian.org/hg/xine-lib/pkg/xine-lib-deb. As discussed on IRC today, 
this repository misses the -3 version
of the package. I do hope, however, that you will be able to safely apply the 
patches.

Cheers

changeset:   426:d5a2efaa4140
user:l...@dachary.org
date:Thu Apr 21 20:25:31 2011 +0200
summary: v4l is no longer supported in 2.6.38, therefore xineplug_inp_pvr.so will not compiled and is removed fix#623595

diff -r b79db0132a80 -r d5a2efaa4140 debian/libxine1-misc-plugins.install
--- a/debian/libxine1-misc-plugins.install	Wed Jul 28 22:37:38 2010 +0100
+++ b/debian/libxine1-misc-plugins.install	Thu Apr 21 20:25:31 2011 +0200
@@ -7,7 +7,6 @@
 debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_mms.so
 debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_net.so
 debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_pnm.so
-debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_pvr.so
 debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_rtp.so
 debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_rtsp.so
 debian/tmp/usr/lib/xine/plugins/*/xineplug_inp_smb.so

changeset:   427:517ed6bf0e35
tag: tip
user:l...@dachary.org
date:Thu Apr 21 20:27:10 2011 +0200
summary: fix lintian warnings for 1.1.19-3

diff -r d5a2efaa4140 -r 517ed6bf0e35 debian/control
--- a/debian/control	Thu Apr 21 20:25:31 2011 +0200
+++ b/debian/control	Thu Apr 21 20:27:10 2011 +0200
@@ -29,10 +29,11 @@
 Vcs-Browser: http://hg.debian.org/hg/xine-lib/pkg/xine-lib-deb
 XS-DM-Upload-Allowed: yes
 Homepage: http://www.xine-project.org/
-Standards-Version: 3.8.3
+Standards-Version: 3.9.1
 
 Package: libxine1-doc
 Architecture: all
+Depends: ${misc:Depends}
 Section: doc
 Replaces: libxine1 ( 1.1.7-1)
 Provides: libxine-doc
@@ -50,7 +51,7 @@
 
 Package: libxine1
 Architecture: any
-Depends: libxine1-plugins (= ${source:Version}) | libxine1-misc-plugins (= ${binary:Version}),
+Depends: ${misc:Depends}, ${misc:Depends}, libxine1-plugins (= ${source:Version}) | libxine1-misc-plugins (= ${binary:Version}),
 	libxine1-x (= ${binary:Version}), libxine1-console (= ${binary:Version})
 Recommends: libxine1-ffmpeg
 Suggests: gxine | xine-ui, libxine1-doc | libxine-doc
@@ -70,7 +71,7 @@
 
 Package: libxine1-bin
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Recommends: ${shlibs:Recommends}
 Suggests: ${shlibs:Suggests}
 Conflicts: libxine1 ( 1.1.8-4)
@@ -84,7 +85,7 @@
 Section: libdevel
 Conflicts: libxine2-dev
 Replaces: libxine2-dev
-Depends: libxine1-bin (= ${binary:Version}), libc6-dev, zlib1g-dev,
+Depends: ${misc:Depends}, libxine1-bin (= ${binary:Version}), libc6-dev, zlib1g-dev,
 	 libslang2-dev, libfreetype6-dev, pkg-config
 Description: the xine video player library, development packages
  This contains development files (headers, documentation and the like)
@@ -101,7 +102,7 @@
 Package: libxine1-ffmpeg
 Architecture: any
 Section: video
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libxine-extracodecs ( 1.1.3-1)
 Conflicts: libxine-extracodecs ( 1.1.3-1)
 Description: MPEG-related plugins for libxine1
@@ -116,7 +117,7 @@
 Package: libxine1-gnome
 Architecture: any
 Section: video
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Description: GNOME-related plugins for libxine1
  This package contains plugins for the xine video/media player engine,
  which are commonly used in the GNOME desktop environment. In detail
@@ -127,7 +128,7 @@
 Package: libxine1-console
 Architecture: any
 Priority: extra
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libxine1 ( 1.1.8-2)
 Conflicts: libxine1 ( 1.1.8-2)
 Description: libaa/libcaca/framebuffer/directfb related plugins for libxine1
@@ -140,7 +141,7 @@
 
 Package: libxine1-x
 Architecture: any
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libxine1 ( 1.1.8-2)
 Conflicts: libxine1 ( 1.1.8-2)
 Description: X desktop video output plugins for libxine1
@@ -154,7 +155,7 @@
 Package: libxine1-misc-plugins
 Architecture: any
 Section: video
-Depends: ${shlibs:Depends}
+Depends: ${misc:Depends}, ${shlibs:Depends}
 Replaces: libxine1 ( 1.1.8-2)
 Conflicts: libxine1 ( 1.1.8-2)
 Description: Input, audio output and post plugins for libxine1
@@ -169,7 +170,7 @@
 Section: debug
 Priority: extra
 Recommends: libxine1-ffmpeg, libxine1-gnome, libxine1-console
-Depends: libxine1-bin (= ${binary:Version})
+Depends: ${misc:Depends}, libxine1-bin (= ${binary:Version})
 Description: debug symbols for libxine1
  This is the xine media player library (libxine).
  .
@@ -183,7 +184,7 @@
 Package: libxine1-plugins
 Architecture: all
 Priority: extra
-Depends: libxine1-ffmpeg (= ${source:Version}), libxine1-misc-plugins (= ${source:Version})
+Depends: ${misc:Depends}, libxine1-ffmpeg (= ${source:Version}),