[lordsawar] 89/133: Drop ftbfs_as-needed.diff.
Markus Koschany
apo-guest at moszumanska.debian.org
Thu Jul 2 17:38:10 UTC 2015
This is an automated email from the git hooks/post-receive script.
apo-guest pushed a commit to branch master
in repository lordsawar.
commit 6c2363eca213074c1472f35ce95c21c03b2281a4
Author: Markus Koschany <apo at gambaru.de>
Date: Wed Jul 1 17:12:40 2015 +0200
Drop ftbfs_as-needed.diff.
Let's see if it was fixed by upstream.
---
debian/patches/ftbfs_as-needed.diff | 142 ------------------------------------
debian/patches/series | 2 -
2 files changed, 144 deletions(-)
diff --git a/debian/patches/ftbfs_as-needed.diff b/debian/patches/ftbfs_as-needed.diff
deleted file mode 100644
index f03bb4d..0000000
--- a/debian/patches/ftbfs_as-needed.diff
+++ /dev/null
@@ -1,142 +0,0 @@
-Description: Correct the order of linker parameters so that it doesn't fail
- with --as-needed option.
-Author: Ilya Barygin <barygin at gmail.com>
-Bug-Ubuntu: https://launchpad.net/bugs/770984
---- a/src/pbm/Makefile.am
-+++ b/src/pbm/Makefile.am
-@@ -23,8 +23,8 @@
- lordsawar_pbm_SOURCES = pbm.cpp main.cpp pbm.h ${top_srcdir}/src/pbm-game-client.cpp ${top_srcdir}/src/pbm-game-client.h ${top_srcdir}/src/game-client-decoder.cpp ${top_srcdir}/src/game-client-decoder.h ${top_srcdir}/src/chat-client.cpp ${top_srcdir}/src/chat-client.h
-
-
--lordsawar_pbm_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) $(SDL_LIBS) -ltar -lz \
-- $(top_builddir)/src/liblordsawar.la \
-+lordsawar_pbm_LDADD = $(top_builddir)/src/liblordsawar.la \
-+ $(LIBSIGC_LIBS) $(GTKMM_LIBS) $(SDL_LIBS) -ltar -lz \
- @LIBINTL@ \
- -L$(top_builddir)/src
- ##endif
---- a/src/pbm/Makefile.in
-+++ b/src/pbm/Makefile.in
-@@ -283,8 +283,8 @@
- # 02110-1301, USA.
- MAINTAINERCLEANFILES = Makefile.in
- lordsawar_pbm_SOURCES = pbm.cpp main.cpp pbm.h ${top_srcdir}/src/pbm-game-client.cpp ${top_srcdir}/src/pbm-game-client.h ${top_srcdir}/src/game-client-decoder.cpp ${top_srcdir}/src/game-client-decoder.h ${top_srcdir}/src/chat-client.cpp ${top_srcdir}/src/chat-client.h
--lordsawar_pbm_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) $(SDL_LIBS) -ltar -lz \
-- $(top_builddir)/src/liblordsawar.la \
-+lordsawar_pbm_LDADD = $(top_builddir)/src/liblordsawar.la -lz \
-+ $(LIBSIGC_LIBS) $(GTKMM_LIBS) $(SDL_LIBS) -ltar \
- @LIBINTL@ \
- -L$(top_builddir)/src
-
---- a/src/gls/Makefile.am
-+++ b/src/gls/Makefile.am
-@@ -22,20 +22,20 @@
- lordsawar_game_list_client_SOURCES = gls-client-main.cpp \
- gls-client-tool.cpp gls-client-tool.h
-
--lordsawar_game_list_client_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
-- $(top_builddir)/src/liblordsawar.la \
-+lordsawar_game_list_client_LDADD = $(top_builddir)/src/liblordsawar.la \
- $(top_builddir)/src/liblordsawargamelist.la \
- $(top_builddir)/src/liblordsawarnet.la \
-+ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
- @LIBINTL@ \
- -L$(top_builddir)/src
-
- lordsawar_game_list_server_SOURCES = main.cpp \
- gamelist-server.cpp gamelist-server.h
-
--lordsawar_game_list_server_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
-- $(top_builddir)/src/liblordsawar.la \
-+lordsawar_game_list_server_LDADD = $(top_builddir)/src/liblordsawar.la \
- $(top_builddir)/src/liblordsawargamelist.la \
- $(top_builddir)/src/liblordsawarnet.la \
-+ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
- @LIBINTL@ \
- -L$(top_builddir)/src
- ##endif
---- a/src/gls/Makefile.in
-+++ b/src/gls/Makefile.in
-@@ -296,20 +296,20 @@
- lordsawar_game_list_client_SOURCES = gls-client-main.cpp \
- gls-client-tool.cpp gls-client-tool.h
-
--lordsawar_game_list_client_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
-- $(top_builddir)/src/liblordsawar.la \
-+lordsawar_game_list_client_LDADD = $(top_builddir)/src/liblordsawar.la \
- $(top_builddir)/src/liblordsawargamelist.la \
- $(top_builddir)/src/liblordsawarnet.la \
-+ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
- @LIBINTL@ \
- -L$(top_builddir)/src
-
- lordsawar_game_list_server_SOURCES = main.cpp \
- gamelist-server.cpp gamelist-server.h
-
--lordsawar_game_list_server_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
-- $(top_builddir)/src/liblordsawar.la \
-+lordsawar_game_list_server_LDADD = $(top_builddir)/src/liblordsawar.la \
- $(top_builddir)/src/liblordsawargamelist.la \
- $(top_builddir)/src/liblordsawarnet.la \
-+ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
- @LIBINTL@ \
- -L$(top_builddir)/src
-
---- a/src/ghs/Makefile.am
-+++ b/src/ghs/Makefile.am
-@@ -22,22 +22,22 @@
- lordsawar_game_host_client_SOURCES = ghs-client-main.cpp \
- ghs-client-tool.cpp ghs-client-tool.h
-
--lordsawar_game_host_client_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
-- $(top_builddir)/src/liblordsawar.la \
-+lordsawar_game_host_client_LDADD = $(top_builddir)/src/liblordsawar.la \
- $(top_builddir)/src/liblordsawargamelist.la \
- $(top_builddir)/src/liblordsawargamehost.la \
- $(top_builddir)/src/liblordsawarnet.la \
-+ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
- @LIBINTL@ \
- -L$(top_builddir)/src
-
- lordsawar_game_host_server_SOURCES = main.cpp \
- gamehost-server.cpp gamehost-server.h
-
--lordsawar_game_host_server_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
-- $(top_builddir)/src/liblordsawar.la \
-+lordsawar_game_host_server_LDADD = $(top_builddir)/src/liblordsawar.la \
- $(top_builddir)/src/liblordsawargamelist.la \
- $(top_builddir)/src/liblordsawargamehost.la \
- $(top_builddir)/src/liblordsawarnet.la \
-+ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
- @LIBINTL@ \
- -L$(top_builddir)/src
- ##endif
---- a/src/ghs/Makefile.in
-+++ b/src/ghs/Makefile.in
-@@ -298,22 +298,22 @@
- lordsawar_game_host_client_SOURCES = ghs-client-main.cpp \
- ghs-client-tool.cpp ghs-client-tool.h
-
--lordsawar_game_host_client_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
-- $(top_builddir)/src/liblordsawar.la \
-+lordsawar_game_host_client_LDADD = $(top_builddir)/src/liblordsawar.la \
- $(top_builddir)/src/liblordsawargamelist.la \
- $(top_builddir)/src/liblordsawargamehost.la \
- $(top_builddir)/src/liblordsawarnet.la \
-+ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
- @LIBINTL@ \
- -L$(top_builddir)/src
-
- lordsawar_game_host_server_SOURCES = main.cpp \
- gamehost-server.cpp gamehost-server.h
-
--lordsawar_game_host_server_LDADD = $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
-- $(top_builddir)/src/liblordsawar.la \
-+lordsawar_game_host_server_LDADD = $(top_builddir)/src/liblordsawar.la \
- $(top_builddir)/src/liblordsawargamelist.la \
- $(top_builddir)/src/liblordsawargamehost.la \
- $(top_builddir)/src/liblordsawarnet.la \
-+ $(LIBSIGC_LIBS) $(GTKMM_LIBS) -ltar -lz \
- @LIBINTL@ \
- -L$(top_builddir)/src
-
diff --git a/debian/patches/series b/debian/patches/series
deleted file mode 100644
index 7037084..0000000
--- a/debian/patches/series
+++ /dev/null
@@ -1,2 +0,0 @@
-#No current patches
-ftbfs_as-needed.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-games/lordsawar.git
More information about the Pkg-games-commits
mailing list