[javatools] 01/01: jh_makepkg: Removed the deprecated --maven option

[Emmanuel Bourg]

This is an automated email from the git hooks/post-receive script.

ebourg-guest pushed a commit to branch master
in repository javatools.

commit 0f49adea3c076561b34e4ea9ff7a0ad2dfd1cb73
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Fri Nov 13 11:15:07 2015 +0100

    jh_makepkg: Removed the deprecated --maven option
---
 debian/changelog |  7 +++++++
 jh_makepkg       | 36 ++----------------------------------
 tutorial.txt     |  4 ++--
 3 files changed, 11 insertions(+), 36 deletions(-)

diff --git a/debian/changelog b/debian/changelog
index 0c33d74..3dae162 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,10 @@
+javatools (0.55) UNRELEASED; urgency=medium
+
+  * Team upload.
+  * jh_makepkg: Removed the deprecated --maven option
+
+ -- Emmanuel Bourg <ebourg at apache.org>  Fri, 13 Nov 2015 11:06:04 +0100
+
 javatools (0.54) unstable; urgency=medium
 
   * Team upload.
diff --git a/jh_makepkg b/jh_makepkg
index bc01413..d150034 100755
--- a/jh_makepkg
+++ b/jh_makepkg
@@ -1,7 +1,7 @@
 #!/bin/bash --
 
 # options:
-#    make, maven, ant, byhand
+#    make, ant, byhand
 #    app, library
 #    gcj
 
@@ -28,7 +28,6 @@ syntax()
    echo -e "\t-a --app: This is an application package"
    echo -e "\tPick One:"
    echo -e "\t-t --ant: Builds with ant"
-   echo -e "\t-M --maven: Builds with maven (deprecated, use mh_make instead)"
    echo -e "\t-k --makefiles: Builds with make"
    echo -e "\t-n --none: Create own buildsystem"
    echo -e "\tPick One:"
@@ -44,21 +43,7 @@ syntax()
    exit 1
 }
 
-maven_not_supported()
-{
-    echo "Sorry, but jh_makepkg is not good at generating package templates" >&2
-    echo "for maven based packages." >&2
-    echo >&2
-    echo "Please consider using mh_make instead" >&2
-
-    exit 1
-}
-
-ARGS="c clean p package m maintainer e email v upstream l library a app t ant k makefile n none g gcj o openjdk o7 openjdk7 M maven d default" parseargs "$@"
-
-if [ -n "`getarg M maven`" ]; then
-    maven_not_supported
-fi
+ARGS="c clean p package m maintainer e email v upstream l library a app t ant k makefile n none g gcj o openjdk o7 openjdk7 d default" parseargs "$@"
 
 BUILDDIR="`pwd`"
 
@@ -193,7 +178,6 @@ else
    echo "Select:"
    echo -e "\t[A] Ant"
    echo -e "\t[M] Makefiles"
-   echo -e "\t[V] Maven"
    echo -e "\t[N] None---make one for me (Default)"
    echo -n "[Namv] $ "
    read t
@@ -207,10 +191,6 @@ else
          BUILD="make"
          echo "Selected: Makefiles"
          ;;
-      "V"|"v")
-         BUILD="maven"
-         echo "Selected: Maven"
-         ;;
       *)
          BUILD="byhand"
          echo "Selected: No upstream build system"
@@ -223,9 +203,6 @@ case $BUILD in
    "ant")
       DEPENDS="$DEPENDS, ant"
    ;;
-   "maven")
-        maven_not_supported
-   ;;
    "byhand")
    ;;
 esac
@@ -366,15 +343,6 @@ END
       case $BUILD in
          "ant")
          ;;
-         "maven")
-      cat >> debian/rules <<END
-override_dh_auto_build:
-	# Build the package
-	mvn-debian build
-override_dh_auto_clean:
-	mvn-debian clean
-END
-         ;;
          "make")
          ;;
          "byhand")
diff --git a/tutorial.txt b/tutorial.txt
index c9f8848..037303a 100644
--- a/tutorial.txt
+++ b/tutorial.txt
@@ -214,8 +214,8 @@ and it will create the orig.tar.gz and most of the files in the Debian
 directory, which need only small changes neccessary to build the
 package.
 
-Note that `jh_makepkg` is *not* suitable for packages using the
-`maven` build system.  Please consider using `mh_make` intead.
+Note that `jh_makepkg` doesn't support packages using the Maven
+build system. Please use `mh_make` intead.
 
 jh_repack
 ---------

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-java/javatools.git