[SCM] gigedit packaging branch, master, updated. upstream/0.2.0-22-ge1b010d

[alessio at users.alioth.debian.org]

The following commit has been merged in the master branch:
commit e1b010df76b82ca1110c30658211038f731fa95c
Merge: acacce1302021508cd0a18b1e43de6460d9924c9 4c82ef9ac3a28446c6fca07f43715d4dfab4c96d
Author: Alessio Treglia <alessio at debian.org>
Date:   Tue Aug 17 00:56:08 2010 +0200

    Fix merge conflicts.

diff --combined debian/control
index f44cf45,99ad884..f44cf45
mode 100644,100755..100755
--- a/debian/control
+++ b/debian/control
@@@ -1,33 -1,20 +1,33 @@@
  Source: gigedit
  Section: sound
  Priority: optional
 -Maintainer: Christian Schoenebeck <cuse at users.sf.net>
 -Build-Depends: debhelper (>= 4.0.0), pkg-config, intltool, libgtkmm-2.4-dev, libsndfile1-dev, xsltproc, docbook-xsl
 -Standards-Version: 3.6.1
 +Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Uploaders: Free Ekanayaka <freee at debian.org>,
 + Alessio Treglia <alessio at debian.org>,
 + Christian Schoenebeck <cuse at users.sf.net>
 +Build-Depends: debhelper (>= 7.0.50~),
 + automake,
 + autotools-dev (>= 20100122.1~),
 + pkg-config,
 + intltool,
 + libgtkmm-2.4-dev,
 + libsndfile1-dev,
 + xsltproc,
 + docbook-xsl,
 + libgig-dev,
 + uuid-dev
 +Standards-Version: 3.9.1
 +Homepage: http://www.linuxsampler.org/
 +Vcs-Git: git://git.debian.org/pkg-multimedia/gigedit.git
 +Vcs-Browser: http://git.debian.org/?p=pkg-multimedia/gigedit.git
  
  Package: gigedit
 -Section: sound
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}
 +Depends: ${shlibs:Depends},
 + ${misc:Depends}
  Description: instrument editor for Gigasampler files
   gigedit is an instrument editor allowing to modify existing Gigasampler
   files, as well as creating new ones from scratch. The GUI is based on
   the GTK+ (gtkmm) toolkit. Even though it is created as a subproject of
   the LinuxSampler project, it is currently a completely independent
   stand-alone editor.
 - .
 - For more information visit
 - http://www.linuxsampler.org

-- 
gigedit packaging