[graphite2] 44/69: Imported Debian patch 1.2.4-3
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository graphite2.
commit f24ee9168a90d93024e6ccf24f110b81fcb1af49
Author: Rene Engelhard <rene@debian.org>
Date: Sun Jun 1 11:12:56 2014 +0200
Imported Debian patch 1.2.4-3
---
debian/changelog | 6 ++++++
debian/patches/no-icons.diff | 17 +++++++++++++++++
debian/patches/series | 1 +
3 files changed, 24 insertions(+)
diff --git a/debian/changelog b/debian/changelog
index 6247f14..10d832f 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,9 @@
+graphite2 (1.2.4-3) unstable; urgency=medium
+
+ * run a2x without --icons to avoid FTBFS (closes: #741845)
+
+ -- Rene Engelhard <rene@debian.org> Sun, 01 Jun 2014 11:12:56 +0200
+
graphite2 (1.2.4-2) unstable; urgency=low
* add patch from Pino Toscano to also avoid linking to libstdc++ on
diff --git a/debian/patches/no-icons.diff b/debian/patches/no-icons.diff
new file mode 100644
index 0000000..eb4de18
--- /dev/null
+++ b/debian/patches/no-icons.diff
@@ -0,0 +1,17 @@
+--- graphite2-1.2.4.orig/doc/CMakeLists.txt
++++ graphite2-1.2.4/doc/CMakeLists.txt
+@@ -12,12 +12,12 @@ if(A2X)
+ if(DBLATEX)
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/manual.pdf
+ DEPENDS ${PROJECT_SOURCE_DIR}/*.txt
+- COMMAND ${A2X} --icons -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
++ COMMAND ${A2X} -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
+ set(DOC_DEPENDS ${PROJECT_BINARY_DIR}/manual.pdf)
+ endif(DBLATEX)
+ add_custom_command(OUTPUT ${PROJECT_BINARY_DIR}/manual.html
+ DEPENDS ${PROJECT_SOURCE_DIR}/*.txt
+- COMMAND ${A2X} -f xhtml --icons -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
++ COMMAND ${A2X} -f xhtml -D ${PROJECT_BINARY_DIR} ${PROJECT_SOURCE_DIR}/manual.txt)
+ set(DOC_DEPENDS ${DOC_DEPENDS} ${PROJECT_BINARY_DIR}/manual.html)
+ endif(A2X)
+
diff --git a/debian/patches/series b/debian/patches/series
index 11bc399..85bb231 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -2,3 +2,4 @@ include-and-libraries.diff
no-specific-nunit-version.diff
soname.diff
non-linux.diff
+no-icons.diff
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
Reply to: