[SCM] libgig/master: Refresh patchset

alessio at users.alioth.debian.org alessio at users.alioth.debian.org
Sat Sep 3 17:00:22 UTC 2016 

The following commit has been merged in the master branch:
commit c603466ee1cd108b880a8cfc111d1d1c35941c9f
Author: Alessio Treglia <alessio at debian.org>
Date:   Sat Sep 3 17:51:15 2016 +0100

    Refresh patchset

diff --git a/debian/patches/01-Makefile.patch b/debian/patches/01-Makefile.patch
index 25fc5c3..4b7b4b9 100644
--- a/debian/patches/01-Makefile.patch
+++ b/debian/patches/01-Makefile.patch
@@ -1,14 +1,13 @@
 Description: Skip debian directory.
 Author: Alessio Treglia <quadrispro at ubuntu.com>
 ---
- Makefile.am  |    2 +-
- Makefile.in  |    2 +-
- configure    |    2 +-
- configure.in |    1 -
- 4 files changed, 3 insertions(+), 4 deletions(-)
+ Makefile.am |    2 +-
+ Makefile.in |    2 +-
+ configure   |    3 +--
+ 3 files changed, 3 insertions(+), 4 deletions(-)
 
---- libgig-3.3.0.orig/Makefile.am
-+++ libgig-3.3.0/Makefile.am
+--- libgig.orig/Makefile.am
++++ libgig/Makefile.am
 @@ -1,7 +1,7 @@
  # require automake >= 1.5 (mandatory for option dist-bzip2)
  AUTOMAKE_OPTIONS = 1.5 dist-bzip2
@@ -18,9 +17,9 @@ Author: Alessio Treglia <quadrispro at ubuntu.com>
  
  # to prevent compile errors on some systems
  AM_CXXFLAGS = -pedantic
---- libgig-3.3.0.orig/Makefile.in
-+++ libgig-3.3.0/Makefile.in
-@@ -198,7 +198,7 @@ target_alias = @target_alias@
+--- libgig.orig/Makefile.in
++++ libgig/Makefile.in
+@@ -364,7 +364,7 @@ top_srcdir = @top_srcdir@
  
  # require automake >= 1.5 (mandatory for option dist-bzip2)
  AUTOMAKE_OPTIONS = 1.5 dist-bzip2
@@ -29,24 +28,22 @@ Author: Alessio Treglia <quadrispro at ubuntu.com>
  
  # to prevent compile errors on some systems
  AM_CXXFLAGS = -pedantic
---- libgig-3.3.0.orig/configure
-+++ libgig-3.3.0/configure
-@@ -20964,7 +20964,7 @@ fi
+--- libgig.orig/configure
++++ libgig/configure
+@@ -16314,7 +16314,7 @@ END
+ fi
  
  
- 
--ac_config_files="$ac_config_files Doxyfile gig.pc libgig.spec Makefile src/Makefile src/testcases/Makefile doc/Makefile man/Makefile man/dlsdump.1 man/gigdump.1 man/gigextract.1 man/rifftree.1 debian/Makefile osx/Makefile osx/libgig.xcodeproj/Makefile win32/Makefile win32/libgig.dev"
-+ac_config_files="$ac_config_files Doxyfile gig.pc libgig.spec Makefile src/Makefile src/testcases/Makefile doc/Makefile man/Makefile man/dlsdump.1 man/gigdump.1 man/gigextract.1 man/rifftree.1 osx/Makefile osx/libgig.xcodeproj/Makefile win32/Makefile win32/libgig.dev"
+-ac_config_files="$ac_config_files Doxyfile gig.pc akai.pc libgig.spec Makefile src/Makefile src/testcases/Makefile src/tools/Makefile doc/Makefile man/Makefile man/dlsdump.1 man/gigdump.1 man/gigextract.1 man/gigmerge.1 man/gig2mono.1 man/gig2stereo.1 man/rifftree.1 man/sf2dump.1 man/sf2extract.1 man/korgdump.1 man/korg2gig.1 man/akaidump.1 man/akaiextract.1 debian/Makefile osx/Makefile osx/libgig.xcodeproj/Makefile win32/Makefile win32/libgig.dev"
++ac_config_files="$ac_config_files Doxyfile gig.pc akai.pc libgig.spec Makefile src/Makefile src/testcases/Makefile src/tools/Makefile doc/Makefile man/Makefile man/dlsdump.1 man/gigdump.1 man/gigextract.1 man/gigmerge.1 man/gig2mono.1 man/gig2stereo.1 man/rifftree.1 man/sf2dump.1 man/sf2extract.1 man/korgdump.1 man/korg2gig.1 man/akaidump.1 man/akaiextract.1 osx/Makefile osx/libgig.xcodeproj/Makefile win32/Makefile win32/libgig.dev"
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
---- libgig-3.3.0.orig/configure.in
-+++ libgig-3.3.0/configure.in
-@@ -107,7 +107,6 @@ AC_OUTPUT( \
-     man/gigdump.1 \
-     man/gigextract.1 \
-     man/rifftree.1 \
--    debian/Makefile \
-     osx/Makefile \
-     osx/libgig.xcodeproj/Makefile \
-     win32/Makefile \
+@@ -17461,7 +17461,6 @@ do
+     "man/korg2gig.1") CONFIG_FILES="$CONFIG_FILES man/korg2gig.1" ;;
+     "man/akaidump.1") CONFIG_FILES="$CONFIG_FILES man/akaidump.1" ;;
+     "man/akaiextract.1") CONFIG_FILES="$CONFIG_FILES man/akaiextract.1" ;;
+-    "debian/Makefile") CONFIG_FILES="$CONFIG_FILES debian/Makefile" ;;
+     "osx/Makefile") CONFIG_FILES="$CONFIG_FILES osx/Makefile" ;;
+     "osx/libgig.xcodeproj/Makefile") CONFIG_FILES="$CONFIG_FILES osx/libgig.xcodeproj/Makefile" ;;
+     "win32/Makefile") CONFIG_FILES="$CONFIG_FILES win32/Makefile" ;;
diff --git a/debian/patches/02-manpages.patch b/debian/patches/02-manpages.patch
index 97397d0..3ebe920 100644
--- a/debian/patches/02-manpages.patch
+++ b/debian/patches/02-manpages.patch
@@ -4,11 +4,10 @@ Description: Don't use hyphen as minus sign.
  man/dlsdump.1.in    |    2 +-
  man/gigdump.1.in    |    2 +-
  man/gigextract.1.in |    2 +-
