[graphite2] 51/69: Imported Debian patch 1.3.2-3
This is an automated email from the git hooks/post-receive script.
rene pushed a commit to branch master
in repository graphite2.
commit 2f22d019cc40a69a576077105b914502fcdb6879
Author: Rene Engelhard <rene@debian.org>
Date: Wed Sep 16 11:52:49 2015 +0200
Imported Debian patch 1.3.2-3
---
debian/changelog | 12 ++++++++++--
debian/libgraphite2-doc.install | 4 ++++
debian/rules | 6 +++++-
3 files changed, 19 insertions(+), 3 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index 32b0970..eadb61c 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,8 +1,16 @@
+graphite2 (1.3.2-3) experimental; urgency=medium
+
+ * don't run dh_auto_install when ./build/src/libgraphite2.so.3 doesn't exist
+ (as for dh_auto_test) so that we don't run a graphite build after building
+ the docs (as make install of course requires that). Install the docs
+ manually using .install
+
+ -- Rene Engelhard <rene@debian.org> Wed, 16 Sep 2015 11:52:49 +0200
+
graphite2 (1.3.2-2) experimental; urgency=medium
* check for existence of ./build/src/libgraphite2.so.3 before running
- dh_auto_test to skip the tests on "all" builds where we don't build
- graphite at all.
+ dh_auto_test to skip the tests on "all" builds
-- Rene Engelhard <rene@debian.org> Tue, 15 Sep 2015 08:13:13 +0200
diff --git a/debian/libgraphite2-doc.install b/debian/libgraphite2-doc.install
new file mode 100644
index 0000000..0b88be6
--- /dev/null
+++ b/debian/libgraphite2-doc.install
@@ -0,0 +1,4 @@
+./build/doc/manual.html /usr/share/doc/libgraphite2-doc
+./build/doc/manual.pdf /usr/share/doc/libgraphite2-doc
+./build/doc/doxygen/latex/refman.pdf /usr/share/doc/libgraphite2-doc
+./build/doc/doxygen/html /usr/share/doc/libgraphite2-doc
diff --git a/debian/rules b/debian/rules
index d5b107e..f6c8d39 100755
--- a/debian/rules
+++ b/debian/rules
@@ -23,7 +23,11 @@ override_dh_auto_build-indep:
# mono-xbuild NGraphite.sln
override_dh_auto_install:
- dh_auto_install
+ if [ -f ./build/src/libgraphite2.so.3 ]; then \
+ dh_auto_install; \
+ else \
+ dh_install -plibgraphite2-doc --sourcedir=$(CURDIR); \
+ fi
# cd perl && \
# ./Build install destdir=$(CURDIR)/debian/libtext-gr2-perl
# # hack
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-openoffice/graphite2.git
Reply to: