[SCM] drumgizmo/master: Merge conflicts

[viccuad-guest at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit 493172c3ad6519acce9d02dc73a1df3a4505b55c
Author: viccuad <me at viccuad.me>
Date:   Mon Nov 2 14:35:36 2015 +0100

    Merge conflicts
    
    Gbp-Dch: Ignore

diff --git a/debian/control b/debian/control
index 909dafe..cf9441a 100644
--- a/debian/control
+++ b/debian/control
@@ -4,34 +4,36 @@ Priority: optional
 Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 Uploaders: Víctor Cuadrado Juan <me at viccuad.me>
 Build-Depends:
+ autoconf,
+ automake,
  debhelper (>= 9),
  dh-autoreconf,
- automake,
- libtool,
- autoconf,
- pkg-config,
+ libao-dev,
+ libasound2-dev,
  libcppunit-dev,
+ libexpat1-dev,
+ libjack-dev,
+ liblilv-dev,
+ libserd-dev,
  libsmf-dev,
  libsndfile1-dev,
- libzita-resampler-dev,
- libexpat1-dev,
+ libtool,
  libx11-dev,
+ libzita-resampler-dev,
  lv2-dev,
- libasound2-dev,
- libao-dev,
- libjack-dev,
- libserd-dev,
- liblilv-dev
+ pkg-config
 Standards-Version: 3.9.6
 Homepage: http://www.drumgizmo.org
 Vcs-Git: git://anonscm.debian.org/pkg-multimedia/drumgizmo.git
-Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/drumgizmo.git/
-
+Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/drumgizmo.git
 
 Package: drumgizmo
-Provides: lv2-plugin
+Provides:
+ lv2-plugin
 Architecture: any
-Depends: ${shlibs:Depends}, ${misc:Depends}
+Depends:
+ ${misc:Depends},
+ ${shlibs:Depends}
 Description: Audio sampler plugin and stand-alone app that simulates a real drum kit
  DrumGizmo's main aim is to simulate a real drum kit. Features:
   - Stand-alone application, Lv2 plugin version available
diff --git a/debian/copyright b/debian/copyright
index 8c1cfdb..7c143c4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -6,7 +6,6 @@ Upstream-Contact:
  Jonas Suhr Cristensen <jsc at umbraculum.org>,
  Lars Muldjord <muldjordlars at gmail.com>
 
-
 Files: *
 Copyright: 2008-2015 the DrumGizmo Team
 License: GPL-3
@@ -25,14 +24,19 @@ License: GPL-3
  On Debian systems, the full text of the GNU General Public License
  version 3 can be found in the file /usr/share/common-licenses/GPL-3.
 
-Files: aclocal.m4 */Makefile.in */Makefile.am
+Files:
+ aclocal.m4
+ */Makefile.in
+ */Makefile.am
 Copyright: 1996-2013 Free Software Foundation
 License: permissive-aclocal
  This file is free software; the Free Software Foundation gives
  unlimited permission to copy and/or distribute it, with or without
  modifications, as long as this notice is preserved.
 
-Files: config.guess config.sub
+Files:
+ config.guess
+ config.sub
 Copyright: 1992-2014, Free Software Foundation, Inc.
 License: GPL-3+ with Autoconf exception
  This file is free software; you can redistribute it and/or modify it
@@ -88,7 +92,11 @@ License: permissive-configure
  This configure script is free software; the Free Software Foundation
  gives unlimited permission to copy, distribute and modify it.
 
-Files: depcomp test-driver compile missing
+Files:
+ depcomp
+ test-driver
+ compile
+ missing
 Copyright: 1999-2013 Free Software Foundation, Inc.
 License: GPL-2+ with Autoconf exception
  This file is free software; you can redistribute it and/or modify it
@@ -140,10 +148,6 @@ License: X11
  dealings in this Software without prior written authorization from the X
  Consortium.
 
-
-
-
-
 Files:
  src/nolocale.*
  test/lv2.cc
@@ -235,10 +239,6 @@ Files:
 Copyright: 2008 Bent Bisballe Nyeng
 License: GPL-2+
 
-
-
-
-
 Files: plugingui/directory.*
 Copyright: 2013 Jonas Suhr Christensen
 License: GPL-2+
@@ -273,7 +273,9 @@ Files: drumgizmo/drumgizmoc.h
 Copyright: 2015 Sergey 'Jin' Bostandzhyan
 License: GPL-2+
 
-Files: hugin/hugin.* hugin/hugin_util.h
+Files:
+ hugin/hugin.*
+ hugin/hugin_util.h
 Copyright: 2012 Bent Bisballe Nyeng
 License: GPL-2+
 
@@ -304,7 +306,6 @@ Copyright:
  2013 Jonas Suhr Cristensen
 License: GPL-2+
 
-
 Files:
  src/semaphore.*
 Copyright: 2005 Bent Bisballe Nyeng
diff --git a/debian/rules b/debian/rules
index afe2195..467001c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,6 +1,5 @@
 #!/usr/bin/make -f
 
-# see EXAMPLES in dpkg-buildflags(1) and read /usr/share/dpkg/*
 DPKG_EXPORT_BUILDFLAGS = 1
 include /usr/share/dpkg/default.mk
 
@@ -17,14 +16,16 @@ FLAGS += -ffast-math
 CFLAGS += $(FLAGS)
 CXXFLAGS += $(FLAGS)
 
-
 %:
 	dh $@ --parallel --with autoreconf
 
 override_dh_auto_configure:
 	# change --libdir to install lv2's .so where they correspond
-	dh_auto_configure -- --enable-lv2=yes --enable-cli=yes \
-		--enable-resampler --with-test=no \
+	dh_auto_configure -- \
+		--enable-lv2=yes \
+		--enable-cli=yes \
+		--enable-resampler \
+		--with-test=no \
 	    --libdir=/usr/lib/ \
 		$(CONFFLAGS)
 

-- 
drumgizmo packaging