[ocl-icd] 01/01: cleanup packaging

[Vincent Danjean]

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

vdanjean pushed a commit to branch master
in repository ocl-icd.

commit 08ad6d7af2a899f95e53b53f727f4c64a9d7129d
Author: Vincent Danjean <Vincent.Danjean at ens-lyon.org>
Date:   Tue Jun 9 11:53:18 2015 +0200

    cleanup packaging
    
    avoid running autoreconf both times
    avoid hack to set (reproductible) date in documentation (Closes: #747720)
      hurd-i386 should work now
    run all tests on mips64
---
 debian/a2x                                             |  6 ------
 debian/asciidoc                                        |  6 ------
 debian/changelog                                       | 10 ++++++++++
 .../backport-from-upstream-fix-revdate-in-doc.patch    | 13 +++++++++++++
 debian/patches/series                                  |  1 +
 debian/rules                                           | 18 ++++++------------
 6 files changed, 30 insertions(+), 24 deletions(-)

diff --git a/debian/a2x b/debian/a2x
deleted file mode 100755
index 7c2057a..0000000
--- a/debian/a2x
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-CHANGELOG="$(dirname "$0")/changelog"
-DATE_CHANGELOG="$(dpkg-parsechangelog -l"$CHANGELOG" --show-field Date)"
-DATE="$(date --utc -d "$DATE_CHANGELOG" --rfc-3339 second )"
-set -x
-exec faketime -f "$DATE" a2x "$@"
diff --git a/debian/asciidoc b/debian/asciidoc
deleted file mode 100755
index fb574ff..0000000
--- a/debian/asciidoc
+++ /dev/null
@@ -1,6 +0,0 @@
-#!/bin/sh
-CHANGELOG="$(dirname "$0")/changelog"
-DATE_CHANGELOG="$(dpkg-parsechangelog -l"$CHANGELOG" --show-field Date)"
-DATE="$(date --utc -d "$DATE_CHANGELOG" --rfc-3339 second )"
-set -x
-exec faketime -f "$DATE" asciidoc "$@"
diff --git a/debian/changelog b/debian/changelog
index f36bc0e..03f7ecd 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,13 @@
+ocl-icd (2.2.7-2) unstable; urgency=medium
+
+  * cleanup packaging
+    + avoid running autoreconf both times
+    + avoid hack to set (reproductible) date in documentation (Closes: #747720)
+      hurd-i386 should work now
+    + run all tests on mips64
+
+ -- Vincent Danjean <vdanjean at debian.org>  Tue, 09 Jun 2015 11:49:27 +0200
+
 ocl-icd (2.2.7-1) unstable; urgency=medium
 
   * New upstream release
diff --git a/debian/patches/backport-from-upstream-fix-revdate-in-doc.patch b/debian/patches/backport-from-upstream-fix-revdate-in-doc.patch
new file mode 100644
index 0000000..dd1ac3b
--- /dev/null
+++ b/debian/patches/backport-from-upstream-fix-revdate-in-doc.patch
@@ -0,0 +1,13 @@
+diff --git a/doc/libOpenCL.7.txt b/doc/libOpenCL.7.txt
+index b07fcd3..7b28c45 100644
+--- a/doc/libOpenCL.7.txt
++++ b/doc/libOpenCL.7.txt
+@@ -2,6 +2,8 @@ libOpenCL(7)
+ ============
+ Vincent Danjean <Vincent.Danjean at ens-lyon.org>
+ :Author Initials: VD
++:revdate: 2015-06-08
++:footer-style: revdate
+ :toc:
+ :icons:
+ :numbered:
diff --git a/debian/patches/series b/debian/patches/series
index e69de29..567503a 100644
--- a/debian/patches/series
+++ b/debian/patches/series
@@ -0,0 +1 @@
+backport-from-upstream-fix-revdate-in-doc.patch
diff --git a/debian/rules b/debian/rules
index 18d2515..02f46f4 100755
--- a/debian/rules
+++ b/debian/rules
@@ -12,20 +12,14 @@
 %:
 	dh $@ --parallel --with autoreconf
 
+.PHONY: override_dh_autoreconf
+override_dh_autoreconf:
+	dh_autoreconf ./bootstrap
+
 .PHONY: override_dh_auto_configure
 override_dh_auto_configure:
-	./bootstrap
-	env ASCIIDOC="$(CURDIR)/debian/asciidoc" \
-	    A2X="$(CURDIR)/debian/a2x" \
-		dh_auto_configure -- --disable-debug --disable-update-database \
-			--enable-official-khronos-headers
-
-DEB_HOST_ARCH:=$(shell dpkg-architecture -qDEB_HOST_ARCH)
-ifneq ($(filter mips64%,$(DEB_HOST_ARCH)),)
-.PHONY: override_dh_auto_test
-override_dh_auto_test:
-	dh_auto_test -- TESTSUITEFLAGS="-4 6-"
-endif
+	dh_auto_configure -- --disable-debug --disable-update-database \
+		--enable-official-khronos-headers
 
 .PHONY: override_dh_shlibdeps
 override_dh_shlibdeps:

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/ocl-icd.git