[libdap] 02/06: * Add --enable-runtime-endian-check * Temporarily remove docs build with doxygen as doxygen not in experimental

Alastair McKinstry mckinstry at moszumanska.debian.org
Thu Jul 23 14:59:48 UTC 2015


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

mckinstry pushed a commit to branch debian/experimental
in repository libdap.

commit 5577c051f2bb736807328b4eb8e48939a535c339
Author: Alastair McKinstry <mckinstry at debian.org>
Date:   Tue Jul 14 09:47:48 2015 +0100

    * Add --enable-runtime-endian-check
    * Temporarily remove docs build with doxygen as doxygen not in experimental
---
 debian/changelog                  |  2 ++
 debian/control                    |  2 +-
 debian/libdap-doc.install         |  2 +-
 debian/patches/disable-docs.patch | 16 ++++++++++++++++
 debian/patches/series             |  1 +
 debian/rules                      |  2 +-
 6 files changed, 22 insertions(+), 3 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 08c3120..a5f1558 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -6,6 +6,8 @@ libdap (3.14.0-3~exp1) experimental; urgency=medium
     * libdapserver7 -> libdapserver7v5
   * Re-enable tests. This is known to break on big-endian archs at the moment
     [Bug forwarded to upstream]
+  * Add --enable-runtime-endian-check 
+  * Temporarily remove docs build with doxygen as doxygen not in experimental
 
  -- Alastair McKinstry <mckinstry at debian.org>  Thu, 09 Jul 2015 15:38:36 +0100
 
diff --git a/debian/control b/debian/control
index e6a80a0..99e98bb 100644
--- a/debian/control
+++ b/debian/control
@@ -4,7 +4,7 @@ Priority: optional
 Maintainer: Alastair McKinstry <mckinstry at debian.org>
 Build-Depends: zlib1g-dev, debhelper (>= 9), pkg-config, libxml2-dev, 
  libcurl4-gnutls-dev | libcurl-dev, 
- dejagnu, doxygen, graphviz, dh-autoreconf (>= 4~),
+ dejagnu, graphviz, dh-autoreconf (>= 4~),
  autoconf, automake, libtool, flex, bison, uuid-dev, libjs-jquery, libpth-dev, libssl-dev
 Build-Conflicts: autoconf2.13
 Standards-Version: 3.9.6
diff --git a/debian/libdap-doc.install b/debian/libdap-doc.install
index 3028050..2904bb4 100644
--- a/debian/libdap-doc.install
+++ b/debian/libdap-doc.install
@@ -1 +1 @@
-docs/html/* /usr/share/doc/libdap-doc/html
+# docs/html/* /usr/share/doc/libdap-doc/html
diff --git a/debian/patches/disable-docs.patch b/debian/patches/disable-docs.patch
new file mode 100644
index 0000000..26b6390
--- /dev/null
+++ b/debian/patches/disable-docs.patch
@@ -0,0 +1,16 @@
+Index: libdap-3.14.0/Makefile.am
+===================================================================
+--- libdap-3.14.0.orig/Makefile.am
++++ libdap-3.14.0/Makefile.am
+@@ -112,8 +112,9 @@ grammarfiles: $(GRAM_SRC)
+ 
+ .PHONY: docs
+ docs:
+-	doxygen $(srcdir)/doxy.conf
+-	(cd docs && tar -czf html.tar.gz html)
++	@echo Docs disabled
++# doxygen $(srcdir)/doxy.conf
++# (cd docs && tar -czf html.tar.gz html)
+ 
+ # cccc computes metrics like Lines of code and McCabe. It'a available
+ # on the web...
diff --git a/debian/patches/series b/debian/patches/series
index 216f3e7..2d34eac 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -1,3 +1,4 @@
 xml_libs.patch
 # testsuite-failures.patch
 pkgconfig.patch
+disable-docs.patch
diff --git a/debian/rules b/debian/rules
index 799cb61..f9326ec 100755
--- a/debian/rules
+++ b/debian/rules
@@ -24,7 +24,7 @@ override_dh_autoreconf:
 	dh_autoreconf --as-needed
 
 override_dh_auto_configure:
-	dh_auto_configure -- --with-gnu-ld
+	dh_auto_configure -- --with-gnu-ld --enable-runtime-endian-check=yes
 
 override_dh_auto_build:
 	# Strange bug causes lexer not to build first-time; need to make clean in subdir and restart 

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



More information about the debian-science-commits mailing list