[syrthes/master] Adapt debian/watch and orig-tar.* to release 3.4.3

[Gilles Filippini]

---
 debian/orig-tar.exclude |    4 ++++
 debian/orig-tar.sh      |   27 +++++++++++++--------------
 debian/watch            |   11 ++++-------
 3 files changed, 21 insertions(+), 21 deletions(-)

diff --git a/debian/orig-tar.exclude b/debian/orig-tar.exclude
index e52ac16..a8cc32a 100644
--- a/debian/orig-tar.exclude
+++ b/debian/orig-tar.exclude
@@ -1 +1,5 @@
 */doc
+bin/Linux_x86_64
+lib
+*~
+example/cylinder/syrthes
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index dc18efa..30824f2 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,6 +1,7 @@
 #!/bin/sh -e
 
-# called by uscan with '--upstream-version' <version> <file>
+# To be used with the same args as if it were called by uscan:
+# debian/orig-tar.sh --upstream-version <version> <file>
 SOURCE_NAME=syrthes
 VERSION=$2
 DEBIAN_VERSION=$VERSION-dfsg1
@@ -8,19 +9,17 @@ UPSTREAM_SOURCE_DIR=${SOURCE_NAME}$VERSION
 DEBIAN_SOURCE_DIR=${SOURCE_NAME}-$DEBIAN_VERSION
 TAR=../${SOURCE_NAME}_$DEBIAN_VERSION.orig.tar.gz
 
-# clean up the upstream tarball
-tar xzf $3 
+# extract the upstream archive
+unzip $3 >/dev/null
 # rename upstream source dir
 mv ${UPSTREAM_SOURCE_DIR} ${DEBIAN_SOURCE_DIR}
-# Remove syrthes documentation besause of the license issues
+# convert text files from dos to unix
+for file in $(find ${DEBIAN_SOURCE_DIR} -type f); do
+  if file -b $file | egrep -w 'FORTRAN program|text' >/dev/null; then
+    fromdos -o $file
+  fi
+done
+# repack into orig.tar.gz without unwanted files
 tar -c -z -X debian/orig-tar.exclude -f $TAR ${DEBIAN_SOURCE_DIR}/
-rm -rf ${DEBIAN_SOURCE_DIR} $3
-echo "syrthes: Applied DFSG removals and renamed tarball to `basename ${TAR}`"
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
-    . .svn/deb-layout
-    mv $TAR $origDir
-    echo "moved $TAR to $origDir"
-fi
-
+rm -rf ${DEBIAN_SOURCE_DIR}
+echo "syrthes: Applied DFSG removals and renamed archive to `basename ${TAR}`"
diff --git a/debian/watch b/debian/watch
index 6f1d984..09e80ad 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,8 +1,5 @@
 version=3
-# dversionmangle is used to remove the dfsg from the local debian version
-# filenamemangle is used to get ride of the () and save the tarball under the right name
-opts="dversionmangle=s/-dfsg.*//,filenamemangle=s/.*(\d)_(\d)_(\d).*/syrthes_$1.$2.$3.orig.tar.gz/" \
-http://research.edf.com/the-edf-offers/research-and-development/softwares/syrthes/syrthes-telechargement-en-600883.html .*/syrthes(\d)_(\d)_(\d).*\.tgz \
-debian debian/orig-tar.sh
-
-
+# syrthes upstream archives can't be watched using uscan.
+# I download the archive by hand and apply the script debian/orig-tar.sh the
+# same way uscan would have:
+# debian/orig-tar.sh --upstream-version <version> <archive>
-- 
1.7.1