summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorEmmanuel Bourg <ebourg@apache.org>2019-09-19 13:11:35 +0200
committerEmmanuel Bourg <ebourg@apache.org>2019-09-19 13:21:53 +0200
commit3226313e606cbe5a48f8d2be39e775a237e140cd (patch)
tree7fbdeaffb97306f574e398748ee0ab23c995a1cf
parentc29e6fb23e1781431867af32081d0801334b114a (diff)
Reimported the code from GitHub instead of using the sources artifact in the defunct Codehaus Maven repository
-rw-r--r--debian/changelog2
-rwxr-xr-xdebian/orig-tar.sh20
-rw-r--r--debian/watch7
3 files changed, 6 insertions, 23 deletions
diff --git a/debian/changelog b/debian/changelog
index d357fd4..99aec4a 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,6 +1,8 @@
libpicocontainer1-java (1.3-1) UNRELEASED; urgency=medium
* Cloned the package as libpicocontainer1-java (Closes: #939495)
+ * Reimported the code from GitHub instead of using the sources artifact
+ in the defunct Codehaus Maven repository
* Switch to source format 3.0 (quilt)
* Standards-Version updated to 4.4.0
* Changed the section from 'libs' to 'java'
diff --git a/debian/orig-tar.sh b/debian/orig-tar.sh
deleted file mode 100755
index b527a19..0000000
--- a/debian/orig-tar.sh
+++ /dev/null
@@ -1,20 +0,0 @@
-#!/bin/sh -e
-
-# called by uscan with '--upstream-version' <version> <file>
-DIR=picocontainer-$2
-TAR=../libpicocontainer-java_$2.orig.tar.gz
-
-# clean up the upstream tarball
-mkdir $DIR
-(cd $DIR && jar -x -f ../$3)
-tar -c -z -f $TAR $DIR
-rm -rf $DIR $3
-
-# move to directory 'tarballs'
-if [ -r .svn/deb-layout ]; then
- . .svn/deb-layout
- mv $TAR $origDir
- echo "moved $TAR to $origDir"
-fi
-
-exit 0
diff --git a/debian/watch b/debian/watch
index f9a12a8..4bbb5ef 100644
--- a/debian/watch
+++ b/debian/watch
@@ -1,3 +1,4 @@
-version=3
-http://repository.codehaus.org/org/picocontainer/picocontainer/(\d\.\d)/picocontainer-(\d\.\d)-sources.jar \
- debian debian/orig-tar.sh
+version=4
+opts="repack,compression=xz,downloadurlmangle=s#.*#https://github.com/picocontainer/PicoContainer1/archive/f8d7d793e17810f4e298c365a78ae9def6e7f717.tar.gz#,filenamemangle=s/\.jar/.tar.gz/" \
+https://repo1.maven.org/maven2/org/picocontainer/picocontainer/(1\.[\d\.]+)/picocontainer-(1\.[\d\.]+)-sources.jar
+#https://github.com/picocontainer/PicoContainer1/tags .*/(.*).tar.gz