[SCM] gigedit/master: Patches refreshed/removed.

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

The following commit has been merged in the master branch:
commit b1012e806389b83082743355c97555fd59dd7d7b
Author: Jaromír Mikeš <mira.mikes at seznam.cz>
Date:   Sun Nov 20 22:21:30 2016 +0100

    Patches refreshed/removed.

diff --git a/debian/patches/01-makefiles.patch b/debian/patches/01-makefiles.patch
index c1e8869..a0472b3 100644
--- a/debian/patches/01-makefiles.patch
+++ b/debian/patches/01-makefiles.patch
@@ -8,6 +8,8 @@ Forwarded: no
  configure.ac |    1 -
  4 files changed, 3 insertions(+), 5 deletions(-)
 
+Index: gigedit/Makefile.am
+===================================================================
 --- gigedit.orig/Makefile.am
 +++ gigedit/Makefile.am
 @@ -1,4 +1,4 @@
@@ -16,21 +18,25 @@ Forwarded: no
  
  DISTCLEANFILES =		\
  	intltool-extract	\
+Index: gigedit/Makefile.in
+===================================================================
 --- gigedit.orig/Makefile.in
 +++ gigedit/Makefile.in
-@@ -237,7 +237,7 @@ sbindir = @sbindir@
- sharedstatedir = @sharedstatedir@
- sysconfdir = @sysconfdir@
- target_alias = @target_alias@
+@@ -364,7 +364,7 @@ target_alias = @target_alias@
+ top_build_prefix = @top_build_prefix@
+ top_builddir = @top_builddir@
+ top_srcdir = @top_srcdir@
 -SUBDIRS = src gfx po debian doc win32
 +SUBDIRS = src gfx po doc win32
  DISTCLEANFILES = \
  	intltool-extract	\
  	intltool-merge		\
+Index: gigedit/configure
+===================================================================
 --- gigedit.orig/configure
 +++ gigedit/configure
-@@ -23619,7 +23619,7 @@ fi
- 
+@@ -18753,7 +18753,7 @@ END
+ fi
  
  
 -ac_config_files="$ac_config_files Makefile src/Makefile src/gigedit/Makefile src/plugin/Makefile gfx/Makefile po/Makefile.in debian/Makefile doc/Makefile doc/quickstart/Makefile win32/libgigedit.dev win32/gigedit.dev win32/gigedit.nsi win32/Makefile gigedit.spec"
@@ -38,7 +44,7 @@ Forwarded: no
  
  cat >confcache <<\_ACEOF
  # This file is a shell script that caches the results of configure
-@@ -24232,7 +24232,6 @@ do
+@@ -19897,7 +19897,6 @@ do
      "src/plugin/Makefile") CONFIG_FILES="$CONFIG_FILES src/plugin/Makefile" ;;
      "gfx/Makefile") CONFIG_FILES="$CONFIG_FILES gfx/Makefile" ;;
      "po/Makefile.in") CONFIG_FILES="$CONFIG_FILES po/Makefile.in" ;;
@@ -46,9 +52,11 @@ Forwarded: no
      "doc/Makefile") CONFIG_FILES="$CONFIG_FILES doc/Makefile" ;;
      "doc/quickstart/Makefile") CONFIG_FILES="$CONFIG_FILES doc/quickstart/Makefile" ;;
      "win32/libgigedit.dev") CONFIG_FILES="$CONFIG_FILES win32/libgigedit.dev" ;;
+Index: gigedit/configure.ac
+===================================================================
 --- gigedit.orig/configure.ac
 +++ gigedit/configure.ac
-@@ -187,7 +187,6 @@ AC_CONFIG_FILES([
+@@ -196,7 +196,6 @@ AC_CONFIG_FILES([
  	src/plugin/Makefile
  	gfx/Makefile
  	po/Makefile.in
diff --git a/debian/patches/02-binutils_gold.patch b/debian/patches/02-binutils_gold.patch
deleted file mode 100644
index 7ba13ae..0000000
--- a/debian/patches/02-binutils_gold.patch
+++ /dev/null
@@ -1,17 +0,0 @@
-Description: Fix FTBFS with binutils-gold.
-Author: Alessio Treglia <alessio at debian.org>
-Forwarded: no
----
- src/gigedit/Makefile.am |    1 +
- 1 file changed, 1 insertion(+)
-
---- gigedit.orig/src/gigedit/Makefile.am
-+++ gigedit/src/gigedit/Makefile.am
-@@ -22,6 +22,7 @@ libgigedit_la_LDFLAGS = \
- bin_PROGRAMS = gigedit
- gigedit_SOURCES = main.cpp
- gigedit_LDADD = \
-+	-lsigc-2.0 \
- 	$(top_builddir)/src/gigedit/libgigedit.la
- if WINDOWS
- gigedit_LDFLAGS = -mwindows
diff --git a/debian/patches/series b/debian/patches/series
index f9b96e9..ec078aa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,2 +1 @@
 01-makefiles.patch
-02-binutils_gold.patch

-- 
gigedit packaging