[SCM] lash packaging branch, master-experimental, updated. debian/0.5.4.0-2-9-g462c412

[js at users.alioth.debian.org]

The following commit has been merged in the master-experimental branch:
commit 462c412cf318825282fc2319cdb50366dedc039e
Merge: 4ad27f7322beedae1de93f72bb32618339d2e261 f38dd047bbaeddaa18bd9a29fde30c8e357760aa
Author: Jonas Smedegaard <dr at jones.dk>
Date:   Sat May 15 12:34:50 2010 +0200

    Merge branch 'master' into master-experimental
    
    Conflicts (changes merged):
    	debian/changelog

diff --combined debian/changelog
index f1fcc88,a9e5d79..49cb1a6
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,13 -1,11 +1,17 @@@
 +lash (0.6.0~rc2-1) UNRELEASED; urgency=low
 +
-   [ Jonas Smedegaard ]
-   * Tidy copyright file: Fix syntax error in DEB5 file listing.
- 
-   [ Alessio Treglia ]
 +  * New upstream release (Closes: #563489).
 +
 + -- Alessio Treglia <quadrispro at ubuntu.com>  Sat, 08 May 2010 12:49:52 +0200
 +
+ lash (0.5.4.0-2) unstable; urgency=low
+ 
+   * Tidy copyright file: Fix syntax error in DEB5 file listing.
+   * Avoid ALSA on non-linux archs.
+     Closes: bug#581672, thanks to Jakub Wilk.
+ 
+  -- Jonas Smedegaard <dr at jones.dk>  Sat, 15 May 2010 12:17:36 +0200
+ 
  lash (0.5.4.0-1) unstable; urgency=low
  
    * Rerelease using pristine tarball (not tarball-in-tarball).

-- 
lash packaging