[testng] 03/04: Revert "switched to orig-tar.sh in d/watch"
Eugene Zhukov
eugene-guest at moszumanska.debian.org
Mon Nov 17 12:58:55 UTC 2014
This is an automated email from the git hooks/post-receive script.
eugene-guest pushed a commit to branch master
in repository testng.
commit 9fe33f6c5a6fb48dd2826aa62df68ec29c69a64a
Author: Eugene Zhukov <jevgeni.zh at gmail.com>
Date: Mon Nov 17 11:38:47 2014 +0000
Revert "switched to orig-tar.sh in d/watch"
This reverts commit a9bbfd0e3f8e852bf026899504be6ad5bba8e0f2.
---
debian/changelog | 2 +-
debian/copyright | 1 +
debian/orig-tar.sh | 14 --------------
debian/watch | 2 +-
4 files changed, 3 insertions(+), 16 deletions(-)
diff --git a/debian/changelog b/debian/changelog
index a838471..265fedb 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -3,7 +3,7 @@ testng (6.8.8-2) unstable; urgency=low
* Description updated.
* Switched from bsh (pulls in Java runtime) to libbsh-java dependency
(Closes: #684427)
- * Switched to orig-tar.sh in d/watch to exclude jquery-1.7.1.min.js
+ * Added Files-Excluded to d/copyright to exclude jquery-1.7.1.min.js
-- Eugene Zhukov <jevgeni.zh at gmail.com> Thu, 24 Apr 2014 08:53:40 +0000
diff --git a/debian/copyright b/debian/copyright
index 741e4d0..6b82a2f 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,7 @@
Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: TestNG
Source: http://testng.org
+Files-Excluded: jquery-1.7.1.min.js
Files: *
Copyright: 2013, Cedric Beust
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 080970c..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,14 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../testng_$VERSION.orig.tar.xz
-DIR=testng-testng-$VERSION
-
-tar zxf $3
-rm -f $3
-XZ_OPT=--best tar cJf $TAR \
- --exclude '*.jar' \
- --exclude '*.class' \
- --exclude 'src/main/resources/jquery-1.7.1.min.js' \
- $DIR
-rm -rf $DIR
diff --git a/debian/watch b/debian/watch
index bc0ea25..2526667 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,4 +1,4 @@
version=3
opts=dversionmangle=s/(\d)[\+\.](?:dfsg|debian|ds)\.?\d*$/$1/ \
https://github.com/cbeust/testng/tags \
-.*/archive/testng-(\d\S*)\.tar\.gz debian debian/orig-tar.sh
+.*/archive/testng-(\d\S*)\.tar\.gz debian jh_repack
--
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/testng.git
More information about the pkg-java-commits
mailing list