[SCM] omins/master: Merge branch 'master' into merge

[alessio at users.alioth.debian.org]

wrap and sort
Use dh-autoreconf instead of autotools-dev to fix FTBFS on ppc64el.
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: 1da1bfef81f8eb072bb0d2cefc7559413a48e4f8
X-Git-Newrev: 40f98d776a519ea71b8f38e2d6f86e790f7d0550

The following commit has been merged in the master branch:
commit 40f98d776a519ea71b8f38e2d6f86e790f7d0550
Merge: b67877234c901535df8524a8ac308c939352c8cd 1da1bfef81f8eb072bb0d2cefc7559413a48e4f8
Author: Alessio Treglia <alessio at debian.org>
Date:   Wed Dec 10 23:12:40 2014 +0000

    Merge branch 'master' into merge
    
    Conflicts:
    	debian/control

diff --combined debian/control
index 53d02b5,041b2f8..5fd470e
--- a/debian/control
+++ b/debian/control
@@@ -2,10 -2,13 +2,10 @@@ Source: omin
  Section: sound
  Priority: optional
  Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 -Uploaders:
 - Joost Yervante Damad <andete at debian.org>,
 - Free Ekanayaka <freee at debian.org>
 -Build-Depends:
 - debhelper (>= 7.0.50~),
 +Uploaders: Free Ekanayaka <freee at debian.org>
 +Build-Depends: debhelper (>= 7.0.50~),
-  ladspa-sdk,
-  autotools-dev (>= 20100122.1~)
+  dh-autoreconf,
+  ladspa-sdk
  Standards-Version: 3.9.2
  Vcs-Git: git://git.debian.org/git/pkg-multimedia/omins.git
  Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/omins.git
@@@ -13,9 -16,11 +13,11 @@@ Homepage: http://www.nongnu.org/om-synt
  
  Package: omins
  Architecture: any
- Depends: ${shlibs:Depends},
-  ${misc:Depends}
- Provides: ladspa-plugin
+ Depends:
+  ${misc:Depends},
+  ${shlibs:Depends}
+ Provides:
+  ladspa-plugin
  Description: collection of LADSPA plugins aimed at modular synthesizers
   These plugins are provided:
    - Range translator

-- 
omins packaging