[hdf5] 01/08: Remove generated doc files from upstream tarball

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository hdf5.

commit 0f37ba7e829fa89f6bb360d3ce725a2a941c8b5d
Author: Gilles Filippini <pini at debian.org>
Date:   Sun May 4 09:28:14 2014 +0200

    Remove generated doc files from upstream tarball
    
    C++ doxygen files Will be generated at build time.
    Embedded PHP scriptlets will be processed at build time.
    
    .
---
 debian/changelog   |  9 +++++++++
 debian/control.in  |  2 +-
 debian/orig-tar.sh | 12 ++++++------
 debian/watch       |  3 ++-
 4 files changed, 18 insertions(+), 8 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index ed29acd..b376da5 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+hdf5 (1.8.12+docs1-1) UNRELEASED; urgency=medium
+
+  * Repack upstream docs without doxygen generated C++ doc. Generate
+     C++ doc at build time.
+  * Build-Depends: doxygen
+  * debian/watch: use dversionmangle
+
+ -- Gilles Filippini <pini at debian.org>  Sun, 04 May 2014 08:59:38 +0200
+
 hdf5 (1.8.12+docs-1.1) unstable; urgency=medium
 
   * Non-maintainer upload.
diff --git a/debian/control.in b/debian/control.in
index cf42fb6..a72dd1f 100644
--- a/debian/control.in
+++ b/debian/control.in
@@ -8,7 +8,7 @@ Uploaders: Francesco Paolo Lovergine <frankie at debian.org>,
 Build-Depends: dpkg-dev (>= 1.16.1~), libmpich-dev, zlib1g-dev,
  libopenmpi-dev [!hppa !mips !mipsel !s390 !s390x !sh4 !m68k], libjpeg-dev, debhelper (>= 9~), sed (>=4.1.5),
  gfortran, libibverbs-dev [!arm64 !arm !hppa !mips !mipsel !s390 !s390x !kfreebsd-i386 !kfreebsd-amd64 !hurd-i386 !sh4],
- sharutils, mpi-default-dev, chrpath, autotools-dev, automake, dh-autoreconf
+ sharutils, mpi-default-dev, chrpath, autotools-dev, automake, dh-autoreconf, doxygen
 Standards-Version: 3.9.5
 Homepage: http://hdfgroup.org/HDF5/
 Vcs-Browser: http://anonscm.debian.org/gitweb/?p=pkg-grass/hdf5.git
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 87c2de4..ed06ac5 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -2,17 +2,18 @@
 # Called from uscan with parameters:
 # --upstream-version <release> <path-to-upstream.orig.tar.gz>
 #
-# Require svn and php
+# Require svn
 set -e
 
 UPSTREAM_VERSION="$2"
-UPSTREAM_VERSION_DOC="$UPSTREAM_VERSION+docs"
+UPSTREAM_VERSION_DOC="$UPSTREAM_VERSION+docs1"
 PACKAGE=$(basename "$3" "_$UPSTREAM_VERSION.orig.tar.gz")
 
 SOURCE_DIR="$PACKAGE-$UPSTREAM_VERSION"
 DEBIAN_SOURCE_DIR="$PACKAGE-$UPSTREAM_VERSION_DOC"
 TAR="../${PACKAGE}_$UPSTREAM_VERSION_DOC.orig.tar.gz"
 HTML_DIR="$DEBIAN_SOURCE_DIR/html"
+CPPLUS_RM_NAME=cpplus_RM
 
 # extract the upstream archive
 tar xf $3
@@ -26,10 +27,9 @@ tar c -X debian/orig-tar.exclude "$SOURCE_DIR" | tar x --transform "s,^$SOURCE_D
 
 # remove empty directories
 find "$HTML_DIR" -type d -empty -delete
-# process php in html files
-find "$HTML_DIR"/ -type f -iname '*.html' \
-  -execdir /bin/sh -c "/usr/bin/php -f '{}' > '{}.new'" \; \
-  -exec mv "{}.new" "{}" \;
+# remove c++ docs (will be generated at build time with doxygen)
+# see bin/release
+rm -fr "$HTML_DIR/$CPPLUS_RM_NAME"
 
 # repack into orig.tar.gz
 tar -c -z -f "$TAR" "$DEBIAN_SOURCE_DIR/"
diff --git a/debian/watch b/debian/watch
index 7bc75d7..3ef7042 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,5 @@
 version=3
-ftp://ftp.hdfgroup.org/HDF5/current/src/ \
+opts="dversionmangle=s/\+docs\d*$//" \
+	ftp://ftp.hdfgroup.org/HDF5/current/src/ \
 	hdf5-(.*)\.tar\.gz \
 	debian debian/orig-tar.sh

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-grass/hdf5.git