[geronimo-osgi-support] 02/03: Removed the unused dependency on libaspectj-java

[Emmanuel Bourg]

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

ebourg-guest pushed a commit to branch master
in repository geronimo-osgi-support.

commit 4cf7927aed105f6c399e1cc8ebdc05eb19e7d868
Author: Emmanuel Bourg <ebourg at apache.org>
Date:   Thu Jul 2 19:26:40 2015 +0200

    Removed the unused dependency on libaspectj-java
---
 debian/build.xml        | 2 ++
 debian/changelog        | 1 +
 debian/classpath-debian | 1 -
 debian/control          | 4 ++--
 debian/rules            | 2 +-
 5 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/debian/build.xml b/debian/build.xml
index 1bae434..5d57165 100644
--- a/debian/build.xml
+++ b/debian/build.xml
@@ -8,6 +8,8 @@
 	<path id="classpath">
 		<fileset dir="/" includesfile="classpath-debian"/>
 		<fileset dir="${basedir}/.." includes="geronimo-osgi-locator.jar"/>
+		<pathelement path="/usr/share/java/osgi.core.jar"/>
+		<pathelement path="/usr/share/java/osgi.compendium.jar"/>
 	</path>
 
 	<target name="javadoc">
diff --git a/debian/changelog b/debian/changelog
index 4dc06af..b4c4a46 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -2,6 +2,7 @@ geronimo-osgi-support (1.0-3) UNRELEASED; urgency=medium
 
   * Team upload.
   * Install the Maven artifacts
+  * Removed the unused dependency on libaspectj-java
   * Standards-Version updated to 3.9.6 (no changes)
   * Use canonical URLs for the Vcs-* fields
   * Switch to debhelper level 9
diff --git a/debian/classpath-debian b/debian/classpath-debian
index 76c22cb..bc7ca52 100644
--- a/debian/classpath-debian
+++ b/debian/classpath-debian
@@ -1,2 +1 @@
-usr/share/java/aspectjtools.jar
 usr/share/java/org.eclipse.osgi.services.jar
diff --git a/debian/control b/debian/control
index d7cd138..9fef524 100644
--- a/debian/control
+++ b/debian/control
@@ -3,7 +3,7 @@ Maintainer: Debian Java Maintainers <pkg-java-maintainers at lists.alioth.debian.or
 Uploaders: Miguel Landaeta <miguel at miguel.cc>
 Section: java
 Priority: optional
-Build-Depends: debhelper (>= 9), default-jdk, javahelper, ant, libaspectj-java,
+Build-Depends: debhelper (>= 9), default-jdk, javahelper, ant,
  libosgi-core-java, libosgi-compendium-java, maven-repo-helper
 Standards-Version: 3.9.6
 Vcs-Git: git://anonscm.debian.org/pkg-java/geronimo-osgi-support.git
@@ -12,7 +12,7 @@ Homepage: http://geronimo.apache.org/
 
 Package: libgeronimo-osgi-support-java
 Architecture: all
-Depends: libaspectj-java, libosgi-core-java, libosgi-compendium-java, ${misc:Depends}
+Depends: libosgi-core-java, libosgi-compendium-java, ${misc:Depends}
 Suggests: libgeronimo-osgi-support-java-doc (= ${binary:Version})
 Description: Java libraries providing OSGi lookup support for Geronimo projects
  These Java libraries allow the use of OSGi framework with Geronimo existing
diff --git a/debian/rules b/debian/rules
index 811ade2..066cb6f 100755
--- a/debian/rules
+++ b/debian/rules
@@ -1,7 +1,7 @@
 #!/usr/bin/make -f
 
 export JAVA_HOME=/usr/lib/jvm/default-java
-export CLASSPATH=/usr/share/java/aspectjtools.jar:/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar
+export CLASSPATH=/usr/share/java/osgi.core.jar:/usr/share/java/osgi.compendium.jar
 
 %:
 	dh $@ --with javahelper,maven-repo-helper

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