[libfann] 05/34: d/patches: Drop patches made obsolete by CMake
Christian Kastner
chrisk-guest at moszumanska.debian.org
Thu Oct 1 18:06:20 UTC 2015
This is an automated email from the git hooks/post-receive script.
chrisk-guest pushed a commit to branch master
in repository libfann.
commit f9f43705e575134735aa15f0184d18763b44278d
Author: Christian Kastner <ckk at kvr.at>
Date: Thu Oct 1 11:24:48 2015 +0200
d/patches: Drop patches made obsolete by CMake
---
...-pyfann-dynamically-instead-of-statically.patch | 30 -----------------
...h-upstreams-Makefile.am-reflecting-Debian.patch | 39 ----------------------
.../0006-Include-fann_cpp.h-in-dev-package.patch | 19 -----------
debian/patches/series | 3 --
4 files changed, 91 deletions(-)
diff --git a/debian/patches/0001-Link-python-pyfann-dynamically-instead-of-statically.patch b/debian/patches/0001-Link-python-pyfann-dynamically-instead-of-statically.patch
deleted file mode 100644
index 308a21e..0000000
--- a/debian/patches/0001-Link-python-pyfann-dynamically-instead-of-statically.patch
+++ /dev/null
@@ -1,30 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Fri, 4 Jun 2010 23:27:24 +0200
-Subject: [PATCH] Link python-pyfann dynamically instead of statically
-
-Upstream links the pyfann extension against libfann's static library. This
-causes all sorts of troubles on some platforms, most notably amd64, where the
-extension FTBFS because the static library isn't compiled with -fPIC. The
-Debian-specific solution presented here is to link to the shared library and
-let package python-pyfann Depend: on it.
-
-Forwarded: no
-Last-Update: 2010-06-04
----
- python/setup.py | 2 +-
- 1 files changed, 1 insertions(+), 1 deletions(-)
-
-diff --git a/python/setup.py b/python/setup.py
-index 67cef7e..6b2a3dc 100755
---- a/python/setup.py
-+++ b/python/setup.py
-@@ -42,7 +42,7 @@ setup(
- py_modules=['pyfann.libfann'],
- ext_modules=[Extension('pyfann._libfann',['pyfann/pyfann_wrap.cxx'],
- include_dirs=['../src/include'],
-- extra_objects=['../src/doublefann.o'],
-+ extra_objects=['../src/.libs/doublefann.o'],
- define_macros=[("SWIG_COMPILE",None)]
- ),
- ]
---
diff --git a/debian/patches/0003-Patch-upstreams-Makefile.am-reflecting-Debian.patch b/debian/patches/0003-Patch-upstreams-Makefile.am-reflecting-Debian.patch
deleted file mode 100644
index 35484dd..0000000
--- a/debian/patches/0003-Patch-upstreams-Makefile.am-reflecting-Debian.patch
+++ /dev/null
@@ -1,39 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Mon, 7 Jun 2010 19:18:58 +0200
-Subject: [PATCH] Patch upstreams Makefile.am reflecting Debian
-
-Patch upstream's Makefile.am -- specifically the part referrring to Debian
-packaging -- to reflect the changes that were introduced by Debian's own
-packaging. This has no effect on the Debian packaging, and is merely included
-for completeness. It will be forwarded to upstream eventually.
-
-Forwarded: no
-Last-Update: 2010-06-08
----
- Makefile.am | 12 +++++++-----
- 1 files changed, 7 insertions(+), 5 deletions(-)
-
-diff --git a/Makefile.am b/Makefile.am
-index 23232af..d4c12fc 100644
---- a/Makefile.am
-+++ b/Makefile.am
-@@ -6,11 +6,13 @@ pkgconfig_DATA = fann.pc
- EXTRA_DIST = benchmarks examples MicrosoftVisualC++6.0 MicrosoftVisualC++.Net \
- MicrosoftWindowsDll BorlandC++Builder6.0 src/include/config.h \
- debian/changelog debian/compat debian/control debian/copyright \
-- debian/docs debian/libfann2-dev.dirs debian/libfann2-dev.examples \
-- debian/libfann2-dev.files debian/libfann2-dev.install \
-- debian/libfann2.dirs debian/libfann2.files debian/libfann2.install \
-- debian/libfann2-py.dirs debian/libfann2-py.files \
-- debian/libfann2-py.install debian/rules \
-+ debian/libfann2.docs debian/libfann2.install \
-+ debian/libfann-dev.dirs debian/libfann-dev.examples \
-+ debian/libfann-dev.install \
-+ debian/libfann-doc.docs debian/libfann-doc.doc-base \
-+ debian/pyversions debian/python-pyfann.examples \
-+ debian/rules debian/example-paths.sed \
-+ debian/README-libfann2-examples debian/README-pyfann-examples-data \
- doc/advancedusage.txt doc/gettingstarted.txt doc/theory.txt \
- doc/fixedpointusage.txt doc/installation.txt doc/fann_en.pdf \
- python
---
diff --git a/debian/patches/0006-Include-fann_cpp.h-in-dev-package.patch b/debian/patches/0006-Include-fann_cpp.h-in-dev-package.patch
deleted file mode 100644
index 40de53c..0000000
--- a/debian/patches/0006-Include-fann_cpp.h-in-dev-package.patch
+++ /dev/null
@@ -1,19 +0,0 @@
-From: Christian Kastner <debian at kvr.at>
-Date: Fri, 10 Jun 2011 02:47:46 +0200
-Subject: Include fann_cpp.h (C++ wrapper for fann) in package build
-
-Bug-Debian: http://bugs.debian.org/629827
-Last-Update: 2014-04-23
-Forwarded: no
----
- src/include/Makefile.am | 2 +-
- src/include/Makefile.in | 2 +-
- 2 files changed, 2 insertions(+), 2 deletions(-)
-
-Index: libfann-2.1.0~beta~dfsg/src/include/Makefile.am
-===================================================================
---- libfann-2.1.0~beta~dfsg.orig/src/include/Makefile.am 2014-04-23 02:06:04.032721700 +0200
-+++ libfann-2.1.0~beta~dfsg/src/include/Makefile.am 2014-04-23 02:06:04.032721700 +0200
-@@ -1 +1 @@
--include_HEADERS = fann.h doublefann.h fann_internal.h floatfann.h fann_data.h fixedfann.h compat_time.h fann_activation.h fann_cascade.h fann_error.h fann_train.h fann_io.h
-+include_HEADERS = fann.h doublefann.h fann_internal.h floatfann.h fann_data.h fixedfann.h compat_time.h fann_activation.h fann_cascade.h fann_error.h fann_train.h fann_io.h fann_cpp.h
diff --git a/debian/patches/series b/debian/patches/series
index 1438e66..f7562b9 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,7 +1,4 @@
-0001-Link-python-pyfann-dynamically-instead-of-statically.patch
0002-Link-against-libm.patch
-0003-Patch-upstreams-Makefile.am-reflecting-Debian.patch
0004-Portable-handling-for-va_list.patch
0005-Correct-a-typo-in-a-size-comparison.patch
-0006-Include-fann_cpp.h-in-dev-package.patch
0007-Do-not-call-swig-unconditionally.patch
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/libfann.git
More information about the debian-science-commits
mailing list