[tango] 10/21: remove applyed patch for sparc64

[Frédéric-Emmanuel Picca]

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

picca pushed a commit to branch master
in repository tango.

commit cb639e18accee1ad069faefc3d66f779d8a25aa0
Author: Picca Frédéric-Emmanuel <picca at debian.org>
Date:   Thu Jul 9 10:11:55 2015 +0200

    remove applyed patch for sparc64
---
 debian/changelog                                   |  2 +-
 ...3-forwarded-upstrean-fix-FTBFS-on-sparc64.patch | 35 ----------------------
 debian/patches/series                              |  1 -
 3 files changed, 1 insertion(+), 37 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 9de5445..4694e69 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -15,13 +15,13 @@ tango (9.1.0~rc2+dfsg-1) UNRELEASED; urgency=medium
   * debian/patches
     - deleted (applyed upstream)
       - 0004-fix-upstream-p812_1.diff.patch
+      - 0005-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
       - 0006-fix-upstream-p812_2.patch
       - 0007-fix-upstream-p812_3.patch
       - 0008-fix-upsteam-p812_4.patch
     - refreshed
       - 0001-debian-fix_database_scripts.patch
       - 0002-debian-my.cnf.in.patch
-      - 0005->0003-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
 
  -- Picca Frédéric-Emmanuel <picca at debian.org>  Thu, 02 Jul 2015 10:48:59 +0200
 
diff --git a/debian/patches/0003-forwarded-upstrean-fix-FTBFS-on-sparc64.patch b/debian/patches/0003-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
deleted file mode 100644
index c1fb134..0000000
--- a/debian/patches/0003-forwarded-upstrean-fix-FTBFS-on-sparc64.patch
+++ /dev/null
@@ -1,35 +0,0 @@
-From: =?utf-8?q?Picca_Fr=C3=A9d=C3=A9ric-Emmanuel?= <picca at debian.org>
-Date: Wed, 13 Nov 2013 16:25:25 +0100
-Subject: forwarded upstrean fix FTBFS on sparc64
-
----
- cppserver/database/Makefile.am | 2 +-
- cppserver/database/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/cppserver/database/Makefile.am b/cppserver/database/Makefile.am
-index a0077ff..04701e5 100644
---- a/cppserver/database/Makefile.am
-+++ b/cppserver/database/Makefile.am
-@@ -6,7 +6,7 @@ AM_CPPFLAGS = $(ORB_INCLUDE_PREFIX)  $(LIBZMQ_CFLAGS) \
-       	$(MYSQLCLIENT_CFLAGS) \
-       	$(ZLIB_CPPFLAGS)
- 
--AM_CXXFLAGS= -Wall -D_FORTIFY_SOURCE=2 -O1 -fpie
-+AM_CXXFLAGS= -Wall -D_FORTIFY_SOURCE=2 -O1 -fPIE
- 
- LDADD = -L$(top_builddir)/lib/cpp/server -ltango -L$(top_builddir)/lib/cpp/log4tango/src \
- 		-llog4tango $(MYSQLCLIENT_LDFLAGS) \
-diff --git a/cppserver/database/Makefile.in b/cppserver/database/Makefile.in
-index 18f59c1..8f5cfd9 100644
---- a/cppserver/database/Makefile.in
-+++ b/cppserver/database/Makefile.in
-@@ -425,7 +425,7 @@ AM_CPPFLAGS = $(ORB_INCLUDE_PREFIX)  $(LIBZMQ_CFLAGS) \
-       	$(MYSQLCLIENT_CFLAGS) \
-       	$(ZLIB_CPPFLAGS)
- 
--AM_CXXFLAGS = -Wall -D_FORTIFY_SOURCE=2 -O1 -fpie
-+AM_CXXFLAGS = -Wall -D_FORTIFY_SOURCE=2 -O1 -fPIE
- LDADD = -L$(top_builddir)/lib/cpp/server -ltango -L$(top_builddir)/lib/cpp/log4tango/src \
- 		-llog4tango $(MYSQLCLIENT_LDFLAGS) \
-          $(MYSQLCLIENT_LIBS) $(ZLIB_LDFLAGS) $(ZLIB_LIBS)  $(LIBZMQ_LIBS)
diff --git a/debian/patches/series b/debian/patches/series
index 9777af5..40d07e3 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,2 @@
 0001-debian-fix_database_scripts.patch
 0002-debian-my.cnf.in.patch
-0003-forwarded-upstrean-fix-FTBFS-on-sparc64.patch

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/tango.git