[activemq] 01/04: exclude from orig.tar non-sourced .js

[Eugene Zhukov]

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

eugene-guest pushed a commit to branch master
in repository activemq.

commit d980f386229237dc9d0f9e6f79ba6aeff88145b3
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date:   Fri Aug 22 07:23:35 2014 +0000

    exclude from orig.tar non-sourced .js
---
 debian/README.source | 28 ----------------------------
 debian/orig-tar.sh   | 11 ++++++++++-
 debian/rules         |  2 +-
 3 files changed, 11 insertions(+), 30 deletions(-)

diff --git a/debian/README.source b/debian/README.source
index 81cb7a3..ee975d6 100644
--- a/debian/README.source
+++ b/debian/README.source
@@ -7,31 +7,3 @@ from the maven-debian-helper package.
 The build system uses Maven but prevents it from downloading
 anything from the Internet, making the build compliant with
 the Debian policy.
-
-
-Cleanup for DFSG
-----------------
-Build upstream tarball from SVN tag :
-  debian/rules get-orig-source
-
-Import upstream tarball without merging to debian (master) branch :
-  git-import-orig --no-merge activemq_5.5.0.orig.tar.gz
-  git tag upstream/5.5.0
-
-Switch to dfsg_clean branch to do the real cleanup :
-  git checkout dfsg_clean
-  git pull . upstream
-  git rm -r assembly/src/release/bin/linux-x86-32
-  git rm -r assembly/src/release/bin/linux-x86-64/
-  git rm -r assembly/src/release/bin/macosx/
-  git rm -r assembly/src/release/bin/solaris/
-  git rm -r assembly/src/release/bin/win32/
-  git commit -a -m "Make source dfsg clean"
-  git tag upstream/5.5.0+dfsg
-  git tar-tree upstream/5.5.0+dfsg activemq-5.5.0+dfsg | gzip > activemq_5.5.0+dfsg.orig.tar.gz
-  pristine-tar commit activemq_5.5.0+dfsg.orig.tar.gz
-
-Merge back changes into debian (master) branch :
-  git checkout master
-  git pull . dfsg_clean
-
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
index 60f25e8..cef1648 100755
--- a/debian/orig-tar.sh
+++ b/debian/orig-tar.sh
@@ -6,7 +6,16 @@ DIR=activemq-$VERSION
 TAG=$(echo "activemq-$VERSION" | sed -re's/~(alpha|beta)/-\1-/')
 
 svn export https://svn.apache.org/repos/asf/activemq/tags/${TAG}/ $DIR
-XZ_OPT=--best tar -c -J -f $TAR --exclude '*.jar' --exclude '*.class' $DIR
+XZ_OPT=--best tar -c -J -f $TAR \
+  --exclude '*.jar' \
+  --exclude '*.class' \
+  --exclude 'activemq-web-demo/src/main/webapp/js/dojo.js' \
+  --exclude 'activemq-web-demo/src/main/webapp/js/jquery-1.4.2.min.js' \
+  --exclude 'assembly/src/release/bin/linux-x86*' \
+  --exclude 'assembly/src/release/bin/macosx' \
+  --exclude 'assembly/src/release/bin/solaris' \
+  --exclude 'assembly/src/release/bin/win*' \
+$DIR
 rm -rf $DIR ../$TAG
 
 # move to directory 'tarballs'
diff --git a/debian/rules b/debian/rules
index 14ca1bd..4a8667c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -13,4 +13,4 @@ binary-post-install/activemq::
 	chmod 644 debian/activemq/usr/share/activemq/README.txt
 
 get-orig-source:
-	uscan --force-download --rename
+	uscan --force-download --rename --verbose --download-current-version --no-symlink

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