[knopflerfish-osgi] 01/13: adapt watch file and clean-sources for 5.1.0

[Felix Natter]

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

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

commit a711e0988ca0877bedd9ac423a3c8f55022028cd
Author: Felix Natter <fnatter at gmx.net>
Date:   Tue Mar 3 19:22:58 2015 +0100

    adapt watch file and clean-sources for 5.1.0
---
 debian/clean-sources | 21 ++++++++++++++++-----
 debian/watch         | 26 ++------------------------
 2 files changed, 18 insertions(+), 29 deletions(-)

diff --git a/debian/clean-sources b/debian/clean-sources
index b582c9b..3716e67 100755
--- a/debian/clean-sources
+++ b/debian/clean-sources
@@ -2,10 +2,11 @@
 
 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 2.3.3 ../knopflerfish_osgi_2.3.3.jar" >&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
@@ -28,10 +29,20 @@ then
 	rm -rI "${packdir}"
 fi
 
-unzip -q -d "${packdir}" "${file}" || exit 1
-find "${packdir}" -name \*.zip -o -name \*.jar -o -name \*.class -o -name \*.dll -o -name \*.exe | xargs rm -f 
-rm -fr "${packdir}/knopflerfish.org/docs/javadoc"
-rm -f "${packdir}/knopflerfish.org/osgi/framework/resources/tstamp"
+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}'."
diff --git a/debian/watch b/debian/watch
index 7f96e70..8cd274d 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,25 +1,3 @@
-# Example watch control file for uscan
-# Rename this file to "watch" and then you can run the "uscan" command
-# to check for upstream updates and more.
-# See uscan(1) for format
-
-# Compulsory line, this is a version 3 file
 version=3
-
-http://www.knopflerfish.com/releases/([\d\.]+)/knopflerfish_osgi_([\d\.]+)\.jar debian ./debian/clean-sources
-
-# Uncomment to examine a Webpage
-# <Webpage URL> <string match>
-#http://www.knopflerfish.com/download.html knopflerfish_osgi_(.*)\.jar
-
-# Uncomment to examine a Webserver directory
-#http://www.example.com/pub/knopflerfish-osgi-(.*)\.tar\.gz
-
-# Uncommment to examine a FTP server
-#ftp://ftp.example.com/pub/knopflerfish-osgi-(.*)\.tar\.gz debian uupdate
-
-# Uncomment to find new files on sourceforge, for devscripts >= 2.9
-# http://sf.net/knopflerfish-osgi/knopflerfish-osgi-(.*)\.tar\.gz
-
-# Uncomment to find new files on GooglePages
-# http://example.googlepages.com/foo.html knopflerfish-osgi-(.*)\.tar\.gz
+opts=dversionmangle=s/\+dfsg[1-9]// \
+http://www.knopflerfish.org/releases/([\d\.]+)/knopflerfish_osgi_sdk_([\d\.]+)\.jar debian ./debian/clean-sources

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