[texinfo] 12/18: update make-orig-tar for new non-free files

[Norbert Preining <preining@moszumanska.debian.org>]

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

preining pushed a commit to branch master
in repository texinfo.

commit 1282ad6cfd6dfc3f6d04570f0995e5f92113e849
Author: Norbert Preining <preining@debian.org>
Date:   Mon Feb 8 13:33:46 2016 +0900

    update make-orig-tar for new non-free files
---
 debian/make-orig-tar | 40 +++++++++++++++++++++++++---------------
 1 file changed, 25 insertions(+), 15 deletions(-)

diff --git a/debian/make-orig-tar b/debian/make-orig-tar
index ba6d549..c1301c8 100644
--- a/debian/make-orig-tar
+++ b/debian/make-orig-tar
@@ -6,10 +6,20 @@
 
 set -e
 
-nonfreefiles="fdl.texi	\
-	info-stnd.texi	\
-	texinfo.texi"
-addcopyfiles="version-stnd.texi version.texi"
+nonfreefiles="				\
+	doc/fdl.texi			\
+	doc/info-stnd.texi		\
+	doc/texinfo.texi		\
+	"
+
+removefiles="				\
+	info/t/infodir/info.info	\
+	"
+
+addcopyfiles="				\
+	doc/version-stnd.texi		\
+	doc/version.texi		\
+	"
 
 curdir=$(pwd)
 
@@ -52,29 +62,29 @@ fi
 mkdir texinfo-doc-nonfree-$fullversion
 
 mv texinfo-$version texinfo-${fullversion}.dfsg.1
-cd texinfo-${fullversion}.dfsg.1/doc
+cd texinfo-${fullversion}.dfsg.1
 for i in $nonfreefiles $addcopyfiles ; do
   cp $i ../../texinfo-doc-nonfree-$fullversion
 done
-for i in $nonfreefiles ; do
+for i in $nonfreefiles $removefiles ; do
   rm $i
 done
 
-cd ../..
+cd ..
 
-tar -cJf texinfo_${fullversion}.dfsg.1.tar.xz texinfo-${fullversion}.dfsg.1
-tar -cJf texinfo-doc-nonfree_${fullversion}.tar.xz texinfo-doc-nonfree-$fullversion
+tar -cJf texinfo_${fullversion}.dfsg.1.orig.tar.xz texinfo-${fullversion}.dfsg.1
+tar -cJf texinfo-doc-nonfree_${fullversion}.orig.tar.xz texinfo-doc-nonfree-$fullversion
 
-if [ -r "$curdir/texinfo_${fullversion}.dfsg.1.tar.xz" ] ; then
-  echo "texinfo_${fullversion}.dfsg.1.tar.xz already present in cwd, leaving it in $tmpdir"
+if [ -r "$curdir/texinfo_${fullversion}.dfsg.1.orig.tar.xz" ] ; then
+  echo "texinfo_${fullversion}.dfsg.1.orig.tar.xz already present in cwd, leaving it in $tmpdir"
 else
-  mv texinfo_${fullversion}.dfsg.1.tar.xz "$curdir"
+  mv texinfo_${fullversion}.dfsg.1.orig.tar.xz "$curdir"
 fi
 
-if [ -r "$curdir/texinfo-doc-nonfree_${fullversion}.tar.xz" ] ; then
-  echo "texinfo-doc-nonfree_${fullversion}.tar.xz already present in cwd, leaving it in $tmpdir"
+if [ -r "$curdir/texinfo-doc-nonfree_${fullversion}.orig.tar.xz" ] ; then
+  echo "texinfo-doc-nonfree_${fullversion}.orig.tar.xz already present in cwd, leaving it in $tmpdir"
 else
-  mv texinfo-doc-nonfree_${fullversion}.tar.xz "$curdir"
+  mv texinfo-doc-nonfree_${fullversion}.orig.tar.xz "$curdir"
 fi
 
 rm -rf texinfo-${fullversion}.dfsg.1

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/debian-tex/texinfo.git