[mina2] 03/04: No longer remove the jar, vsd and javadoc files

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository mina2.

commit 59e512d0985568d6abe3cdf824c3b5cd128f08e6
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Tue May 12 13:10:45 2015 +0200

    No longer remove the jar, vsd and javadoc files
---
 debian/README.source | 10 ----------
 debian/changelog     |  2 ++
 debian/orig-tar.sh   | 17 +++--------------
 3 files changed, 5 insertions(+), 24 deletions(-)

diff --git a/debian/README.source b/debian/README.source
deleted file mode 100644
index c6ca0a0..0000000
--- a/debian/README.source
+++ /dev/null
@@ -1,10 +0,0 @@
-Repackaged upstream tarball (aka +dfsg version)
-===============================================
-
-  The upstream tarball of mina as been stripped to make a DFSG version.
-  Items removed from upstream :
-  - all packaged JAR
-  - non-free VSD files (MS Visio)
-  - generated Javadoc and Xref
-  - LICENCE.*.txt from other projects
-
diff --git a/debian/changelog b/debian/changelog
index 1fbb4af..1d63ecf 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,8 @@ mina2 (2.0.7+dfsg-3) UNRELEASED; urgency=medium
 
   * debian/orig-tar.sh:
     - No longer filter out the MD4 classes (removed upstream)
+    - No longer remove the jar, vsd and javadoc files
+      (removed from the source distribution)
     - Use XZ compression for the upstream tarball
   * debian/watch: Updated to detect the latest releases
   * Moved the package to Git
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index ba38626..8f849a6 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -1,25 +1,14 @@
 #!/bin/sh -e
 
-# Make a DFSG version of upstream tarball
-# - remove all packaged JAR
-# - remove non-free VSD files (MS Visio)
-# - remove generated Javadoc and Xref
-# - remove LICENCE.*.txt from other projects
-
-# $2 = version
-# $3 = file
-DIR=mina2-$2.orig
-TAR=../mina2_$2+dfsg.orig.tar.xz
+VERSION=$2
+DIR=mina2-$VERSION.orig
+TAR=../mina2_$VERSION.orig.tar.xz
 
 # clean up the upstream tarball
 tar zxf $3
 mv apache-mina-* $DIR
 XZ_OPT=--best tar cJvf $TAR \
-    --exclude '*.jar' \
-    --exclude '*.vsd' \
-    --exclude 'docs/*' \
     --exclude 'LICENSE.*.txt' \
-    --exclude 'src/mina-core/bin/*' \
     $DIR
 rm -rf $DIR
 rm $3

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