This is an automated email from the git hooks/post-receive script. ebourg-guest pushed a commit to branch master in repository maven2.
commit a2f2b036bf8e957aee7932b2da8473ed71d4f260 Author: Damien Raude-Morvan <[email protected]> Date: Sun Dec 18 23:33:50 2011 +0000 * Team upload. * Use alternative to install /usr/bin/mvn. --- debian/changelog | 7 +++++++ debian/maven2.install | 7 +++++-- debian/maven2.links | 3 --- debian/maven2.manpages | 2 -- debian/maven2.postinst | 31 +++++++++++++++++++++++++++++++ debian/maven2.prerm | 17 +++++++++++++++++ debian/rules | 2 ++ 7 files changed, 62 insertions(+), 7 deletions(-) diff --git a/debian/changelog b/debian/changelog index 8420c6f..540957c 100644 --- a/debian/changelog +++ b/debian/changelog @@ -1,3 +1,10 @@ +maven2 (2.2.1-11) UNRELEASED; urgency=low + + * Team upload. + * Use alternative to install /usr/bin/mvn. + + -- Damien Raude-Morvan <[email protected]> Sat, 17 Dec 2011 23:56:39 +0100 + maven2 (2.2.1-10) unstable; urgency=low * Team upload. diff --git a/debian/maven2.install b/debian/maven2.install index 393e65c..644d678 100644 --- a/debian/maven2.install +++ b/debian/maven2.install @@ -1,7 +1,10 @@ -apache-maven/src/bin/mvn usr/bin -apache-maven/src/bin/mvnDebug usr/bin +apache-maven/src/bin/mvn usr/share/maven2/bin/ +apache-maven/src/bin/mvnDebug usr/share/maven2/bin/ apache-maven/src/bin/m2.conf etc/maven2 apache-maven/src/conf/settings.xml /etc/maven2 debian/bash_completion.d/maven2 etc/bash_completion.d + +debian/mvn.1 usr/share/maven2/man/ +debian/mvnDebug.1 usr/share/maven2/man/ diff --git a/debian/maven2.links b/debian/maven2.links index 344aca6..a26bd4b 100644 --- a/debian/maven2.links +++ b/debian/maven2.links @@ -2,8 +2,5 @@ /usr/share/maven2/conf/m2.conf /usr/share/maven2/bin/m2.conf -/usr/bin/mvn /usr/share/maven2/bin/mvn -/usr/bin/mvnDebug /usr/share/maven2/bin/mvnDebug - /usr/share/java/classworlds.jar usr/share/maven2/boot/classworlds.jar diff --git a/debian/maven2.manpages b/debian/maven2.manpages deleted file mode 100644 index f132f38..0000000 --- a/debian/maven2.manpages +++ /dev/null @@ -1,2 +0,0 @@ -debian/mvn.1 -debian/mvnDebug.1 diff --git a/debian/maven2.postinst b/debian/maven2.postinst new file mode 100644 index 0000000..b7232d4 --- /dev/null +++ b/debian/maven2.postinst @@ -0,0 +1,31 @@ +#!/bin/sh + +set -e + +basedir=/usr/share/maven2 +priority=200 + +case "$1" in +configure) + + update-alternatives \ + --install /usr/bin/mvn mvn $basedir/bin/mvn $priority \ + --slave \ + /usr/bin/mvnDebug \ + mvnDebug \ + $basedir/bin/mvnDebug \ + --slave \ + /usr/share/man/man1/mvn.1.gz \ + mvn.1.gz \ + $basedir/man/mvn.1.gz \ + --slave \ + /usr/share/man/man1/mvnDebug.1.gz \ + mvnDebug.1.gz \ + $basedir/man/mvnDebug.1.gz + + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/maven2.prerm b/debian/maven2.prerm new file mode 100644 index 0000000..7b9f92f --- /dev/null +++ b/debian/maven2.prerm @@ -0,0 +1,17 @@ +#!/bin/sh + +set -e + +basedir=/usr/share/maven2 + +case "$1" in +deconfigure|remove) + + update-alternatives --remove mvn $basedir/bin/mvn + + ;; +esac + +#DEBHELPER# + +exit 0 diff --git a/debian/rules b/debian/rules index ea45884..1ba3118 100755 --- a/debian/rules +++ b/debian/rules @@ -31,6 +31,8 @@ makebuilddir/$(PACKAGE):: binary-post-install/$(PACKAGE):: dh_install -p$(PACKAGE) apache-maven/target/maven-debian-uber.jar usr/share/maven2/lib/ + # compress manpages + find $(DEB_BUILDDIR)/debian/$(PACKAGE)/usr/share/maven2/man -type f | xargs gzip -9v -n clean:: mh_unpatchpoms -p$(PACKAGE) -- Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/maven2.git _______________________________________________ pkg-java-commits mailing list [email protected] http://lists.alioth.debian.org/cgi-bin/mailman/listinfo/pkg-java-commits
