[SCM] pluma Debian package branch, master, updated. bb404b47743a608b0b932754d01e0ad546735506

[Mike Gabriel]

Gitweb-URL: http://git.debian.org/?p=pkg-mate/pluma.git;a=commitdiff;h=bb404b4

The following commit has been merged in the master branch:
commit bb404b47743a608b0b932754d01e0ad546735506
Author: Mike Gabriel <mike.gabriel at das-netzwerkteam.de>
Date:   Thu Feb 20 15:39:33 2014 +0100

    debian/patches: rearrange patch order, patch-out other platform specific stuff
---
 ...n.patch => 2001_fully-rename-application.patch} |  0
 ...ch => 2002_omit-gfdl-licensed-help-files.patch} |  0
 .../patches/2003_omit-non-linux-build-files.patch  | 99 ++++++++++++++++++++++
 debian/patches/series                              |  5 +-
 4 files changed, 102 insertions(+), 2 deletions(-)

diff --git a/debian/patches/2002_fully-rename-application.patch b/debian/patches/2001_fully-rename-application.patch
similarity index 100%
rename from debian/patches/2002_fully-rename-application.patch
rename to debian/patches/2001_fully-rename-application.patch
diff --git a/debian/patches/2001_omit-gfdl-licensed-help-files.patch b/debian/patches/2002_omit-gfdl-licensed-help-files.patch
similarity index 100%
rename from debian/patches/2001_omit-gfdl-licensed-help-files.patch
rename to debian/patches/2002_omit-gfdl-licensed-help-files.patch
diff --git a/debian/patches/2003_omit-non-linux-build-files.patch b/debian/patches/2003_omit-non-linux-build-files.patch
new file mode 100644
index 0000000..c640b33
--- /dev/null
+++ b/debian/patches/2003_omit-non-linux-build-files.patch
@@ -0,0 +1,99 @@
+--- a/configure.ac
++++ b/configure.ac
+@@ -521,7 +521,6 @@
+ docs/reference/Makefile
+ pluma/dialogs/Makefile
+ pluma/smclient/Makefile
+-pluma/osx/Makefile
+ pluma/Makefile
+ pixmaps/Makefile
+ plugin-loaders/Makefile
+@@ -551,11 +550,7 @@
+ plugins/taglist/Makefile
+ plugins/time/Makefile
+ po/Makefile.in
+-tests/Makefile
+-win32/pluma.iss
+-win32/Makefile
+-osx/Info.plist
+-osx/Makefile])
++tests/Makefile])
+ 
+ AC_OUTPUT
+ 
+--- a/Makefile.am
++++ b/Makefile.am
+@@ -1,7 +1,7 @@
+ ## Process this file with automake to produce Makefile.in
+ ACLOCAL_AMFLAGS = -I m4
+ 
+-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
+@@ -1,10 +1,6 @@
+ ## Process this file with automake to produce Makefile.in
+ SUBDIRS = dialogs smclient
+ 
+-if OS_OSX
+-SUBDIRS += osx
+-endif
+-
+ bin_PROGRAMS = pluma
+ 
+ noinst_LTLIBRARIES = libpluma.la
+@@ -25,14 +21,7 @@
+ 
+ pluma_LDADD = libpluma.la $(PLUMA_LIBS) $(IGE_MAC_LIBS) $(EGG_SMCLIENT_LIBS)
+ 
+-if PLATFORM_WIN32
+-pluma_LDFLAGS = -Wl,--export-all-symbols -Wl,--out-implib,libpluma.a
+-if OS_WIN32
+-pluma_LDFLAGS += -mwindows
+-endif
+-else
+ pluma_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
+-endif
+ 
+ libpluma_la_LDFLAGS = -export-dynamic -no-undefined -export-symbols-regex "^[[^_]].*"
+ 
+@@ -43,25 +32,12 @@
+ # PLUMA_LIBS must be the last to ensure correct order on some platforms
+ libpluma_la_LIBADD += $(PLUMA_LIBS) -lICE
+ 
+-if OS_OSX
+-pluma_LDFLAGS += -framework Carbon
+-
+-libpluma_la_LIBADD += osx/libosx.la
+-endif
+-
+ BUILT_SOURCES = 			\
+ 	pluma-enum-types.c		\
+ 	pluma-enum-types.h		\
+ 	pluma-marshal.c			\
+ 	pluma-marshal.h
+ 
+-if OS_WIN32
+-pluma-res.o: pluma.rc
+-	$(WINDRES) -i pluma.rc --input-format=rc -o pluma-res.o -O coff
+-
+-pluma_LDADD += pluma-res.o
+-endif
+-
+ NOINST_H_FILES =			\
+ 	pluma-close-button.h		\
+ 	pluma-dirs.h			\
+@@ -223,10 +199,6 @@
+ 	cd $(distdir); rm -f $(BUILT_SOURCES)
+ 
+ install-exec-hook:
+-if PLATFORM_WIN32
+-	$(mkinstalldirs) "$(DESTDIR)$(libdir)"
+-	$(INSTALL_DATA) libpluma.a "$(DESTDIR)$(libdir)"
+-endif
+ 
+ if !OS_WIN32
+ BACON_DIR=$(srcdir)/../../libbacon/src/
diff --git a/debian/patches/series b/debian/patches/series
index 59a788a..59bd281 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,5 +2,6 @@
 1001_add-keywords-to-desktop-file.patch
 1002_typo-fix-whether.patch
 1003_dont-install-usr-bin-mate-text-editor.patch
-2001_omit-gfdl-licensed-help-files.patch
-2002_fully-rename-application.patch
+2001_fully-rename-application.patch
+2002_omit-gfdl-licensed-help-files.patch
+2003_omit-non-linux-build-files.patch

-- 
pluma Debian package