[pkg-java] r17858 - trunk/libmiglayout-java/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2014-03-11 10:55:47 +0000 (Tue, 11 Mar 2014)
New Revision: 17858

Modified:
   trunk/libmiglayout-java/debian/changelog
   trunk/libmiglayout-java/debian/orig-tar.sh
   trunk/libmiglayout-java/debian/rules
   trunk/libmiglayout-java/debian/watch
Log:
Download the new releases from code.google.com



Modified: trunk/libmiglayout-java/debian/changelog
===================================================================
--- trunk/libmiglayout-java/debian/changelog	2014-03-11 08:53:59 UTC (rev 17857)
+++ trunk/libmiglayout-java/debian/changelog	2014-03-11 10:55:47 UTC (rev 17858)
@@ -1,6 +1,7 @@
 libmiglayout-java (3.7.4-3) UNRELEASED; urgency=medium
 
   * Team upload.
+  * Download the new releases from code.google.com
   * debian/control:
     - Standards-Version updated to 3.9.5 (no changes)
     - Use canonical URLs for the Vcs-* fields

Modified: trunk/libmiglayout-java/debian/orig-tar.sh
===================================================================
--- trunk/libmiglayout-java/debian/orig-tar.sh	2014-03-11 08:53:59 UTC (rev 17857)
+++ trunk/libmiglayout-java/debian/orig-tar.sh	2014-03-11 10:55:47 UTC (rev 17858)
@@ -1,14 +1,13 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
-DIR=miglayout-$2
-TAR=../libmiglayout-java_$2.orig.tar.xz
+VERSION=$2
+TAR=../libmiglayout-java_$VERSION.orig.tar.xz
 
 # clean up the upstream tarball
-mkdir $DIR
-(cd $DIR && jar xf ../$3)
-XZ_OPT=--best tar -c -J -f $TAR $DIR
-rm -rf $DIR $3
+unzip $3
+XZ_OPT=--best tar -c -J -f $TAR miglayout-*
+rm -rf miglayout-* $3
 
 # move to directory 'tarballs'
 if [ -r .svn/deb-layout ]; then

Modified: trunk/libmiglayout-java/debian/rules
===================================================================
--- trunk/libmiglayout-java/debian/rules	2014-03-11 08:53:59 UTC (rev 17857)
+++ trunk/libmiglayout-java/debian/rules	2014-03-11 10:55:47 UTC (rev 17858)
@@ -12,7 +12,7 @@
 	dh_link -plibmiglayout-java /usr/share/java/miglayout-$(DEB_UPSTREAM_VERSION).jar /usr/share/java/miglayout.jar
 
 clean::
-	rm *.jar
+	rm -f *.jar
 
 get-orig-source:
-	-uscan --upstream-version 0 --rename	
+	-uscan --upstream-version $(DEB_UPSTREAM_VERSION) --rename

Modified: trunk/libmiglayout-java/debian/watch
===================================================================
--- trunk/libmiglayout-java/debian/watch	2014-03-11 08:53:59 UTC (rev 17857)
+++ trunk/libmiglayout-java/debian/watch	2014-03-11 10:55:47 UTC (rev 17858)
@@ -1,3 +1,3 @@
 version=3
-http://www.migcalendar.com/miglayout/versions/([\d\.]+)/miglayout-([\d\.]+)-sources.jar \
-  debian debian/orig-tar.sh
+opts=downloadurlmangle=s^.*/((\d[\d\.]+))^http://miglayout.googlecode.com/archive/miglayout-parent-$1.zip^ \
+http://central.maven.org/maven2/com/miglayout/miglayout-core/ (\d[\d\.]+)/.* debian debian/orig-tar.sh