This is an automated email from the git hooks/post-receive script.
seamlik-guest pushed a commit to branch master
in repository bnd.
commit 9e96c63eea6b05d935d1ef55b0b27c0ce019ba15
Author: 殷啟聰 | Kai-Chung Yan <seamli...@gmail.com>
Date: Tue Feb 27 16:57:43 2018 +0800
get-orig-source: Use simple uscan approach
---
debian/copyright | 1 +
debian/git-transform.sh | 35 -----------------------------------
debian/orig-tar.sh | 20 --------------------
debian/rules | 2 +-
debian/watch | 4 ++--
5 files changed, 4 insertions(+), 58 deletions(-)
diff --git a/debian/copyright b/debian/copyright
index 1d40ad7..4a7bea4 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -2,6 +2,7 @@ Format:
https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: BND
Upstream-Contact: Peter Kriens, aQute SARL
Source: https://github.com/bndtools/bnd
+Files-Excluded: *.class *.jar *.jclass *.clazz *.bar
Files: *
Copyright: 2006-2015, aQute SARL
diff --git a/debian/git-transform.sh b/debian/git-transform.sh
deleted file mode 100755
index 4b6de2b..0000000
--- a/debian/git-transform.sh
+++ /dev/null
@@ -1,35 +0,0 @@
-#!/bin/bash
-# Usage: git-transform src dest
-
-set -e
-
-SRC=$1
-DEST=$2
-SRC=${SRC:-bnd-git}
-DEST=${DEST:-bnd-clean}
-VERSION=$(dpkg-parsechangelog | egrep '^Version:' | cut -f 2 -d ' '| cut -d:
-f2- | cut -d'-' -f 1)
-
-rm -rf $DEST
-
-echo "Copy files..."
-rsync --cvs-exclude -r --exclude '**/*.class' --exclude '**/*.jar' --exclude
'.git*' $SRC/ $DEST/
-
-echo "Cleanup..."
-
-# Remove all JARs
-find $DEST/cnf/repo/ -name "*.jar" -delete
-rm -rf $DEST/biz.aQute.bndlib/maven/org/apache
-rm -rf $DEST/biz.aQute.bndlib/jar/
-
-# Remove Eclipse compiler, not needed and under EPL-v1
-rm -rf $DEST/biz.aQute.eclipse.compiler
-
-# Remove bld (to many dependencies)
-rm -rf $DEST/biz.aQute.bld
-
-# Cleanup of binary blobs
-rm -rf $DEST/biz.aQute.bndlib/test/maven-repo/
-rm -rf $DEST/biz.aQute.bndlib/src/test/*.jclass
-rm -rf $DEST/biz.aQute.bndlib/src/test/*.clazz
-rm -rf $DEST/biz.aQute.bndlib/test/beasymock.bar
-rm -rf $DEST/biz.aQute.bndlib/test/eclipse/plugins/beasymock.bar
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index 789a2f3..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-VERSION=$2
-TAR=../bnd_$VERSION.orig.tar.xz
-DIR=bnd-$VERSION
-GIT_DIR=bnd-git
-
-git clone git://github.com/bndtools/bnd.git $GIT_DIR
-(
- cd $GIT_DIR
- git checkout "${VERSION}.REL"
-)
-
-# Bnd git cleanup
-chmod +x debian/git-transform.sh
-debian/git-transform.sh $GIT_DIR $DIR
-
-XZ_OPT=--best tar -c -J -f $TAR $DIR
-rm -rf $DIR
-rm -rf $GIT_DIR
diff --git a/debian/rules b/debian/rules
index bf9c2af..177299c 100755
--- a/debian/rules
+++ b/debian/rules
@@ -141,7 +141,7 @@ override_dh_auto_clean:
$(RM) -r biz.aQute.bnd.annotation/src
get-orig-source:
- debian/orig-tar.sh "" $(VERSION)
+ uscan --download-current-version --force-download --repack
--compression xz
get-orig-pom:
wget --user-agent="" -O debian/pom-bnd.xml
$(MAVEN_REPO)/bnd/bnd/$(MAVEN_VERSION)/bnd-$(MAVEN_VERSION).pom
diff --git a/debian/watch b/debian/watch
index 249665a..9ecfd79 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,2 +1,2 @@
-version=3
-https://github.com/bndtools/bnd/releases .*/([\d\.]+)(?:.REL)?.tar.gz debian
debian/orig-tar.sh
+version=4
+https://github.com/bndtools/bnd/tags
/bndtools/bnd/archive/@ANY_VERSION@.REL@ARCHIVE_EXT@
\ No newline at end of file
--
Alioth's /usr/local/bin/git-commit-notice on
/srv/git.debian.org/git/pkg-java/bnd.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
