diff -Nru eclipse-debian-helper-1.3/debian/changelog eclipse-debian-helper-1.5/debian/changelog
--- eclipse-debian-helper-1.3/debian/changelog	2018-09-27 22:21:02.000000000 +0000
+++ eclipse-debian-helper-1.5/debian/changelog	2018-10-26 06:41:53.000000000 +0000
@@ -1,3 +1,16 @@
+eclipse-debian-helper (1.5) unstable; urgency=medium
+
+  * Improved the detection of the bundle name
+
+ -- Emmanuel Bourg <ebourg@apache.org>  Fri, 26 Oct 2018 08:41:53 +0200
+
+eclipse-debian-helper (1.4) unstable; urgency=medium
+
+  * Team upload.
+  * Support other bundle dirrectories than 'bundles' and the base directory
+
+ -- Jochen Sprickerhof <jspricke@debian.org>  Fri, 19 Oct 2018 13:13:21 +0200
+
 eclipse-debian-helper (1.3) unstable; urgency=medium
 
   * Add a symlink in /usr/lib/eclipse/plugins/ when installing a plugin
diff -Nru eclipse-debian-helper-1.3/src/ant/build-eclipse-bundle.xml eclipse-debian-helper-1.5/src/ant/build-eclipse-bundle.xml
--- eclipse-debian-helper-1.3/src/ant/build-eclipse-bundle.xml	2018-09-27 22:16:17.000000000 +0000
+++ eclipse-debian-helper-1.5/src/ant/build-eclipse-bundle.xml	2018-10-25 13:35:32.000000000 +0000
@@ -22,7 +22,8 @@
 
           <!-- Extract and clean the bundle version from the manifest -->
           <bundle-version name="@{name}" basedir="@{basedir}" property="bundle.version.@{name}"/>
-          <propertyregex property="bundle.desc.@{name}" input="${@{name}.pluginName}${@{name}.bundleName}" regexp="\$\{.*\}" replace="" global="true" override="true"/>
+
+          <propertyregex property="bundle.desc.@{name}" input="${@{name}.Plugin.name}${@{name}.pluginName}${@{name}.bundleName}${@{name}.Bundle-Name}${@{name}.name}" regexp="\$\{[^\$]*\}" replace="" global="true" override="true"/>
 
           <echo>Building bundle '${bundle.desc.@{name}}' (@{name}:${bundle.version.@{name}})</echo>
 
@@ -97,7 +98,7 @@
             <not><equals arg1="@{shortname}" arg2="" /></not>
             <then><var name="shortname.@{name}" value="@{shortname}"/></then>
           </if>
-          <concat destfile="debian/bundles.properties" append="true">@{name}	${bundle.version.@{name}}	${shortname.@{name}}	lib${shortname.@{name}}-java	${bundle.depends.@{name}}${line.separator}</concat>
+          <concat destfile="debian/bundles.properties" append="true">@{name}	${bundle.version.@{name}}	${shortname.@{name}}	lib${shortname.@{name}}-java	${bundle.depends.@{name}}	@{basedir}${line.separator}</concat>
 
           <!-- Prepare the pom to be installed in the package -->
           <copy file="${bundle.dir.@{name}}/pom.xml" todir="${bundle.dir.@{name}}/target"/>
diff -Nru eclipse-debian-helper-1.3/src/perl/eclipse_bundles.pm eclipse-debian-helper-1.5/src/perl/eclipse_bundles.pm
--- eclipse-debian-helper-1.3/src/perl/eclipse_bundles.pm	2018-09-27 13:40:19.000000000 +0000
+++ eclipse-debian-helper-1.5/src/perl/eclipse_bundles.pm	2018-10-19 11:11:03.000000000 +0000
@@ -7,6 +7,7 @@
 
 use strict;
 use warnings;
+use File::Basename;
 use parent qw(Debian::Debhelper::Buildsystem);
 use Debian::Debhelper::Dh_Lib qw(%dh addsubstvar);
 
@@ -50,7 +51,9 @@
 	push(@args, "-Dbasedir", ".");
 	push(@args, "-Dbundledir", $this->{bundledir});
 	push(@args, "-f", "debian/build.xml");
-	push(@args, @{$this->{bundles}});
+	for my $bundle (@{$this->{bundles}}) {
+		push(@args, basename($bundle));
+	}
 
 	# Set the username to improve the reproducibility
 	push(@args, "-Duser.name", "debian");
@@ -72,16 +75,17 @@
 		my $shortname    = $fields[2];
 		my $package      = $fields[3];
 		my $dependencies = $fields[4];
+		my $basedir      = $fields[5];
 
 		# Install the Maven artifacts
-		$this->doit_in_builddir("mh_installpom", "-p$package", "--no-parent", "-e$version", "$this->{bundledir}/$bundle/target/pom.xml");
-		$this->doit_in_builddir("mh_installjar", "-p$package", "--java-lib", "-e$version", "--usj-name=$shortname", "$this->{bundledir}/$bundle/target/pom.xml", "$this->{bundledir}/$bundle/target/$bundle.jar");
+		$this->doit_in_builddir("mh_installpom", "-p$package", "--no-parent", "-e$version", "$basedir/$bundle/target/pom.xml");
+		$this->doit_in_builddir("mh_installjar", "-p$package", "--java-lib", "-e$version", "--usj-name=$shortname", "$basedir/$bundle/target/pom.xml", "$basedir/$bundle/target/$bundle.jar");
 
 		# Specify the bundle dependencies in the substvars file
 		addsubstvar($package, "bundle:Depends", $dependencies);
 
 		# Add a symlink in /usr/lib/eclipse/plugins/ for plugins
-		open(PROJECT_FILE, "$this->{bundledir}/$bundle/.project");
+		open(PROJECT_FILE, "$basedir/$bundle/.project");
 		if (grep{/org.eclipse.pde.PluginNature/} <PROJECT_FILE>) {
 			$this->doit_in_builddir("dh_link", "-p$package", "/usr/share/java/$shortname.jar", "/usr/lib/eclipse/plugins/${bundle}_${version}.jar");
 		}