[SCM] VLC media player packaging branch, maverick, updated. debian/1.0.6-1ubuntu1-90-g0a3a878

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

The following commit has been merged in the maverick branch:
commit 0a3a878196d3a4ebb966dbbc247ac74a415d5bb5
Author: Benjamin Drung <bdrung at ubuntu.com>
Date:   Fri Jun 25 01:10:51 2010 +0200

    Changelog for vlc 1.1.0-1ubuntu1.

diff --git a/debian/changelog b/debian/changelog
index ba13e34..dc011d2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,11 +1,13 @@
-vlc (1.1.0-1ubuntu1) UNRELEASED; urgency=low
+vlc (1.1.0-1ubuntu1) maverick; urgency=low
 
   * Merge from Debian unstable, remaining changes:
     - build and install the libx264 plugin
     - add Xb-Npp header to vlc package
     - Add apport hook to include more vlc dependencies in bug reports
+  * Drop xulrunner patches.
+  * Drop 502_xulrunner_191.diff.
 
- -- Benjamin Drung <bdrung at ubuntu.com>  Fri, 25 Jun 2010 00:19:19 +0200
+ -- Benjamin Drung <bdrung at ubuntu.com>  Fri, 25 Jun 2010 01:09:16 +0200
 
 vlc (1.1.0-1) unstable; urgency=low
 

-- 
VLC media player packaging