[SCM] VLC media player packaging branch, karmic, updated. debian/1.0.1-1ubuntu1-18-g0360b97

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

The following commit has been merged in the karmic branch:
commit 0360b970dd5237fb7d7cee78955ca5ba3ca0a1f0
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Wed Sep 9 10:26:02 2009 +0200

    update debian/changelog

diff --git a/debian/changelog b/debian/changelog
index 5d16637..36e1e8b 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+vlc (1.0.1-2ubuntu1) karmic; urgency=low
+
+  * Merge from Debian unstable (LP: #426693), remaining changes:
+    - build against xulrunner-dev instead of iceape-dev
+    - build against libx264-dev and install libx264 plugin
+    - add Xb-Npp header to vlc package
+  * Recommend vlc-plugin-pulse for vlc, so that pulse can be used as default
+    output.
+
+ -- Benjamin Drung <bdrung at ubuntu.com>  Wed, 09 Sep 2009 10:24:09 +0200
+
 vlc (1.0.1-2) unstable; urgency=low
 
   * Fix typo in debian/changelog

-- 
VLC media player packaging