- man/rifftree.1.in   |    2 +-
- 4 files changed, 4 insertions(+), 4 deletions(-)
+ 3 files changed, 3 insertions(+), 3 deletions(-)
 
---- libgig-3.3.0.orig/man/dlsdump.1.in
-+++ libgig-3.3.0/man/dlsdump.1.in
+--- libgig.orig/man/dlsdump.1.in
++++ libgig/man/dlsdump.1.in
 @@ -3,7 +3,7 @@
  dlsdump \- List informations about a DLS (Downloadable Sound) file.
  .SH SYNOPSIS
@@ -18,8 +17,8 @@ Description: Don't use hyphen as minus sign.
  .SH DESCRIPTION
  Prints out a list of all available samples and instruments within a DLS file along with detailed informations about their properties and settings. At the moment DLS Level 1 and 2 is supported.
  .SH OPTIONS
---- libgig-3.3.0.orig/man/gigdump.1.in
-+++ libgig-3.3.0/man/gigdump.1.in
+--- libgig.orig/man/gigdump.1.in
++++ libgig/man/gigdump.1.in
 @@ -3,7 +3,7 @@
  gigdump \- List informations about a Gigasampler (.gig) file.
  .SH SYNOPSIS
@@ -29,8 +28,8 @@ Description: Don't use hyphen as minus sign.
  .SH DESCRIPTION
  Prints out a list of all available samples and instruments within a Gigasampler (.gig) file along with detailed informations about their properties and settings.
  .SH OPTIONS
---- libgig-3.3.0.orig/man/gigextract.1.in
-+++ libgig-3.3.0/man/gigextract.1.in
+--- libgig.orig/man/gigextract.1.in
++++ libgig/man/gigextract.1.in
 @@ -3,7 +3,7 @@
  gigextract \- Extract samples from Gigasampler (.gig) files.
  .SH SYNOPSIS
@@ -38,16 +37,5 @@ Description: Don't use hyphen as minus sign.
 -[ -v ] GIGFILE DESTDIR [SAMPLENR] [ [SAMPLENR] ... ]
 +[ \-v ] GIGFILE DESTDIR [SAMPLENR] [ [SAMPLENR] ... ]
  .SH DESCRIPTION
- Extract samples from Gigasampler (.gig) files. All extracted samples will be written in .wav format. You must at least supply name of the .gig input file and an output path where all extracted samples should be written to. By default gigextract extracts all samples contained in the Gigasampler file, even if they are not linked by any instrument in the .gig file, but you can also extract only particular samples by supplying a list of samples indices at the end of the command line. You can use the gigdump tool to see the list of available samples and their sample indices of a Gigasampler file.
- .SH OPTIONS
---- libgig-3.3.0.orig/man/rifftree.1.in
-+++ libgig-3.3.0/man/rifftree.1.in
-@@ -3,7 +3,7 @@
- rifftree \- Print RIFF tree structure of an arbitrary RIFF file.
- .SH SYNOPSIS
- .B rifftree
--[ -s | -v ] RIFFFILE
-+[ \-s | \-v ] RIFFFILE
- .SH DESCRIPTION
- Print RIFF tree structure of an arbitrary RIFF file. RIFF is a simple, binary file format intended for tree like data structures. Many proprietary file formats are built on top of the RIFF format (e.g. media file formats like WAV, AVI, DLS, GIG). Data in a RIFF file is encapsulated into so called "chunks". There are list chunks which can be seen as nodes in the data tree and thus can have childs (that is can have subchunks) and there are normal chunks which can be seen as leafs in the data tree and thus cannot have childs.
- .SH OPTIONS
+ Extract samples from Gigasampler (.gig) files. All extracted samples will be
+ written in .wav format. You must at least supply name of the .gig input file and
diff --git a/debian/patches/03-deletechuncklist.patch b/debian/patches/03-deletechuncklist.patch
index 9f5dc08..a7df631 100644
--- a/debian/patches/03-deletechuncklist.patch
+++ b/debian/patches/03-deletechuncklist.patch
@@ -1,8 +1,10 @@
-diff --git a/src/RIFF.cpp b/src/RIFF.cpp
-index b92988c..883c145 100644
---- a/src/RIFF.cpp
-+++ b/src/RIFF.cpp
-@@ -956,13 +956,7 @@ namespace RIFF {
+---
+ src/RIFF.cpp |    8 +-------
+ 1 file changed, 1 insertion(+), 7 deletions(-)
+
+--- libgig.orig/src/RIFF.cpp
++++ libgig/src/RIFF.cpp
+@@ -997,13 +997,7 @@ namespace RIFF {
  
      void List::DeleteChunkList() {
          if (pSubChunks) {

-- 
libgig packaging

More information about the pkg-multimedia-commits mailing list