[SCM] VLC media player packaging branch, experimental, updated. debian/1.1.2-1+exp1-18-g968f005

[bdrung-guest at users.alioth.debian.org]

The following commit has been merged in the experimental branch:
commit 15ba8b312dfd22571d432ee7e63efa49e57ece14
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Thu Aug 19 21:49:04 2010 +0200

    wrap-and-sort
    
    Git-Dch: ignore

diff --git a/debian/control b/debian/control
index 6c4e40b..e084042 100644
--- a/debian/control
+++ b/debian/control
@@ -22,7 +22,7 @@ Build-Depends: debhelper (>= 7.2.3~),
                libcaca-dev (>= 0.99.beta4),
                libcddb2-dev,
                libcdio-dev,
-               libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386], 
+               libdc1394-22-dev [!kfreebsd-i386 !kfreebsd-amd64 !hurd-i386],
                libdca-dev,
                libdirac-dev,
                libdvbpsi-dev | libdvbpsi5-dev,
@@ -78,11 +78,11 @@ Build-Depends: debhelper (>= 7.2.3~),
                libvorbis-dev,
                libx11-dev,
                libx11-xcb-dev,
-               libxcb1-dev,
                libxcb-keysyms1-dev,
                libxcb-randr0-dev,
                libxcb-shm0-dev,
                libxcb-xv0-dev,
+               libxcb1-dev,
                libxext-dev,
                libxml2-dev,
                libxpm-dev,
diff --git a/debian/copyright b/debian/copyright
index 82310ad..87062d8 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -515,4 +515,3 @@ The Creative Commons Attribution 2.5 Scotland license:
  |  given effect in a way that is compatible with the provisions of the
  |  Creative Commons generic licence, version 2.5, which has the same
  |  Licence Elements.
-
diff --git a/debian/libvlc-dev.install b/debian/libvlc-dev.install
index dfd67b6..20021ad 100644
--- a/debian/libvlc-dev.install
+++ b/debian/libvlc-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libvlc.so
+usr/include/vlc/*.h
 usr/lib/libvlc.a
+usr/lib/libvlc.so
 usr/lib/pkgconfig/libvlc.pc
-usr/include/vlc/*.h
diff --git a/debian/libvlccore-dev.install b/debian/libvlccore-dev.install
index 48f4435..16670ea 100644
--- a/debian/libvlccore-dev.install
+++ b/debian/libvlccore-dev.install
@@ -1,4 +1,4 @@
-usr/lib/libvlccore.so
+usr/include/vlc/plugins/*.h
 usr/lib/libvlccore.a
+usr/lib/libvlccore.so
 usr/lib/pkgconfig/vlc-plugin.pc
-usr/include/vlc/plugins/*.h
diff --git a/debian/vlc-data.install b/debian/vlc-data.install
index 9689906..0bd59ba 100644
--- a/debian/vlc-data.install
+++ b/debian/vlc-data.install
@@ -1,4 +1,4 @@
 usr/share/doc
+usr/share/icons
 usr/share/locale
 usr/share/vlc
-usr/share/icons
diff --git a/debian/vlc-nox.install b/debian/vlc-nox.install
index 38ddd70..3a29c16 100644
--- a/debian/vlc-nox.install
+++ b/debian/vlc-nox.install
@@ -100,13 +100,13 @@ usr/lib/vlc/plugins/misc/libxml_plugin.so
 usr/lib/vlc/plugins/misc/libxtag_plugin.so
 usr/lib/vlc/plugins/mux
 usr/lib/vlc/plugins/packetizer
-usr/lib/vlc/plugins/services_discovery/libsap_plugin.so
-usr/lib/vlc/plugins/services_discovery/libmtp_plugin.so
-usr/lib/vlc/plugins/services_discovery/libupnp_intel_plugin.so
 usr/lib/vlc/plugins/services_discovery/libbonjour_plugin.so
-usr/lib/vlc/plugins/services_discovery/libudev_plugin.so
-usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.so
 usr/lib/vlc/plugins/services_discovery/libmediadirs_plugin.so
+usr/lib/vlc/plugins/services_discovery/libmtp_plugin.so
+usr/lib/vlc/plugins/services_discovery/libpodcast_plugin.so
+usr/lib/vlc/plugins/services_discovery/libsap_plugin.so
+usr/lib/vlc/plugins/services_discovery/libudev_plugin.so
+usr/lib/vlc/plugins/services_discovery/libupnp_intel_plugin.so
 usr/lib/vlc/plugins/stream_filter
 usr/lib/vlc/plugins/stream_out
 usr/lib/vlc/plugins/video_chroma
diff --git a/debian/vlc-plugin-jack.install b/debian/vlc-plugin-jack.install
index f26ef32..c0edb4f 100644
--- a/debian/vlc-plugin-jack.install
+++ b/debian/vlc-plugin-jack.install
@@ -1,2 +1,2 @@
-usr/lib/vlc/plugins/audio_output/libjack_plugin.so
 usr/lib/vlc/plugins/access/libaccess_jack_plugin.so
+usr/lib/vlc/plugins/audio_output/libjack_plugin.so
diff --git a/debian/vlc.install b/debian/vlc.install
index f4fadb5..5e02644 100644
--- a/debian/vlc.install
+++ b/debian/vlc.install
@@ -10,8 +10,8 @@ usr/lib/vlc/plugins/misc/libxdg_screensaver_plugin.so
 usr/lib/vlc/plugins/services_discovery/libxcb_apps_plugin.so
 usr/lib/vlc/plugins/video_filter/libpanoramix_plugin.so
 usr/lib/vlc/plugins/video_output/libaa_plugin.so
-usr/lib/vlc/plugins/video_output/libxcb_window_plugin.so
 usr/lib/vlc/plugins/video_output/libxcb_glx_plugin.so
+usr/lib/vlc/plugins/video_output/libxcb_window_plugin.so
 usr/lib/vlc/plugins/video_output/libxcb_x11_plugin.so
 usr/lib/vlc/plugins/video_output/libxcb_xv_plugin.so
 usr/share/applications

-- 
VLC media player packaging