This is an automated email from the git hooks/post-receive script. tmancill pushed a commit to branch master in repository javatools.
commit c604fad96e10da75e7066343add2883d567662cc Author: tony mancill <[email protected]> Date: Wed Aug 12 23:36:39 2015 -0700 apply patch from Raphaël Hertzog for #779895 --- debian/changelog | 8 ++++++++ debian/jarwrapper.install | 1 + debian/jarwrapper.postinst | 4 ++-- debian/jarwrapper.prerm | 4 ++-- jarwrapper-binfmt/jarwrapper | 4 ++++ 5 files changed, 17 insertions(+), 4 deletions(-) diff --git a/debian/changelog b/debian/changelog index a90d991..b254581 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,11 @@ +javatools (0.53) UNRELEASED; urgency=medium + + * Install proper /usr/share/binfmts/jarwrapper instead of relying on + postinst snippet setting up a local configuration. + Closes: #779895 + + -- Raphaël Hertzog <[email protected]> Sun, 09 Aug 2015 21:57:52 +0200 + javatools (0.52) unstable; urgency=medium * Team upload. diff --git a/debian/jarwrapper.install b/debian/jarwrapper.install index 4372877..1f7f79f 100644 --- a/debian/jarwrapper.install +++ b/debian/jarwrapper.install @@ -1,3 +1,4 @@ jardetector /usr/bin jarwrapper /usr/bin java-arch.sh /usr/share/jarwrapper +jarwrapper-binfmt/jarwrapper /usr/share/binfmts diff --git a/debian/jarwrapper.postinst b/debian/jarwrapper.postinst index e746d83..f150bf6 100644 --- a/debian/jarwrapper.postinst +++ b/debian/jarwrapper.postinst @@ -2,8 +2,8 @@ set -e -if test -x /usr/sbin/update-binfmts ; then - update-binfmts --install jarwrapper /usr/bin/jarwrapper --magic 'PK\x03\x04' --detector /usr/bin/jardetector +if [ "$1" = configure ] && which update-binfmts >/dev/null 2>&1; then + update-binfmts --import jarwrapper fi #DEBHELPER# diff --git a/debian/jarwrapper.prerm b/debian/jarwrapper.prerm index 8c8b89c..32d05a4 100644 --- a/debian/jarwrapper.prerm +++ b/debian/jarwrapper.prerm @@ -2,8 +2,8 @@ set -e -if test -x /usr/sbin/update-binfmts ; then - update-binfmts --remove jarwrapper /usr/bin/jarwrapper +if [ "$1" = "remove" ] && which update-binfmts >/dev/null 2>&1; then + update-binfmts --package jarwrapper --remove jarwrapper /usr/bin/jarwrapper fi #DEBHELPER# diff --git a/jarwrapper-binfmt/jarwrapper b/jarwrapper-binfmt/jarwrapper new file mode 100644 index 0000000..5d8f3fe --- /dev/null +++ b/jarwrapper-binfmt/jarwrapper @@ -0,0 +1,4 @@ +package jarwrapper +detector /usr/bin/jardetector +interpreter /usr/bin/jarwrapper +magic PK\x03\x04 -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javatools.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
