[pluma] 13/18: debian/patches: Rebase 2003_omit-non-linux-build-files.patch.

[Martin Wimpress]

This is an automated email from the git hooks/post-receive script.

flexiondotorg-guest pushed a commit to branch debian/experimental
in repository pluma.

commit 9ea73be461ab9e0650aa04ea039111aeb93993b9
Author: Martin Wimpress <code at flexion.org>
Date:   Mon Aug 10 13:10:46 2015 +0100

    debian/patches: Rebase 2003_omit-non-linux-build-files.patch.
---
 .../patches/2003_omit-non-linux-build-files.patch  | 30 +++++++++++-----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/debian/patches/2003_omit-non-linux-build-files.patch b/debian/patches/2003_omit-non-linux-build-files.patch
index de4574e..9d8677d 100644
--- a/debian/patches/2003_omit-non-linux-build-files.patch
+++ b/debian/patches/2003_omit-non-linux-build-files.patch
@@ -1,16 +1,16 @@
 Description: Skip non-Linux build stuff on the repacked source tarball
-Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
---- a/configure.ac
-+++ b/configure.ac
-@@ -539,7 +539,6 @@
+Author: Martin Wimpress <code at flexion.org>
+--- a/configure.ac	2015-08-07 10:04:06.724557688 +0100
++++ b/configure.ac	2015-08-09 09:57:18.322462399 +0100
+@@ -519,7 +519,6 @@ docs/Makefile
  docs/reference/Makefile
  pluma/dialogs/Makefile
  pluma/smclient/Makefile
 -pluma/osx/Makefile
  pluma/Makefile
+ help/Makefile
  pixmaps/Makefile
- plugin-loaders/Makefile
-@@ -569,11 +568,7 @@
+@@ -550,11 +549,7 @@ plugins/spell/Makefile
  plugins/taglist/Makefile
  plugins/time/Makefile
  po/Makefile.in
@@ -23,8 +23,8 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  
  AC_OUTPUT
  
---- a/Makefile.am
-+++ b/Makefile.am
+--- a/Makefile.am	2015-08-07 10:04:06.724557688 +0100
++++ b/Makefile.am	2015-08-09 09:57:36.318904237 +0100
 @@ -1,7 +1,7 @@
  ## Process this file with automake to produce Makefile.in
  ACLOCAL_AMFLAGS = -I m4 ${ACLOCAL_FLAGS}
@@ -32,10 +32,10 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
 -SUBDIRS = pluma pixmaps po data plugin-loaders plugins docs tests win32 osx
 +SUBDIRS = pluma pixmaps po data plugin-loaders plugins docs tests
  
- distuninstallcheck_listfiles = find . -type f -print | grep -v scrollkeeper
- 
---- a/pluma/Makefile.am
-+++ b/pluma/Makefile.am
+ if !OS_OSX
+ SUBDIRS += help
+--- a/pluma/Makefile.am	2015-08-07 10:04:06.768558040 +0100
++++ b/pluma/Makefile.am	2015-08-09 10:02:21.373458139 +0100
 @@ -1,10 +1,6 @@
  ## Process this file with automake to produce Makefile.in
  SUBDIRS = dialogs smclient
@@ -47,7 +47,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  bin_PROGRAMS = pluma
  
  noinst_LTLIBRARIES = libpluma.la
-@@ -25,14 +21,7 @@
+@@ -25,14 +21,7 @@ pluma_SOURCES = \
  
  pluma_LDADD = libpluma.la $(PLUMA_LIBS) $(IGE_MAC_LIBS) $(EGG_SMCLIENT_LIBS)
  
@@ -62,7 +62,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  
  libpluma_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
  
-@@ -43,25 +32,12 @@
+@@ -43,25 +32,12 @@ libpluma_la_LIBADD = \
  # PLUMA_LIBS must be the last to ensure correct order on some platforms
  libpluma_la_LIBADD += $(PLUMA_LIBS) -lICE
  
@@ -88,7 +88,7 @@ Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
  NOINST_H_FILES =			\
  	pluma-close-button.h		\
  	pluma-dirs.h			\
-@@ -223,10 +199,6 @@
+@@ -223,10 +199,6 @@ dist-hook:
  	cd $(distdir); rm -f $(BUILT_SOURCES)
  
  install-exec-hook:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/pluma.git