[SCM] libgig/master: Merge tag 'upstream/4.0.0'

Sat Sep 3 17:00:20 UTC 2016

Imported Upstream version 4.0.0
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
X-Git-Refname: refs/heads/master
X-Git-Reftype: branch
X-Git-Oldrev: c84231c1689e71d919b2bc7f100da8f382de1036
X-Git-Newrev: c603466ee1cd108b880a8cfc111d1d1c35941c9f

The following commit has been merged in the master branch:
commit beb2307d8f339d8ad4ffd69ff289eab58a8f22ba
Merge: c37639dd9dde37228d3a4db176bd162e4a1a36ff 8a493a05e7d74331b5a5c7073b5ea4edf30be064
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Sep 3 14:00:32 2016 +0100

    Merge tag 'upstream/4.0.0'
    
    Upstream version 4.0.0

diff --combined debian/control
index b8b0835,56f5f24..6c33217

--- a/debian/control
+++ b/debian/control
@@@ -1,80 -1,96 +1,101 @@@
  Source: libgig
  Section: devel
  Priority: optional
 -Maintainer: Matt Flax <flatmax at pgb.unsw.edu.au>
 -Build-Depends: debhelper (>= 4.0.0), pkg-config, libsndfile1-dev, doxygen, uuid-dev
 -Standards-Version: 3.7.2
 +Maintainer: Debian Multimedia Maintainers <pkg-multimedia-maintainers at lists.alioth.debian.org>
 +Uploaders: Paul Brossier <piem at debian.org>,
 + Free Ekanayaka <freee at debian.org>,
 + Alessio Treglia <alessio at debian.org>
 +Build-Depends: debhelper (>= 9),
 + dh-autoreconf,
 + g++ (>= 4:5.1.1-20),
 + pkg-config,
 + libsndfile1-dev,
 + doxygen,
 + libtool,
 + uuid-dev,
 + automake
 +Standards-Version: 3.9.6
 +Homepage: http://www.linuxsampler.org/libgig/
 +Vcs-Git: git://anonscm.debian.org/pkg-multimedia/libgig.git
 +Vcs-Browser: https://anonscm.debian.org/cgit/pkg-multimedia/libgig.git
  
  Package: libgig-dev
  Section: libdevel
  Architecture: any
- Depends: libgig6v5 (= ${binary:Version}),
 -Depends: libgig7 (= ${Source-Version})
 -Description: library for accessing Gigasampler, DLS, SoundFont, KORG, AKAI files
 - libgig is a C++ library for reading, modifying and creating Gigasampler /
 - GigaStudio (.gig) files, DLS (Downloadable Sounds) Level 1/2 files, SoundFont
 - version 2 (.sf2) and KORG sound files (.KMP and .KSF). These files are
 - typically used in modern day audio waveform samplers and synthesizer keyboards.
++Depends: libgig7v5 (= ${binary:Version}),
 + ${misc:Depends}
 +Description: development files for libgig
 + libgig is a C++ library for loading, modifying and creating Gigasampler
 + files and DLS (Downloadable Sounds) Level 1/2 files.
   .
-  This package contains the header files needed for
-  development with libgig. You will need this only if you
-  intend to compile programs that use this library.
 - Since the Gigasampler / GigaStudio and DLS formats are based ontop of the
 - binary RIFF container format, this library also provides convenient access to
 - RIFF files in general.
++ Since the Gigasampler / GigaStudio and DLS formats are based ontop
++ of the binary RIFF container format, this library also provides
++ convenient access to RIFF files in general.
+  .
 - This package also contains a Linux/POSIX ported version of libakai, which
 - provides support for reading Akai formated medias (CDRoms, HDs, Zip disks).
++ This package also contains a Linux/POSIX ported version of libakai,
++ which provides support for reading Akai formated medias (CDRoms, HDs,
++ Zip disks).
+  Currently Akai S1000, S01, S2000 and S3000 series are supported.
+  .
 - For more information visit
 - http://www.linuxsampler.org/libgig/
 - .
 - This package contains the header files needed for development with libgig.
 - You will need this only if you intend to compile programs that use this
 - library.
++ This package contains the header files needed for development with
++ libgig. You will need this only if you intend to compile programs
++ that use this library.
  
- Package: libgig6v5
 -Package: libgig7
