This is an automated email from the git hooks/post-receive script.
tmancill pushed a commit to branch master
in repository disruptor.
commit 12cf2d52b5027bc1e62b3fca42e188780171a00e
Author: tony mancill <tmanc...@debian.org>
Date: Sun Oct 15 12:25:03 2017 -0700
use Files-Excluded in d/copyright for repacking upstream tarball
---
debian/copyright | 5 +++--
debian/orig-tar.sh | 21 ---------------------
debian/rules | 2 +-
debian/watch | 9 ++++++---
4 files changed, 10 insertions(+), 27 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index f41d52a..49b1c8c 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,17 +2,18 @@ Format:
http://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: Disruptor Framework
Upstream-Contact: Michael Barker <mike...@gmail.com>
Source: http://lmax-exchange.github.com/disruptor
+Files-Excluded: gradle lib gradlew gradlew.bat
Files: *
-Copyright: 2011-2013, LMAX Ltd
+Copyright: 2011-2017, LMAX Ltd
License: Apache-2.0
Files: debian/*
Copyright: 2014, Emmanuel Bourg <ebo...@apache.org>
+ 2016-2017, tony mancill <tmanc...@debian.org>
License: Apache-2.0
License: Apache-2.0
On Debian systems, the full text of the Apache-2.0 license
can be found in the file '/usr/share/common-licenses/Apache-2.0'
-
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 803c581..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,21 +0,0 @@
-#!/bin/sh
-set -e
-
-PACKAGE=$(dpkg-parsechangelog -S Source)
-VERSION=$2
-DIR=${PACKAGE}-${VERSION}
-TAR=../${PACKAGE}_${VERSION}.orig.tar.xz
-
-mkdir $DIR
-tar -xf $3 --strip-components=1 -C $DIR
-rm $3
-XZ_OPT=--best tar -c -v -J -f $TAR \
- --exclude '*.jar' \
- --exclude '*.bat' \
- --exclude '.settings' \
- --exclude '.classpath' \
- --exclude '.project' \
- --exclude '.idea' \
- --exclude '*.iml' \
- $DIR
-rm -Rf $DIR
diff --git a/debian/rules b/debian/rules
index f5b437d..e4630cd 100755
--- a/debian/rules
+++ b/debian/rules
@@ -18,7 +18,7 @@ override_dh_clean:
rm -f pom.xml
get-orig-source:
- uscan --download-current-version --force-download --rename
+ uscan --download-current-version --force-download --verbose
get-orig-pom:
wget
http://central.maven.org/maven2/com/lmax/disruptor/$(VERSION)/disruptor-$(VERSION).pom
-O debian/pom.xml
diff --git a/debian/watch b/debian/watch
index 06a85c9..3364707 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,6 @@
-version=3
-opts=uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/ \
-https://github.com/LMAX-Exchange/disruptor/releases .*/(\d.*).tar.gz debian
debian/orig-tar.sh
+version=4
+opts="dversionmangle=s/\+(dfsg|ds)$//;,\
+ compression=xz,\
+ repack,\
+
uversionmangle=s/(\d)[_\.\-\+]?((RC|rc|pre|dev|beta|alpha)\d*)$/$1~$2/" \
+ https://github.com/LMAX-Exchange/disruptor/releases .*/(\d.*).tar.gz
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/disruptor.git
_______________________________________________
pkg-java-commits mailing list
pkg-java-comm...@lists.alioth.debian.org
http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
