This is an automated email from the git hooks/post-receive script. jamessan pushed a commit to branch master in repository devscripts.
commit a5cd0229e1e71be6267d9b1930fa57f6a3766076 Author: Joachim Breitner <[email protected]> Date: Tue Sep 16 14:25:49 2014 +0200 mk-origtargz: Treat jars like zip files (Closes: #754203) --- Devscripts/Compression.pm | 1 + debian/changelog | 3 +++ scripts/mk-origtargz.pl | 2 +- test/test_mk-origtargz | 25 +++++++++++++++++++++++++ 4 files changed, 30 insertions(+), 1 deletion(-) diff --git a/Devscripts/Compression.pm b/Devscripts/Compression.pm index 2e4c700..2e493d9 100644 --- a/Devscripts/Compression.pm +++ b/Devscripts/Compression.pm @@ -48,6 +48,7 @@ my %mime2comp = ( "application/xz" => "xz", "application/zip" => "zip", "application/x-compress" => "compress", + "application/java-archive" => "zip", ); sub compression_guess_from_file { diff --git a/debian/changelog b/debian/changelog index 30af30e..cbc1523 100644 --- a/debian/changelog +++ b/debian/changelog @@ -23,6 +23,9 @@ devscripts (2.14.7) UNRELEASED; urgency=low [ Benjamin Drung ] * Remove unused build-dependencies libjson-perl and libterm-size-perl + [ Joachim Breitner ] + * mk-origtargz: Treat jars like zip files (Closes: #754203) + -- Cyril Brulebois <[email protected]> Fri, 08 Aug 2014 01:27:12 +0200 devscripts (2.14.6) unstable; urgency=medium diff --git a/scripts/mk-origtargz.pl b/scripts/mk-origtargz.pl index fb24df5..842f7b4 100755 --- a/scripts/mk-origtargz.pl +++ b/scripts/mk-origtargz.pl @@ -312,7 +312,7 @@ unless (-e $upstream) { my $mime = compression_guess_from_file($upstream); -my $is_zipfile = $mime eq 'zip'; +my $is_zipfile = (defined $mime and $mime eq 'zip'); my $is_tarfile = $upstream =~ $tar_regex; unless ($is_zipfile or $is_tarfile) { diff --git a/test/test_mk-origtargz b/test/test_mk-origtargz index 3baaa77..de3d59a 100755 --- a/test/test_mk-origtargz +++ b/test/test_mk-origtargz @@ -89,6 +89,16 @@ makeZipFile () { rm -rf "$TMPDIR/foo-0.1" } +makeJarFile () { + makeUpstreamFiles + cat > "$TMPDIR/MANIFEST.MF" <<END +Manifest-Version: 1.0 +Main-Class: foo.bar +END + (cd $TMPDIR; jar cf "foo-0.1.jar" MANIFEST.MF foo-0.1 ) + rm -rf "$TMPDIR/foo-0.1" "$TMPDIR/MANIFEST.MF" +} + makeDebanDir() { mkdir -p $TMPDIR/foo/debian cat <<END > $TMPDIR/foo/debian/changelog @@ -297,6 +307,21 @@ testRepackZip2GZ() { assertType application/gzip $TMPDIR/foo_0.1.orig.tar.gz } +testRepackJar2GZ() { + if ! which jar >/dev/null + then + # skip to avoid dependency on java-jdk + return + fi + makeJarFile + run_mk_origtargz "" "" \ + "Successfully repacked foo-0.1.jar as foo_0.1.orig.tar.gz." \ + --package foo --version 0.1 --copy foo-0.1.jar + assertTrue "original zip file does not exist" "[ -e $TMPDIR/foo-0.1.jar ]" + assertTrue "result does not exist" "[ -e $TMPDIR/foo_0.1.orig.tar.gz ]" + assertType application/gzip $TMPDIR/foo_0.1.orig.tar.gz +} + testRepackZip2GZRename() { makeZipFile run_mk_origtargz "" "" \ -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/collab-maint/devscripts.git _______________________________________________ devscripts-devel mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/devscripts-devel
