[abcde/el6: 15/15] Sync with current F19 (sans the rebuild bump)

[Dominik Mierzejewski]

commit 1b0f42a260bfc94a114f990f09059bb1c84f3249
Merge: 107bb91 7d404fe
Author: Dominik Mierzejewski <dominik at greysector.net>
Date:   Mon Mar 25 10:45:30 2013 +0100

    Sync with current F19 (sans the rebuild bump)
    
    Merge commit '7d404fe6a3d0750ad86cd99965483d6e8fbd2c60' into el6
    
    Conflicts:
    	.gitignore

 .gitignore                                         |    2 +-
 abcde-2.1.19-inst.patch                            |   21 ----
 abcde-2.3.99.7-speex-comment.patch                 |   16 ---
 abcde-2.3.99.7-trackinfo.patch                     |   13 ---
 ...3.99.8-config.patch => abcde-2.4.0-config.patch |   32 +++---
 abcde.spec                                         |  104 +++++++++++--------
 abcde_2.3.99.7-1ubuntu1.diff                       |   27 -----
 sources                                            |    2 +-
 8 files changed, 78 insertions(+), 139 deletions(-)
---
diff --cc .gitignore
index f3fd931,dafa321..73d135b
--- a/.gitignore
+++ b/.gitignore
@@@ -1,1 -1,1 +1,1 @@@
- abcde_2.3.99.8.orig.tar.gz
 -/*.tar.*
++/abcde-2.5.4.tar.gz