[code-saturne] 01/03: Conform to Devs Referance §6.7.8.2 when repacking

[Gilles Filippini]

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

pini pushed a commit to branch master
in repository code-saturne.

commit 124feec71e55b132390fab28eda410ab427a0676
Author: Gilles Filippini <pini at debian.org>
Date:   Mon Mar 30 21:45:36 2015 +0200

    Conform to Devs Referance §6.7.8.2 when repacking
---
 debian/README.source | 12 ++++++++++++
 debian/changelog     |  9 +++++++++
 debian/orig-tar.sh   |  6 +++---
 3 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/debian/README.source b/debian/README.source
new file mode 100644
index 0000000..a2f20ea
--- /dev/null
+++ b/debian/README.source
@@ -0,0 +1,12 @@
+Repackaged upstream source
+--------------------------
+
+We don't use the pristine upstream tarball. We build our own directly
+from upstream's SVN repository instead. This is because the pristine
+tarball contains many generated files:
+- doxygen docs
+- flex + bison C modules
+- gettext object files
+and misses some files needed to rebuild everything from source.
+
+See the script debian/orig-tar.sh for the details.
diff --git a/debian/changelog b/debian/changelog
index be5aa38..41863f2 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,12 @@
+code-saturne (3.3.3+svn-1~exp3) UNRELEASED; urgency=medium
+
+  * Better conformance to Devs Reference §6.7.8.2 when repacking
+    upstream source:
+    - Mangled version = <upstream version>+repack
+    - Use code-saturne-<upstream-version>.orig as top level directory name.
+
+ -- Gilles Filippini <pini at debian.org>  Mon, 30 Mar 2015 21:38:57 +0200
+
 code-saturne (3.3.3+svn-1~exp2) experimental; urgency=medium
 
   * New patch ac_init.patch to initialise the build chain with
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 1475f0c..c6d7930 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -13,14 +13,14 @@ set -e
 # and misses some files needed to rebuild everything from source.
 
 UPSTREAM_VERSION="$2"
-UPSTREAM_VERSION_SVN="$UPSTREAM_VERSION+svn"
+UPSTREAM_VERSION_MANGLED="$UPSTREAM_VERSION+repack"
 UPSTREAM_SVN_TAG=V"$(echo "$UPSTREAM_VERSION" | sed 's/\./_/g')"
 UPSTREAM_SVN_URI="http://code-saturne.org/svn/saturne/tags/$UPSTREAM_SVN_TAG"
 PACKAGE=$(basename "$3" "_$UPSTREAM_VERSION.orig.tar.gz")
 
 SOURCE_DIR="$PACKAGE-$UPSTREAM_VERSION"
-DEBIAN_SOURCE_DIR="$PACKAGE-$UPSTREAM_VERSION_SVN"
-TAR="../${PACKAGE}_$UPSTREAM_VERSION_SVN.orig.tar.gz"
+DEBIAN_SOURCE_DIR="$PACKAGE-$UPSTREAM_VERSION.orig"
+TAR="../${PACKAGE}_$UPSTREAM_VERSION_MANGLED.orig.tar.gz"
 CPPLUS_RM_NAME=cpplus_RM
 
 # SVN export

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