[SCM] UNNAMED PROJECT branch, master, updated. debian/1.2-10-1-g4972120

[tony mancill]

The following commit has been merged in the master branch:
commit 49721203358167587231a97fcaf406629874e657
Author: tony mancill <tmancill at debian.org>
Date:   Mon Oct 31 07:37:49 2011 -0700

    add liboss4-salsa-dev to help with building on kfreebsd

diff --git a/debian/changelog b/debian/changelog
index 1b904a5..195d33e 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+tuxguitar (1.2-11) unstable; urgency=low
+
+  * Reorder build depends to address kfreebsd build problem.
+
+ -- tony mancill <tmancill at debian.org>  Mon, 31 Oct 2011 07:33:41 -0700
+
 tuxguitar (1.2-10) unstable; urgency=low
 
   * debian/control:
diff --git a/debian/control b/debian/control
index e8d04f8..d235120 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,17 @@ Section: sound
 Priority: optional
 Maintainer: Philippe Coval <rzr at gna.org>
 Uploaders: tony mancill <tmancill at debian.org>
-Build-Depends: debhelper (>= 7), docbook-to-man, docbook-utils, quilt, ant, gcj-jdk, default-jdk | java2-compiler, libswt-gtk-3-java, libitext-java, libasound2-dev, libfluidsynth-dev
+Build-Depends: debhelper (>= 7),
+ docbook-to-man,
+ docbook-utils,
+ quilt,
+ ant,
+ gcj-jdk,
+ default-jdk | java2-compiler,
+ libswt-gtk-3-java,
+ libitext-java,
+ liboss4-salsa-dev | libasound2-dev,
+ libfluidsynth-dev
 Standards-Version: 3.9.2
 Homepage: http://www.tuxguitar.com.ar
 Vcs-Git: git://git.debian.org/git/pkg-java/tuxguitar.git

-- 
UNNAMED PROJECT