[SCM] libgig/master: Not patch Makefile.in and configure file.

mira-guest at users.alioth.debian.org mira-guest at users.alioth.debian.org
Thu Dec 1 01:09:09 UTC 2016


The following commit has been merged in the master branch:
commit bf705b419d7a90cb9cdd4601a343051cb30ea35c
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Thu Dec 1 01:35:28 2016 +0100

    Not patch Makefile.in and configure file.

diff --git a/debian/patches/01-Makefile.patch b/debian/patches/01-Makefile.patch
index 0ce8ba8..1d4ef52 100644
--- a/debian/patches/01-Makefile.patch
+++ b/debian/patches/01-Makefile.patch
@@ -20,40 +20,7 @@ Index: libgig/Makefile.am
  
  # to prevent compile errors on some systems
  AM_CXXFLAGS = -pedantic
-Index: libgig/Makefile.in
-===================================================================
---- 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
--SUBDIRS = doc man src debian win32 osx
-+SUBDIRS = doc man src win32 osx
- 
- # to prevent compile errors on some systems
- AM_CXXFLAGS = -pedantic
-Index: libgig/configure
-===================================================================
---- libgig.orig/configure
-+++ libgig/configure
-@@ -16314,7 +16314,7 @@ END
- fi
- 
- 
--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
-@@ -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" ;;
+
 Index: libgig/configure.ac
 ===================================================================
 --- libgig.orig/configure.ac

-- 
libgig packaging



More information about the pkg-multimedia-commits mailing list