[pkg-java] r17311 - trunk/jmagick/debian

[Emmanuel Bourg]

Author: ebourg-guest
Date: 2013-10-07 12:48:57 +0000 (Mon, 07 Oct 2013)
New Revision: 17311

Modified:
   trunk/jmagick/debian/README.source
   trunk/jmagick/debian/changelog
   trunk/jmagick/debian/orig-tar.sh
   trunk/jmagick/debian/watch
Log:
New upstream release (6.6.9) (Closes: #714509)
Fetch the upstream sources from SVN
debian/watch: Watch the branches in the SVN repository



Modified: trunk/jmagick/debian/README.source
===================================================================
--- trunk/jmagick/debian/README.source	2013-10-07 11:10:10 UTC (rev 17310)
+++ trunk/jmagick/debian/README.source	2013-10-07 12:48:57 UTC (rev 17311)
@@ -5,8 +5,15 @@
 builds. Therefore, to get a clean deb, I repackage the upstream
 tarball.
 
-Use the rules/get-orig-source target to create the orig.tar.gz.
+Use the rules/get-orig-source target to create the orig.tar.xz.
 For more details on repackaging of upstream sources please see the
 debian/orig-tar.sh file.
 
  -- Kumar Appaiah <akumar at ee.iitm.ac.in>, Sun, 14 Oct 2007 08:34:38 +0530
+
+
+Upstream hasn't published new releases for years but maintains branches
+in SVN compatible with more recent versions of ImageMagick. The code is
+thus fetched from SVN by debian/orig-tar.sh.
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Mon, 07 Oct 2013 08:46:56 +0200

Modified: trunk/jmagick/debian/changelog
===================================================================
--- trunk/jmagick/debian/changelog	2013-10-07 11:10:10 UTC (rev 17310)
+++ trunk/jmagick/debian/changelog	2013-10-07 12:48:57 UTC (rev 17311)
@@ -1,8 +1,9 @@
-jmagick (6.4.0-1) UNRELEASED; urgency=low
+jmagick (6.6.9~20130201-svn99-1) UNRELEASED; urgency=low
 
   * Team upload.
-  * New upstream release
+  * New upstream release (Closes: #714509)
     - Refreshed the patch
+    - Fetch the upstream sources from SVN
   * debian/control:
     - Use canonical URLs for the Vcs-* fields
     - Removed Michael Koch from the uploaders (Closes: #654036)
@@ -11,9 +12,10 @@
   * Use XZ compression for the upstream tarball
   * debian/rules: Install the upstream changelog
   * Generate Java 6 compatible bytecode
-  * Include the debug informations in the compiled classes
+  * Include the debug information in the compiled classes
   * Renamed debian/README.Debian-source to README.source
   * Moved the examples to the documentation package
+  * debian/watch: Watch the branches in the SVN repository
 
  -- Emmanuel Bourg <ebourg at apache.org>  Mon, 07 Oct 2013 08:46:56 +0200
 

Modified: trunk/jmagick/debian/orig-tar.sh
===================================================================
--- trunk/jmagick/debian/orig-tar.sh	2013-10-07 11:10:10 UTC (rev 17310)
+++ trunk/jmagick/debian/orig-tar.sh	2013-10-07 12:48:57 UTC (rev 17311)
@@ -1,13 +1,18 @@
 #!/bin/sh -e
 
 # called by uscan with '--upstream-version' <version> <file>
+SVNROOT=svn://svn.code.sf.net/p/jmagick/code
+
 VERSION=$2
-TAR=../jmagick_$VERSION.orig.tar.xz
-DIR=jmagick-$VERSION.orig
+REVISION=$(svn info $SVNROOT/branches/$VERSION | sed -rne 's,^Revision: (.*),\1,p')
+TIMESTAMP=$(svn info --xml $SVNROOT/branches/$VERSION | sed -rne 's,^<date>([0-9]{4})-([0-9]{2})-([0-9]{2}).*</date>,\1\2\3,p')
 
-# clean up the upstream tarball
-tar zxf $3
-mv $VERSION $DIR
+TAR=../jmagick_$VERSION~$TIMESTAMP-svn$REVISION.orig.tar.xz
+DIR=jmagick-$VERSION~svn$REVISION
+
+# fetch and clean up the source code
+svn export $SVNROOT/branches/$VERSION/ $DIR
+chmod -x $DIR/test/magicktest/exif_orientation/*.jpg
 XZ_OPT=--best tar cJf $TAR -X debian/orig-tar.exclude $DIR
 rm -rf $DIR $3
 

Modified: trunk/jmagick/debian/watch
===================================================================
--- trunk/jmagick/debian/watch	2013-10-07 11:10:10 UTC (rev 17310)
+++ trunk/jmagick/debian/watch	2013-10-07 12:48:57 UTC (rev 17311)
@@ -1,3 +1,6 @@
 version=3
+#opts=dversionmangle=s/~\d+-svn\d+// \
+opts="dversionmangle=s/\~20130201-svn99/!/" \
 #http://downloads.jmagick.org/ ([\d\.]*)/ debian debian/orig-tar.sh
-http://downloads.jmagick.org/([\d\.]*)/ jmagick-([\d\.]*)-src\.tar\.gz debian debian/orig-tar.sh
+#http://downloads.jmagick.org/([\d\.]*)/ jmagick-([\d\.]*)-src\.tar\.gz debian debian/orig-tar.sh
+http://svn.code.sf.net/p/jmagick/code/branches/(\d[\d\.]*).* debian debian/orig-tar.sh