[knopflerfish-osgi] 04/12: debian/watch: Track the release tags on GitHub

[Emmanuel Bourg]

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

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

commit d43d72caff88750486c5ebd75aa77ab0683f1b7f
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Mon Oct 3 15:37:20 2016 +0200

    debian/watch: Track the release tags on GitHub
---
 debian/changelog     |  1 +
 debian/clean-sources | 50 --------------------------------------------------
 debian/copyright     |  7 +++++++
 debian/rules         |  2 +-
 debian/watch         |  2 +-
 5 files changed, 10 insertions(+), 52 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index f9fe3b2..d158e38 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -4,6 +4,7 @@ knopflerfish-osgi (5.1.0+dfsg1-4) UNRELEASED; urgency=medium
   * Depend on libasm-java (>= 5.0) instead of libasm4-java
   * Standards-Version updated to 3.9.8
   * Use secure Vcs-* URLs
+  * debian/watch: Track the release tags on GitHub
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 03 Oct 2016 15:19:28 +0200
 
diff --git a/debian/clean-sources b/debian/clean-sources
deleted file mode 100755
index 3716e67..0000000
--- a/debian/clean-sources
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/bin/sh -x
-
-PACKAGE="knopflerfish-osgi"
-
-# NOTE: this script expects a .tar.gz as third argument (uscan always repacks...)
-if [ $# -ne 3 ] || [ $1 != '--upstream-version' ]
-then
-	echo "Call: $0 --upstream-version <version> <file>" >&2
-	echo "Example: $0 --upstream-version 5.1.0 ../knopflerfish-osgi_5.1.0.orig.tar.gz" >&2
-	echo "See manpage USCAN(1) for more details" >&2
-	exit 2
-fi
-
-version="$2"
-file="$3"
-
-basedir=$(dirname "$file")
-packdir="${basedir}/${PACKAGE}-${version}"
-
-if [ -d ../tarballs ]
-then # structure of svn-buildpackage
-	origtar="../tarballs/${PACKAGE}_${version}.orig.tar.gz"
-else
-	origtar="${basedir}/${PACKAGE}_${version}.orig.tar.gz"
-fi
-
-if [ -d "${packdir}" ]
-then
-	rm -rI "${packdir}"
-fi
-
-mkdir "${packdir}"
-tar -xzf "${file}" -C "${packdir}" || exit 1
-find "${packdir}" -name \*.zip -o -name \*.jar -o -name \*.class -o -name \*.dll -o -name \*.exe -o -name \*.so | xargs rm -f 
-rm -fr "${packdir}/docs/javadoc"
-rm -fr "${packdir}/noia/"
-rm -fr "${packdir}/tools/"
-rm -fr "${packdir}/osgi/bundles/"
-rm -fr "${packdir}/osgi/bundles_examples/"
-rm -fr "${packdir}/osgi/bundles_opt/"
-rm -fr "${packdir}/osgi/bundles_test/"
-rm -fr "${packdir}/osgi/jars/"
-rm -fr "${packdir}/osgi/test_jars/"
-rm -fr "${packdir}/osgi/ee/"
-rm -f "${packdir}/osgi/framework/resources/tstamp"
-tar czf "${origtar}" -C "${basedir}" $(basename "${packdir}") || exit 1
-
-echo "Original source file saved to '${origtar}'."
-
-rm -rf "${packdir}"
diff --git a/debian/copyright b/debian/copyright
index 06e5793..0fac532 100644
--- a/debian/copyright
+++ b/debian/copyright
@@ -1,6 +1,13 @@
 Format: http://www.debian.org/doc/packaging-manuals/copyright-format/1.0
 Source: http://www.knopflerfish.org/
 Upstream-Contact: Makewave <info at makewave.com>.
+Files-Excluded: *.jar
+                osgi/bundles
+		osgi/bundles_examples
+		osgi/bundles_opt
+		osgi/bundles_test
+		osgi/ee
+		tools
 
 Files: *
 Copyright:
diff --git a/debian/rules b/debian/rules
index c9c77ee..f2cb38a 100755
--- a/debian/rules
+++ b/debian/rules
@@ -28,7 +28,7 @@ build/libknopflerfish-osgi-java-doc::
 
 # Get original sources directly using uscan
 get-orig-source:
-	uscan --force-download
+	uscan --force-download --download-current-version --rename --repack --compression xz
 
 # we don't need jh_manifest and it has a bug:
 #JH_MANIFEST_ARGS := -V
diff --git a/debian/watch b/debian/watch
index 8cd274d..e682c2b 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,3 @@
 version=3
 opts=dversionmangle=s/\+dfsg[1-9]// \
-http://www.knopflerfish.org/releases/([\d\.]+)/knopflerfish_osgi_sdk_([\d\.]+)\.jar debian ./debian/clean-sources
+https://github.com/knopflerfish/knopflerfish.org/tags .*/archive/([\d\.]+).tar.gz

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