[mlpack] 04/06: update debian patches, all but one are in new upstream version
Barak A. Pearlmutter
barak+git at cs.nuim.ie
Sun Aug 17 08:21:49 UTC 2014
This is an automated email from the git hooks/post-receive script.
bap pushed a commit to branch master
in repository mlpack.
commit e269f9e070a619aa019f2bda5cbdb1c6ec9515be
Author: Barak A. Pearlmutter <barak+git at cs.nuim.ie>
Date: Sun Aug 17 08:27:11 2014 +0200
update debian patches, all but one are in new upstream version
---
debian/patches/build-Doxygen.patch | 6 +++---
debian/patches/doxyfile-path-fix.patch | 26 --------------------------
debian/patches/series | 3 ---
debian/patches/spelling.patch | 21 ---------------------
debian/patches/troff-single-quote.patch | 28 ----------------------------
5 files changed, 3 insertions(+), 81 deletions(-)
diff --git a/debian/patches/build-Doxygen.patch b/debian/patches/build-Doxygen.patch
index deb1292..e60847a 100644
--- a/debian/patches/build-Doxygen.patch
+++ b/debian/patches/build-Doxygen.patch
@@ -2,7 +2,7 @@ From: "Barak A. Pearlmutter" <barak+git at cs.nuim.ie>
Date: Sat, 5 Apr 2014 13:18:23 +0100
Subject: build Doxygen
-This patch runs causes the build system to generate refman.tex.
+This patch causes the build system to generate refman.tex.
The same effect can be had by adding the command
$(MAKE) -C obj-* doc
to the debian/rules override_dh_auto_build target.
@@ -11,10 +11,10 @@ to the debian/rules override_dh_auto_build target.
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/CMakeLists.txt b/CMakeLists.txt
-index 0bbf8f7..6347af2 100644
+index b1c6b7d..c6ad610 100644
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
-@@ -281,7 +281,7 @@ if (DOXYGEN_FOUND)
+@@ -267,7 +267,7 @@ if (DOXYGEN_FOUND)
)
# Generate documentation.
diff --git a/debian/patches/doxyfile-path-fix.patch b/debian/patches/doxyfile-path-fix.patch
deleted file mode 100644
index f25e052..0000000
--- a/debian/patches/doxyfile-path-fix.patch
+++ /dev/null
@@ -1,26 +0,0 @@
-From: "Barak A. Pearlmutter" <barak+git at cs.nuim.ie>
-Date: Mon, 7 Apr 2014 17:00:15 +0100
-Subject: doxyfile path fix
-
----
- CMake/GenerateDoxyfile.cmake | 9 ++++++++-
- 1 file changed, 8 insertions(+), 1 deletion(-)
-
-diff --git a/CMake/GenerateDoxyfile.cmake b/CMake/GenerateDoxyfile.cmake
-index 4b00958..da37beb 100644
---- a/CMake/GenerateDoxyfile.cmake
-+++ b/CMake/GenerateDoxyfile.cmake
-@@ -25,5 +25,12 @@ string(REPLACE
- DOXYFILE_AUXVAR "${DOXYFILE_CONTENTS}"
- )
-
-+# Change the STRIP_FROM_PATH so that it works right even in the build directory;
-+# otherwise, every file will have the full path in it.
-+string(REGEX REPLACE
-+ "(STRIP_FROM_PATH[ ]*=) ./"
-+ "\\1 ${CMAKE_CURRENT_SOURCE_DIR}/"
-+ DOXYFILE_CONTENTS ${DOXYFILE_AUXVAR})
-+
- # Save the Doxyfile to its new location.
--file(WRITE "${DESTDIR}/Doxyfile" "${DOXYFILE_AUXVAR}")
-+file(WRITE "${DESTDIR}/Doxyfile" "${DOXYFILE_CONTENTS}")
diff --git a/debian/patches/series b/debian/patches/series
index 62d9281..4b2b1fa 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,4 +1 @@
build-Doxygen.patch
-troff-single-quote.patch
-doxyfile-path-fix.patch
-spelling.patch
diff --git a/debian/patches/spelling.patch b/debian/patches/spelling.patch
deleted file mode 100644
index b069020..0000000
--- a/debian/patches/spelling.patch
+++ /dev/null
@@ -1,21 +0,0 @@
-From: "Barak A. Pearlmutter" <barak+git at cs.nuim.ie>
-Date: Mon, 7 Apr 2014 21:51:14 +0100
-Subject: spelling
-
----
- src/mlpack/core/metrics/lmetric.hpp | 2 +-
- 1 file changed, 1 insertion(+), 1 deletion(-)
-
-diff --git a/src/mlpack/core/metrics/lmetric.hpp b/src/mlpack/core/metrics/lmetric.hpp
-index cd8df92..08ef26c 100644
---- a/src/mlpack/core/metrics/lmetric.hpp
-+++ b/src/mlpack/core/metrics/lmetric.hpp
-@@ -33,7 +33,7 @@ namespace metric {
- /**
- * The L_p metric for arbitrary integer p, with an option to take the root.
- *
-- * This class implements the standard L_p metric for two arbitary vectors @f$ x
-+ * This class implements the standard L_p metric for two arbitrary vectors @f$ x
- * @f$ and @f$ y @f$ of dimensionality @f$ n @f$:
- *
- * @f[
diff --git a/debian/patches/troff-single-quote.patch b/debian/patches/troff-single-quote.patch
deleted file mode 100644
index 3f8065d..0000000
--- a/debian/patches/troff-single-quote.patch
+++ /dev/null
@@ -1,28 +0,0 @@
-From: "Barak A. Pearlmutter" <barak+git at cs.nuim.ie>
-Date: Mon, 7 Apr 2014 16:59:22 +0100
-Subject: troff single quote
-
----
- CMake/exec2man.sh | 4 ++--
- 1 file changed, 2 insertions(+), 2 deletions(-)
-
-diff --git a/CMake/exec2man.sh b/CMake/exec2man.sh
-index ce59e5b..b0807fc 100755
---- a/CMake/exec2man.sh
-+++ b/CMake/exec2man.sh
-@@ -64,7 +64,7 @@ synopsis="$name [-h] [-v] $reqoptions $options";
- # correctly so that the entire description of the parameter is on one line (this
- # helps avoid 'man' warnings).
- # The sed line at the end removes accidental macros from the output, replacing
--# 'word' with "word".
-+# single-quotes at the beginning of a line with the troff escape code \(aq.
- ./"$name" -h | \
- sed 's/^For further information/Additional Information\n\n For further information/' | \
- sed 's/^consult the documentation/ consult the documentation/' | \
-@@ -76,5 +76,5 @@ synopsis="$name [-h] [-v] $reqoptions $options";
- awk '/NAME/,/REQUIRED OPTIONS/ { print; } /ADDITIONAL INFORMATION/,0 { print; } /REQUIRED OPTIONS/,/ADDITIONAL INFORMATION/ { if (!/REQUIRED_OPTIONS/ && !/OPTIONS/ && !/ADDITIONAL INFORMATION/) { if (/ --/) { printf "\n" } sub(/^[ ]*/, ""); sub(/ [ ]*/, " "); printf "%s ", $0; } else { if (!/REQUIRED OPTIONS/ && !/ADDITIONAL INFORMATION/) { print "\n"$0; } } }' | \
- sed 's/ ADDITIONAL INFORMATION/\n\nADDITIONAL INFORMATION/' | \
- txt2man -P mlpack -t "$name" -d 1 | \
-- sed "s/^'\([A-Za-z0-9 ]*\)'/\"\1\"/" > "$output"
-+ sed "s/^'/\\\\(aq/" > "$output"
-
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-science/packages/mlpack.git
More information about the debian-science-commits
mailing list