[SCM] UNNAMED PROJECT branch, master, updated. debian/1.2-11-6-ga99e13c

[tony mancill]

The following commit has been merged in the master branch:
commit 8615c07c7b263ae8105e879b74285f5a4d47738c
Author: tony mancill <tmancill at debian.org>
Date:   Thu Nov 10 21:05:22 2011 -0800

    swap order of libasound2-dev and liboss4-salsa-dev in build-depends

diff --git a/debian/changelog b/debian/changelog
index 06c5b39..a9d1290 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,7 +1,9 @@
-tuxguitar (1.2-12) UNRELEASED; urgency=low
+tuxguitar (1.2-12) unstable; urgency=low
 
   * Add xulrunner-8.0 to list of dependencies  (Closes: #647542)
   * Modify debian/rules for BuildArchTarget release goal.
+  * Swap order of libasound2-dev and liboss4-salsa-dev in
+    build depends.  (Closes: #648385)
 
  -- tony mancill <tmancill at debian.org>  Tue, 08 Nov 2011 12:22:10 -0800
 
diff --git a/debian/control b/debian/control
index 4f0d0e9..7dc4854 100644
--- a/debian/control
+++ b/debian/control
@@ -12,7 +12,7 @@ Build-Depends: debhelper (>= 7),
  default-jdk | java2-compiler,
  libswt-gtk-3-java,
  libitext-java,
- liboss4-salsa-dev | libasound2-dev,
+ libasound2-dev | liboss4-salsa-dev,
  libfluidsynth-dev
 Standards-Version: 3.9.2
 Homepage: http://www.tuxguitar.com.ar

-- 
UNNAMED PROJECT