++Package: libgig7v5
  Section: libs
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}
 -Conflicts: libgig6, libgig3c2, libgig
 -Replaces: libgig6, libgig3c2, libgig
 -Description: library for accessing Gigasampler, DLS, SoundFont, KORG, AKAI files
 - libgig is a C++ library for reading, modifying and creating Gigasampler /
 - GigaStudio (.gig) files, DLS (Downloadable Sounds) Level 1/2 files, SoundFont
 - version 2 (.sf2) files and KORG sound files (.KMP and .KSF). These files are
 - typically used in modern day audio waveform samplers and synthesizer keyboards.
 - .
 - Since the Gigasampler / GigaStudio and DLS formats are based ontop of the
 - binary RIFF container format, this library also provides convenient access to
 - RIFF files in general.
 +Multi-Arch: same
 +Depends: ${shlibs:Depends},
 + ${misc:Depends}
 +Breaks: libgig6
 +Replaces: libgig6
 +Description: library for loading and modifying Gigasampler and DLS files
 + libgig is a C++ library for loading, modifying and creating Gigasampler
 + files and DLS (Downloadable Sounds) Level 1/2 files.
   .
 - This package also contains a Linux/POSIX ported version of libakai, which
 - provides support for reading Akai formated medias (CDRoms, HDs, Zip disks).
 - Currently Akai S1000, S01, S2000 and S3000 series are supported.
 - .
 - For more information visit
 - http://www.linuxsampler.org/libgig/
 + This package contains the shared library files.
  
  Package: gigtools
  Section: utils
  Architecture: any
 -Depends: ${shlibs:Depends}, ${misc:Depends}
 -Description: command line tools for Gigasampler, SF2, DLS, KORG and AKAI files
 - Raw file handling for audio sampler files based on either DLS Level 1/2,
 - Gigasampler / GigaStudio, SoundFont version 2 and KORG sound format (.KSF and
 - .KMP). These files are typically used in modern day audio waveform samplers
 - and synthesizer keyboards.
 - .
 - There are also tools for reading Akai formated medias (CDRoms, HDs, Zip disks).
 - Currently Akai S1000, S01, S2000 and S3000 series are supported.
 - .
 +Depends: ${shlibs:Depends},
 + ${misc:Depends}
 +Description: command line tools for Gigasampler and DLS Level 1/2 files
 + Raw file handling for audio sampler files based on DLS Level 1/2 and
 + Gigasampler.
 + These files are typically used in modern day audio waveform samplers.
   This package contains the following command line tools:
   .
   gigdump:
     Prints out the content of a .gig file.
   gigextract:
 -   Extracts audio samples from a .gig file.
 - gigmerge:
 -   Combines multiple .gig files to one .gig file.
 - gig2mono:
 -   Converts .gig files from stereo to mono.
 - gig2stereo:
 -   Converts .gig files to true interleaved stereo sounds.
 +   Extracts samples from a .gig file.
   dlsdump:
     Prints out the content of a DLS file.
   rifftree:
-    Prints out the RIFF tree of an arbitrary RIFF file.
+    Prints out the RIFF tree of an arbitrary RIFF container file.
+  sf2dump:
+    Prints out the content of a .sf2 file.
+  sf2extract:
+    Extracts audio samples from a .sf2 file.
+  korgdump:
+    Prints out the content of KORG sound files (.KSF, .KMP).
+  korg2gig:
+    Converts KORG (.KSF, .KMP) sound files to GigaStudio (.gig) files.
+  akaidump:
+    Dump an AKAI media i.e. from a CDROM drive as disk image file to your HD.
+  akaiextract:
+    Extracts audio samples from an AKAI media or from an AKAI disk image file.
 +
 +Package: libgig-doc
 +Section: doc
 +Architecture: all
 +Depends: ${misc:Depends}, libjs-jquery
 +Replaces: libgig-dev (<< 3.3.0-1)
 +Breaks: libgig-dev (<< 3.3.0-1)
 +Description: HTML documentation for libgig
 + libgig is a C++ library for loading, modifying and creating Gigasampler
 + files and DLS (Downloadable Sounds) Level 1/2 files.
 + .
 + This package contains exhaustive HTML documentation for the development with
 + libgig.
diff --combined debian/libgig-dev.docs
index f17fbb0,c6dcfc3..e3df34f
--- a/debian/libgig-dev.docs
+++ b/debian/libgig-dev.docs
@@@ -1,4 -1,4 +1,5 @@@
  README
  TODO
  AUTHORS
 -NEWS
 +ChangeLog
++NEWS

-- 
libgig packaging

