[SCM] libgig/master: Install headers to include/libgig subdir.

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

The following commit has been merged in the master branch:
commit d521e00aadaee904c6e4cb0004b690ddb6df22e4
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sat Nov 26 16:39:58 2016 +0100

    Install headers to include/libgig subdir.

diff --git a/debian/patches/05-fix-include-dir.patch b/debian/patches/05-fix-include-dir.patch
index 6c7de64..764a548 100644
--- a/debian/patches/05-fix-include-dir.patch
+++ b/debian/patches/05-fix-include-dir.patch
@@ -7,81 +7,31 @@ Index: libgig/akai.pc.in
 ===================================================================
 --- libgig.orig/akai.pc.in
 +++ libgig/akai.pc.in
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,6 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
 -libdir=@libdir@/libgig
--includedir=@includedir@/libgig
 +libdir=@libdir@
-+includedir=@includedir@
+ includedir=@includedir@/libgig
  
  Name: akai
- Description: C++ library for accessing AKAI disk images
 Index: libgig/gig.pc.in
 ===================================================================
 --- libgig.orig/gig.pc.in
 +++ libgig/gig.pc.in
-@@ -1,7 +1,7 @@
+@@ -1,6 +1,6 @@
  prefix=@prefix@
  exec_prefix=@exec_prefix@
 -libdir=@libdir@/libgig
--includedir=@includedir@/libgig
 +libdir=@libdir@
-+includedir=@includedir@
+ includedir=@includedir@/libgig
  
  Name: gig
- Description: C++ library for accessing Gigasampler/GigaStudio, DLS, SoundFont and KORG sound files
-Index: libgig/src/Makefile.am
-===================================================================
---- libgig.orig/src/Makefile.am
-+++ libgig/src/Makefile.am
-@@ -1,9 +1,9 @@
- # to prevent compile errors on some systems
- AM_CXXFLAGS = -pedantic -Wreturn-type
- 
--pkglib_LTLIBRARIES = libgig.la libakai.la
-+lib_LTLIBRARIES = libgig.la libakai.la
- 
--libgigincludedir = $(includedir)/libgig
-+libgigincludedir = $(includedir)
- libgiginclude_HEADERS = RIFF.h DLS.h SF.h gig.h Korg.h
- libgig_la_SOURCES = RIFF.cpp DLS.cpp SF.cpp gig.cpp Korg.cpp
- libgig_la_LDFLAGS = -no-undefined -version-info @LIBGIG_SHARED_VERSION_INFO@ @LIBGIG_SHLIB_VERSION_ARG@
-@@ -14,7 +14,7 @@ if MAC
- libgig_la_LDFLAGS += -framework CoreFoundation
- endif
- 
--libakaiincludedir = $(includedir)/libgig
-+libakaiincludedir = $(includedir)
- libakaiinclude_HEADERS = Akai.h
- libakai_la_SOURCES = Akai.cpp
- libakai_la_LDFLAGS = -no-undefined -version-info @LIBAKAI_SHARED_VERSION_INFO@ @LIBAKAI_SHLIB_VERSION_ARG@
-Index: libgig/src/Makefile.in
-===================================================================
---- libgig.orig/src/Makefile.in
-+++ libgig/src/Makefile.in
-@@ -385,14 +385,14 @@ top_srcdir = @top_srcdir@
- # to prevent compile errors on some systems
- AM_CXXFLAGS = -pedantic -Wreturn-type
- pkglib_LTLIBRARIES = libgig.la libakai.la
--libgigincludedir = $(includedir)/libgig
-+libgigincludedir = $(includedir)
- libgiginclude_HEADERS = RIFF.h DLS.h SF.h gig.h Korg.h
- libgig_la_SOURCES = RIFF.cpp DLS.cpp SF.cpp gig.cpp Korg.cpp
- libgig_la_LDFLAGS = -no-undefined -version-info \
- 	@LIBGIG_SHARED_VERSION_INFO@ @LIBGIG_SHLIB_VERSION_ARG@ \
- 	$(am__append_1)
- @WIN32_TRUE at libgig_la_LIBADD = -lrpcrt4
--libakaiincludedir = $(includedir)/libgig
-+libakaiincludedir = $(includedir)
- libakaiinclude_HEADERS = Akai.h
- libakai_la_SOURCES = Akai.cpp
- libakai_la_LDFLAGS = -no-undefined -version-info \
 Index: libgig/libgig.spec.in
 ===================================================================
 --- libgig.orig/libgig.spec.in
 +++ libgig/libgig.spec.in
-@@ -80,20 +80,20 @@ if [ -d $RPM_BUILD_ROOT ]; then rm -rf $
+@@ -80,18 +80,18 @@ if [ -d $RPM_BUILD_ROOT ]; then rm -rf $
  %defattr(-,root,root)
  %doc AUTHORS COPYING ChangeLog NEWS README TODO
  %{prefix}/bin/*
@@ -104,8 +54,18 @@ Index: libgig/libgig.spec.in
 +%{prefix}/lib/libakai.a
 +%{prefix}/lib/libakai.la
  %{prefix}/lib/pkgconfig/akai.pc
--%{prefix}/include/libgig/*
-+%{prefix}/include/*
+ %{prefix}/include/libgig/*
  
- %changelog
- * Tue Jul 14 2015 Christian Schoenebeck <cuse at users.sourceforge.net>
+Index: libgig/src/Makefile.am
+===================================================================
+--- libgig.orig/src/Makefile.am
++++ libgig/src/Makefile.am
+@@ -1,7 +1,7 @@
+ # to prevent compile errors on some systems
+ AM_CXXFLAGS = -pedantic -Wreturn-type
+ 
+-pkglib_LTLIBRARIES = libgig.la libakai.la
++lib_LTLIBRARIES = libgig.la libakai.la
+ 
+ libgigincludedir = $(includedir)/libgig
+ libgiginclude_HEADERS = RIFF.h DLS.h SF.h gig.h Korg.h

-- 
libgig packaging