[pluma] 05/06: debian/patches: Drop 2003_omit-non-linux-build-files.patch. Applied upstream.
Martin Wimpress
flexiondotorg-guest at moszumanska.debian.org
Wed Nov 11 12:19:22 UTC 2015
This is an automated email from the git hooks/post-receive script.
flexiondotorg-guest pushed a commit to branch master
in repository pluma.
commit e2de85319ba6a24541a6f9ed96da50914480a11f
Author: Martin Wimpress <code at flexion.org>
Date: Tue Nov 10 00:32:00 2015 +0000
debian/patches: Drop 2003_omit-non-linux-build-files.patch. Applied upstream.
---
.../patches/2003_omit-non-linux-build-files.patch | 101 ---------------------
debian/patches/series | 1 -
2 files changed, 102 deletions(-)
diff --git a/debian/patches/2003_omit-non-linux-build-files.patch b/debian/patches/2003_omit-non-linux-build-files.patch
deleted file mode 100644
index 9d8677d..0000000
--- a/debian/patches/2003_omit-non-linux-build-files.patch
+++ /dev/null
@@ -1,101 +0,0 @@
-Description: Skip non-Linux build stuff on the repacked source tarball
-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
-@@ -550,11 +549,7 @@ plugins/spell/Makefile
- 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 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}
-
--SUBDIRS = pluma pixmaps po data plugin-loaders plugins docs tests win32 osx
-+SUBDIRS = pluma pixmaps po data plugin-loaders plugins docs tests
-
- 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
-
--if OS_OSX
--SUBDIRS += osx
--endif
--
- bin_PROGRAMS = pluma
-
- noinst_LTLIBRARIES = libpluma.la
-@@ -25,14 +21,7 @@ pluma_SOURCES = \
-
- 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 @@ libpluma_la_LIBADD = \
- # 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 @@ dist-hook:
- 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
deleted file mode 100644
index ff04381..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1 +0,0 @@
-2003_omit-non-linux-build-files.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-mate/pluma.git
More information about the pkg-mate-commits
mailing list